[vlc-commits] macosx: rename to VLCMainMenu
David Fuhrmann
git at videolan.org
Mon Aug 8 18:47:39 CEST 2016
vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Mon Aug 8 18:13:03 2016 +0200| [6939841f64f4b5470b40a0ace0d4c6cf27ff7cc1] | committer: David Fuhrmann
macosx: rename to VLCMainMenu
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6939841f64f4b5470b40a0ace0d4c6cf27ff7cc1
---
extras/package/macosx/vlc.xcodeproj/project.pbxproj | 16 ++++++++--------
modules/gui/macosx/ControlsBar.m | 2 +-
modules/gui/macosx/Makefile.am | 2 +-
modules/gui/macosx/PLModel.m | 2 +-
modules/gui/macosx/VLCInputManager.m | 2 +-
modules/gui/macosx/{MainMenu.h => VLCMainMenu.h} | 0
modules/gui/macosx/{MainMenu.m => VLCMainMenu.m} | 2 +-
modules/gui/macosx/VLCMainWindow.m | 2 +-
modules/gui/macosx/VLCPlaylist.m | 2 +-
modules/gui/macosx/VLCStatusBarIcon.m | 2 +-
modules/gui/macosx/VideoView.m | 2 +-
modules/gui/macosx/intf.m | 2 +-
modules/gui/macosx/misc.m | 2 +-
13 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index 73f5896..4dd5c0d 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -398,8 +398,8 @@
1CCB5F721A62A724004C3E90 /* intf.h in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C27C03E2EB1C0059A3A7 /* intf.h */; };
1CCB5F731A62A724004C3E90 /* intf.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C27D03E2EB1C0059A3A7 /* intf.m */; };
1CCB5F741A62A724004C3E90 /* macosx.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C27E03E2EB1C0059A3A7 /* macosx.m */; };
- 1CCB5F751A62A724004C3E90 /* MainMenu.h in Sources */ = {isa = PBXBuildFile; fileRef = CC448A5A13B61D49009F72E0 /* MainMenu.h */; };
- 1CCB5F761A62A724004C3E90 /* MainMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = CC448A5B13B61D49009F72E0 /* MainMenu.m */; };
+ 1CCB5F751A62A724004C3E90 /* VLCMainMenu.h in Sources */ = {isa = PBXBuildFile; fileRef = CC448A5A13B61D49009F72E0 /* VLCMainMenu.h */; };
+ 1CCB5F761A62A724004C3E90 /* VLCMainMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = CC448A5B13B61D49009F72E0 /* VLCMainMenu.m */; };
1CCB5F771A62A724004C3E90 /* VLCMainWindow.h in Sources */ = {isa = PBXBuildFile; fileRef = CC448A6213B68A0B009F72E0 /* VLCMainWindow.h */; };
1CCB5F781A62A724004C3E90 /* VLCMainWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CC448A6313B68A0B009F72E0 /* VLCMainWindow.m */; };
1CCB5F791A62A724004C3E90 /* open.h in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28103E2EB1C0059A3A7 /* open.h */; };
@@ -1567,8 +1567,8 @@
CC3F9F851350B2A000B0E885 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Growl.framework; path = ../../../contrib/Growl.framework; sourceTree = "<absolute>"; };
CC402F4B0E00ABBB006A4BA4 /* VLC.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = VLC.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
CC426FD01020D44F00A32659 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = ../../../contrib/Sparkle.framework; sourceTree = "<absolute>"; };
- CC448A5A13B61D49009F72E0 /* MainMenu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MainMenu.h; path = ../../../modules/gui/macosx/MainMenu.h; sourceTree = SOURCE_ROOT; };
- CC448A5B13B61D49009F72E0 /* MainMenu.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = MainMenu.m; path = ../../../modules/gui/macosx/MainMenu.m; sourceTree = SOURCE_ROOT; };
+ CC448A5A13B61D49009F72E0 /* VLCMainMenu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VLCMainMenu.h; path = ../../../modules/gui/macosx/VLCMainMenu.h; sourceTree = SOURCE_ROOT; };
+ CC448A5B13B61D49009F72E0 /* VLCMainMenu.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = VLCMainMenu.m; path = ../../../modules/gui/macosx/VLCMainMenu.m; sourceTree = SOURCE_ROOT; };
CC448A6013B68A0B009F72E0 /* CoreInteraction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CoreInteraction.h; path = ../../../modules/gui/macosx/CoreInteraction.h; sourceTree = SOURCE_ROOT; };
CC448A6113B68A0B009F72E0 /* CoreInteraction.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = CoreInteraction.m; path = ../../../modules/gui/macosx/CoreInteraction.m; sourceTree = SOURCE_ROOT; };
CC448A6213B68A0B009F72E0 /* VLCMainWindow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VLCMainWindow.h; path = ../../../modules/gui/macosx/VLCMainWindow.h; sourceTree = SOURCE_ROOT; };
@@ -1907,8 +1907,8 @@
7DF812EF1B555C8E0052293C /* KeyboardBacklight.h */,
7DF812F01B555C8E0052293C /* KeyboardBacklight.m */,
8ED6C27E03E2EB1C0059A3A7 /* macosx.m */,
- CC448A5A13B61D49009F72E0 /* MainMenu.h */,
- CC448A5B13B61D49009F72E0 /* MainMenu.m */,
+ CC448A5A13B61D49009F72E0 /* VLCMainMenu.h */,
+ CC448A5B13B61D49009F72E0 /* VLCMainMenu.m */,
CC448A6213B68A0B009F72E0 /* VLCMainWindow.h */,
CC448A6313B68A0B009F72E0 /* VLCMainWindow.m */,
CC017A0B14A4C8AF00C09A4F /* MainWindowTitle.h */,
@@ -3988,8 +3988,8 @@
1CD3667B1B7A242E0054E39F /* VLCTimeSelectionPanelController.m in Sources */,
1CCB5F731A62A724004C3E90 /* intf.m in Sources */,
1CCB5F741A62A724004C3E90 /* macosx.m in Sources */,
- 1CCB5F751A62A724004C3E90 /* MainMenu.h in Sources */,
- 1CCB5F761A62A724004C3E90 /* MainMenu.m in Sources */,
+ 1CCB5F751A62A724004C3E90 /* VLCMainMenu.h in Sources */,
+ 1CCB5F761A62A724004C3E90 /* VLCMainMenu.m in Sources */,
1CCB5F771A62A724004C3E90 /* VLCMainWindow.h in Sources */,
1CCB5F781A62A724004C3E90 /* VLCMainWindow.m in Sources */,
6B846FE61CF5D88C00112E54 /* VLCHUDRadiobuttonCell.m in Sources */,
diff --git a/modules/gui/macosx/ControlsBar.m b/modules/gui/macosx/ControlsBar.m
index 7c8f622..8eba56f 100644
--- a/modules/gui/macosx/ControlsBar.m
+++ b/modules/gui/macosx/ControlsBar.m
@@ -25,7 +25,7 @@
#import "ControlsBar.h"
#import "intf.h"
#import "CoreInteraction.h"
-#import "MainMenu.h"
+#import "VLCMainMenu.h"
#import "fspanel.h"
#import "VLCPlaylist.h"
#import "CompatibilityFixes.h"
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 91740c4..b71090f 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -40,7 +40,7 @@ libmacosx_plugin_la_SOURCES = \
iTunes.h \
KeyboardBacklight.h KeyboardBacklight.m \
macosx.m \
- MainMenu.h MainMenu.m \
+ VLCMainMenu.h VLCMainMenu.m \
MainWindowTitle.h MainWindowTitle.m \
misc.h misc.m \
open.h open.m \
diff --git a/modules/gui/macosx/PLModel.m b/modules/gui/macosx/PLModel.m
index 32d0b81..a4fd323 100644
--- a/modules/gui/macosx/PLModel.m
+++ b/modules/gui/macosx/PLModel.m
@@ -27,7 +27,7 @@
#import "StringUtility.h"
#import "intf.h"
#import "ControlsBar.h"
-#import "MainMenu.h"
+#import "VLCMainMenu.h"
#import "VLCPlaylistInfo.h"
#import "VLCMainWindow.h"
diff --git a/modules/gui/macosx/VLCInputManager.m b/modules/gui/macosx/VLCInputManager.m
index b6c7220..3229672 100644
--- a/modules/gui/macosx/VLCInputManager.m
+++ b/modules/gui/macosx/VLCInputManager.m
@@ -25,7 +25,7 @@
#import "CompatibilityFixes.h"
#import "ExtensionsManager.h"
#import "intf.h"
-#import "MainMenu.h"
+#import "VLCMainMenu.h"
#import "VLCMainWindow.h"
#import "VLCPlaylist.h"
#import "VLCPlaylistInfo.h"
diff --git a/modules/gui/macosx/MainMenu.h b/modules/gui/macosx/VLCMainMenu.h
similarity index 100%
rename from modules/gui/macosx/MainMenu.h
rename to modules/gui/macosx/VLCMainMenu.h
diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/VLCMainMenu.m
similarity index 99%
rename from modules/gui/macosx/MainMenu.m
rename to modules/gui/macosx/VLCMainMenu.m
index a093a7a..4c062ad 100644
--- a/modules/gui/macosx/MainMenu.m
+++ b/modules/gui/macosx/VLCMainMenu.m
@@ -21,7 +21,7 @@
*Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#import "MainMenu.h"
+#import "VLCMainMenu.h"
#import "intf.h"
#import <vlc_common.h>
diff --git a/modules/gui/macosx/VLCMainWindow.m b/modules/gui/macosx/VLCMainWindow.m
index 06dd9e8..bc9c1b5 100644
--- a/modules/gui/macosx/VLCMainWindow.m
+++ b/modules/gui/macosx/VLCMainWindow.m
@@ -31,7 +31,7 @@
#import "CompatibilityFixes.h"
#import "CoreInteraction.h"
#import "VLCAudioEffectsWindowController.h"
-#import "MainMenu.h"
+#import "VLCMainMenu.h"
#import "open.h"
#import "VLCPlaylist.h"
#import "SideBarItem.h"
diff --git a/modules/gui/macosx/VLCPlaylist.m b/modules/gui/macosx/VLCPlaylist.m
index a608bbf..9a964ab 100644
--- a/modules/gui/macosx/VLCPlaylist.m
+++ b/modules/gui/macosx/VLCPlaylist.m
@@ -43,7 +43,7 @@
#import "intf.h"
#import "VLCPlaylist.h"
-#import "MainMenu.h"
+#import "VLCMainMenu.h"
#import "VLCPlaylistInfo.h"
#import "VLCResumeDialogController.h"
#import "open.h"
diff --git a/modules/gui/macosx/VLCStatusBarIcon.m b/modules/gui/macosx/VLCStatusBarIcon.m
index d43438f..0389093 100644
--- a/modules/gui/macosx/VLCStatusBarIcon.m
+++ b/modules/gui/macosx/VLCStatusBarIcon.m
@@ -23,7 +23,7 @@
#import "VLCStatusBarIcon.h"
-#import "MainMenu.h"
+#import "VLCMainMenu.h"
#import "intf.h"
#import <vlc_common.h>
diff --git a/modules/gui/macosx/VideoView.m b/modules/gui/macosx/VideoView.m
index 9820daf..c7faf44 100644
--- a/modules/gui/macosx/VideoView.m
+++ b/modules/gui/macosx/VideoView.m
@@ -35,7 +35,7 @@
#import "intf.h"
#import "VideoView.h"
#import "CoreInteraction.h"
-#import "MainMenu.h"
+#import "VLCMainMenu.h"
#import <QuartzCore/QuartzCore.h>
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index e39cda9..7545a33 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -44,7 +44,7 @@
#import "CompatibilityFixes.h"
#import "VLCInputManager.h"
-#import "MainMenu.h"
+#import "VLCMainMenu.h"
#import "VideoView.h"
#import "prefs.h"
#import "VLCPlaylist.h"
diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m
index 41c859d..161d5ba 100644
--- a/modules/gui/macosx/misc.m
+++ b/modules/gui/macosx/misc.m
@@ -26,7 +26,7 @@
#import "misc.h"
#import "intf.h" /* VLCApplication */
#import "VLCMainWindow.h"
-#import "MainMenu.h"
+#import "VLCMainMenu.h"
#import "ControlsBar.h"
#import "CoreInteraction.h"
#import <CoreAudio/CoreAudio.h>
More information about the vlc-commits
mailing list