summaryrefslogtreecommitdiff
path: root/apple_remote
diff options
context:
space:
mode:
authorHerbert Dürr <hdu@apache.org>2014-02-10 09:36:08 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-02-10 11:57:56 +0000
commit87f52352614aed918501e8a7df8e8a61499efc5b (patch)
tree261c3890b0cdd8d1e3ec6c088de153cc7fb09243 /apple_remote
parentc7e0bfd18eaba685d9f8ef8fdeb9fa45ae2e132d (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 'apple_remote')
-rw-r--r--apple_remote/source/RemoteMainController.m6
1 files changed, 3 insertions, 3 deletions
diff --git a/apple_remote/source/RemoteMainController.m b/apple_remote/source/RemoteMainController.m
index 790c52052fda..caf145ec7252 100644
--- a/apple_remote/source/RemoteMainController.m
+++ b/apple_remote/source/RemoteMainController.m
@@ -39,7 +39,7 @@
// Sample Code 3: Multi Click Behavior and Hold Event Simulation
// -------------------------------------------------------------------------------------------
-@implementation MainController
+@implementation AppleRemoteMainController
- (id) init {
self = [super init]; // because we redefined our own init instead of use the fu..nny awakeFromNib
@@ -75,11 +75,11 @@
// to give the binding mechanism a chance to see the change of the attribute
[self setValue: container forKey: @"remoteControl"];
#ifdef DEBUG
- NSLog(@"MainController init done");
+ NSLog(@"AppleRemoteMainController init done");
#endif
}
else
- NSLog(@"MainController init failed");
+ NSLog(@"AppleRemoteMainController init failed");
return self;
}