diff options
| author | Herbert Dürr <hdu@apache.org> | 2014-02-10 09:36:08 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-10 11:57:56 +0000 |
| commit | 87f52352614aed918501e8a7df8e8a61499efc5b (patch) | |
| tree | 261c3890b0cdd8d1e3ec6c088de153cc7fb09243 /vcl/osx/salinst.cxx | |
| parent | c7e0bfd18eaba685d9f8ef8fdeb9fa45ae2e132d (diff) | |
Resolves: #i124201# rename apple_remote's MainController...
to AppleRemoteController
having a MainController class in the global namespace of an application with
gazillions of MVC patterns is not a good idea. Renaming it to better match
its scope (i.e. the Apple Remote) cleans this up.
(cherry picked from commit 8ef3836059ca613d125f66e6bad21c83200dadad)
Conflicts:
apple_remote/source/RemoteMainController.m
include/apple_remote/RemoteMainController.h
vcl/inc/osx/saldata.hxx
vcl/osx/saldata.cxx
vcl/osx/salinst.cxx
vcl/osx/vclnsapp.mm
Change-Id: I1f252ac51ef65966a48ee03b2cd3519f98d57383
Diffstat (limited to 'vcl/osx/salinst.cxx')
| -rw-r--r-- | vcl/osx/salinst.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 723ad00b4c20..3d169989d791 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -170,7 +170,7 @@ static void initNSApp() object: nil ]; #if !HAVE_FEATURE_MACOSX_SANDBOX // Initialize Apple Remote - GetSalData()->mpMainController = [[MainController alloc] init]; + GetSalData()->mpAppleRemoteMainController = [[AppleRemoteMainController alloc] init]; [[NSDistributedNotificationCenter defaultCenter] addObserver: NSApp selector: @selector(applicationWillBecomeActive:) |