summaryrefslogtreecommitdiff
path: root/include/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 /include/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 'include/apple_remote')
-rw-r--r--include/apple_remote/RemoteMainController.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/apple_remote/RemoteMainController.h b/include/apple_remote/RemoteMainController.h
index 60cd4fbcec8e..c4ee0ac6ed74 100644
--- a/include/apple_remote/RemoteMainController.h
+++ b/include/apple_remote/RemoteMainController.h
@@ -42,7 +42,7 @@
//static void sendTheEvent( unichar, int );
-SAL_DLLPUBLIC_EXPORT @interface MainController : NSObject {
+SAL_DLLPUBLIC_EXPORT @interface AppleRemoteMainController : NSObject {
@public // else remoteControl is not reachable from GetSalData()->mpMainController
RemoteControl* remoteControl;
@private