[vlc-commits] macosx: rename VLCMain preferences category
Felix Paul Kühne
git at videolan.org
Wed Aug 10 20:07:55 CEST 2016
vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Aug 10 19:50:10 2016 +0200| [c751c847deccc280e899909b93e5f722fb8fbf66] | committer: Felix Paul Kühne
macosx: rename VLCMain preferences category
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c751c847deccc280e899909b93e5f722fb8fbf66
---
extras/package/macosx/vlc.xcodeproj/project.pbxproj | 8 ++++----
modules/gui/macosx/Makefile.am | 2 +-
modules/gui/macosx/{intf-prefs.h => VLCMain+OldPrefs.h} | 0
modules/gui/macosx/{intf-prefs.m => VLCMain+OldPrefs.m} | 2 +-
modules/gui/macosx/intf.m | 2 +-
modules/gui/macosx/simple_prefs.m | 2 +-
po/POTFILES.in | 4 ++--
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index 1370921..3847421 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -1296,8 +1296,8 @@
7D3F652718805297005776C4 /* BWQuincyManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = BWQuincyManager.m; path = ../../../modules/gui/macosx/BWQuincyManager.m; sourceTree = SOURCE_ROOT; };
7D3F652818805297005776C4 /* BWQuincyUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = BWQuincyUI.h; path = ../../../modules/gui/macosx/BWQuincyUI.h; sourceTree = SOURCE_ROOT; };
7D3F652918805297005776C4 /* BWQuincyUI.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = BWQuincyUI.m; path = ../../../modules/gui/macosx/BWQuincyUI.m; sourceTree = SOURCE_ROOT; };
- 7D871D371B5E6844000B56C0 /* intf-prefs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "intf-prefs.h"; path = "../../../modules/gui/macosx/intf-prefs.h"; sourceTree = "<group>"; };
- 7D871D381B5E6844000B56C0 /* intf-prefs.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "intf-prefs.m"; path = "../../../modules/gui/macosx/intf-prefs.m"; sourceTree = "<group>"; };
+ 7D871D371B5E6844000B56C0 /* VLCMain+OldPrefs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "VLCMain+OldPrefs.h"; path = "../../../modules/gui/macosx/VLCMain+OldPrefs.h"; sourceTree = "<group>"; };
+ 7D871D381B5E6844000B56C0 /* VLCMain+OldPrefs.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "VLCMain+OldPrefs.m"; path = "../../../modules/gui/macosx/VLCMain+OldPrefs.m"; sourceTree = "<group>"; };
7D871D391B5E684D000B56C0 /* helpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = helpers.h; path = ../../../modules/gui/macosx/helpers.h; sourceTree = "<group>"; };
7D8BB0B318302AC000FAE9B7 /* VLCDebugMessageWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VLCDebugMessageWindowController.h; path = ../../../modules/gui/macosx/VLCDebugMessageWindowController.h; sourceTree = SOURCE_ROOT; };
7D8BB0B418302AC000FAE9B7 /* VLCDebugMessageWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = VLCDebugMessageWindowController.m; path = ../../../modules/gui/macosx/VLCDebugMessageWindowController.m; sourceTree = SOURCE_ROOT; };
@@ -1903,8 +1903,8 @@
7D871D391B5E684D000B56C0 /* helpers.h */,
7DF812ED1B555A340052293C /* VLCInputManager.h */,
7DF812EE1B555A340052293C /* VLCInputManager.m */,
- 7D871D371B5E6844000B56C0 /* intf-prefs.h */,
- 7D871D381B5E6844000B56C0 /* intf-prefs.m */,
+ 7D871D371B5E6844000B56C0 /* VLCMain+OldPrefs.h */,
+ 7D871D381B5E6844000B56C0 /* VLCMain+OldPrefs.m */,
8ED6C27C03E2EB1C0059A3A7 /* intf.h */,
8ED6C27D03E2EB1C0059A3A7 /* intf.m */,
7DF812EF1B555C8E0052293C /* KeyboardBacklight.h */,
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 7b40bd3..fd402f4 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -35,7 +35,7 @@ libmacosx_plugin_la_SOURCES = \
ExtensionsManager.h ExtensionsManager.m \
VLCFSPanel.h VLCFSPanel.m \
VLCHelpWindowController.h VLCHelpWindowController.m \
- intf-prefs.h intf-prefs.m \
+ VLCMain+OldPrefs.h VLCMain+OldPrefs.m \
intf.h intf.m \
iTunes.h \
KeyboardBacklight.h KeyboardBacklight.m \
diff --git a/modules/gui/macosx/intf-prefs.h b/modules/gui/macosx/VLCMain+OldPrefs.h
similarity index 100%
rename from modules/gui/macosx/intf-prefs.h
rename to modules/gui/macosx/VLCMain+OldPrefs.h
diff --git a/modules/gui/macosx/intf-prefs.m b/modules/gui/macosx/VLCMain+OldPrefs.m
similarity index 99%
rename from modules/gui/macosx/intf-prefs.m
rename to modules/gui/macosx/VLCMain+OldPrefs.m
index fcdc20c..c916eb7 100644
--- a/modules/gui/macosx/intf-prefs.m
+++ b/modules/gui/macosx/VLCMain+OldPrefs.m
@@ -23,7 +23,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#import "intf-prefs.h"
+#import "VLCMain+OldPrefs.h"
#import "VLCCoreInteraction.h"
#include <unistd.h> /* execl() */
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 749d851..92b6856 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -64,7 +64,7 @@
#import "VLCVideoEffectsWindowController.h"
#import "VLCAudioEffectsWindowController.h"
-#import "intf-prefs.h"
+#import "VLCMain+OldPrefs.h"
#ifdef HAVE_SPARKLE
#import <Sparkle/Sparkle.h> /* we're the update delegate */
diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 0944535..205c2b4 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -35,7 +35,7 @@
#import <vlc_config_cat.h>
#import "misc.h"
#import "intf.h"
-#import "intf-prefs.h"
+#import "VLCMain+OldPrefs.h"
#import "AppleRemote.h"
#import "VLCCoreInteraction.h"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0532a46..a64b9b8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -563,9 +563,9 @@ modules/gui/macosx/VLCFSPanel.m
modules/gui/macosx/helpers.h
modules/gui/macosx/intf.h
modules/gui/macosx/intf.m
-modules/gui/macosx/intf-prefs.h
-modules/gui/macosx/intf-prefs.m
modules/gui/macosx/macosx.m
+modules/gui/macosx/VLCMain+OldPrefs.h
+modules/gui/macosx/VLCMain+OldPrefs.m
modules/gui/macosx/VLCMainMenu.h
modules/gui/macosx/VLCMainMenu.m
modules/gui/macosx/VLCMainWindow.h
More information about the vlc-commits
mailing list