[vlc-commits] macOS: Rename simple_prefs to VLCSimplePrefsController

Marvin Scholz git at videolan.org
Wed Mar 15 14:44:11 CET 2017 

vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Wed Mar 15 14:42:20 2017 +0100| [ad63b98e0e175b383a66813c37d4ede3723e9f9a] | committer: Marvin Scholz

macOS: Rename simple_prefs to VLCSimplePrefsController

VLCSimplePrefsController describes better what it is.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ad63b98e0e175b383a66813c37d4ede3723e9f9a
---

 extras/package/macosx/VLC.xcodeproj/project.pbxproj      | 16 ++++++++--------
 modules/gui/macosx/Makefile.am                           |  2 +-
 modules/gui/macosx/VLCMain.m                             |  2 +-
 modules/gui/macosx/VLCMainMenu.m                         |  2 +-
 .../{simple_prefs.h => VLCSimplePrefsController.h}       |  2 +-
 .../{simple_prefs.m => VLCSimplePrefsController.m}       |  4 ++--
 modules/gui/macosx/prefs.m                               |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index 31411ac..3564ada 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -82,8 +82,8 @@
 		1C3113D51E508C6900D4DD76 /* VLCTextfieldPanelController.m in Sources */ = {isa = PBXBuildFile; fileRef = CC461F6D160078340022423C /* VLCTextfieldPanelController.m */; };
 		1C3113D61E508C6900D4DD76 /* VLCPopupPanelController.h in Sources */ = {isa = PBXBuildFile; fileRef = 1C7CB91A1D787E7600388902 /* VLCPopupPanelController.h */; };
 		1C3113D71E508C6900D4DD76 /* VLCPopupPanelController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C7CB91B1D787E7600388902 /* VLCPopupPanelController.m */; };
-		1C3113D81E508C6900D4DD76 /* simple_prefs.h in Sources */ = {isa = PBXBuildFile; fileRef = CCB24D5E0D54BBAE004D780C /* simple_prefs.h */; };
-		1C3113D91E508C6900D4DD76 /* simple_prefs.m in Sources */ = {isa = PBXBuildFile; fileRef = CCB24D5D0D54BBAE004D780C /* simple_prefs.m */; };
+		1C3113D81E508C6900D4DD76 /* VLCSimplePrefsController.h in Sources */ = {isa = PBXBuildFile; fileRef = CCB24D5E0D54BBAE004D780C /* VLCSimplePrefsController.h */; };
+		1C3113D91E508C6900D4DD76 /* VLCSimplePrefsController.m in Sources */ = {isa = PBXBuildFile; fileRef = CCB24D5D0D54BBAE004D780C /* VLCSimplePrefsController.m */; };
 		1C3113DA1E508C6900D4DD76 /* VLCStringUtility.h in Sources */ = {isa = PBXBuildFile; fileRef = CC269A4615E7947F00F2FDC9 /* VLCStringUtility.h */; };
 		1C3113DB1E508C6900D4DD76 /* VLCStringUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = CC269A4715E7947F00F2FDC9 /* VLCStringUtility.m */; };
 		1C3113DC1E508C6900D4DD76 /* VLCTrackSynchronizationWindowController.h in Sources */ = {isa = PBXBuildFile; fileRef = CC707EC3137464CD0003010A /* VLCTrackSynchronizationWindowController.h */; };
@@ -846,8 +846,8 @@
 		CC79F66614014FC30015D89E /* opengl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = opengl.h; path = ../../../modules/video_output/opengl.h; sourceTree = "<group>"; };
 		CC962E2C0CC7992800A56695 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
 		CCB0BB3013FAC9F40095BD0A /* CompatibilityFixes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CompatibilityFixes.h; sourceTree = "<group>"; };
-		CCB24D5D0D54BBAE004D780C /* simple_prefs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = simple_prefs.m; sourceTree = "<group>"; };
-		CCB24D5E0D54BBAE004D780C /* simple_prefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = simple_prefs.h; sourceTree = "<group>"; };
+		CCB24D5D0D54BBAE004D780C /* VLCSimplePrefsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = VLCSimplePrefsController.m; sourceTree = "<group>"; };
+		CCB24D5E0D54BBAE004D780C /* VLCSimplePrefsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCSimplePrefsController.h; sourceTree = "<group>"; };
 		CCBE999E0F922C51000705F8 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
 		CCCCDCA01413E1C000FE3DE1 /* VLCVoutView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCVoutView.h; sourceTree = "<group>"; };
 		CCCCDCA11413E1C000FE3DE1 /* VLCVoutView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCVoutView.m; sourceTree = "<group>"; };
@@ -997,8 +997,8 @@
 				CC461F6D160078340022423C /* VLCTextfieldPanelController.m */,
 				1C7CB91A1D787E7600388902 /* VLCPopupPanelController.h */,
 				1C7CB91B1D787E7600388902 /* VLCPopupPanelController.m */,
-				CCB24D5E0D54BBAE004D780C /* simple_prefs.h */,
-				CCB24D5D0D54BBAE004D780C /* simple_prefs.m */,
+				CCB24D5E0D54BBAE004D780C /* VLCSimplePrefsController.h */,
+				CCB24D5D0D54BBAE004D780C /* VLCSimplePrefsController.m */,
 				CC269A4615E7947F00F2FDC9 /* VLCStringUtility.h */,
 				CC269A4715E7947F00F2FDC9 /* VLCStringUtility.m */,
 				CC707EC3137464CD0003010A /* VLCTrackSynchronizationWindowController.h */,
@@ -2024,8 +2024,8 @@
 				1C3113D51E508C6900D4DD76 /* VLCTextfieldPanelController.m in Sources */,
 				1C3113D61E508C6900D4DD76 /* VLCPopupPanelController.h in Sources */,
 				1C3113D71E508C6900D4DD76 /* VLCPopupPanelController.m in Sources */,
-				1C3113D81E508C6900D4DD76 /* simple_prefs.h in Sources */,
-				1C3113D91E508C6900D4DD76 /* simple_prefs.m in Sources */,
+				1C3113D81E508C6900D4DD76 /* VLCSimplePrefsController.h in Sources */,
+				1C3113D91E508C6900D4DD76 /* VLCSimplePrefsController.m in Sources */,
 				1C3113DA1E508C6900D4DD76 /* VLCStringUtility.h in Sources */,
 				1C3113DB1E508C6900D4DD76 /* VLCStringUtility.m in Sources */,
 				1C3113DC1E508C6900D4DD76 /* VLCTrackSynchronizationWindowController.h in Sources */,
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 42df1cf..d707729 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -58,7 +58,7 @@ libmacosx_plugin_la_SOURCES = \
 	SideBarItem.h SideBarItem.m \
 	VLCPopupPanelController.h VLCPopupPanelController.m \
 	VLCTextfieldPanelController.h VLCTextfieldPanelController.m \
-	simple_prefs.h simple_prefs.m \
+	VLCSimplePrefsController.h VLCSimplePrefsController.m \
 	SPInvocationGrabbing.h SPInvocationGrabbing.m \
 	SPMediaKeyTap.h SPMediaKeyTap.m \
 	Spotify.h \
diff --git a/modules/gui/macosx/VLCMain.m b/modules/gui/macosx/VLCMain.m
index 6bed31f..7113fe1 100644
--- a/modules/gui/macosx/VLCMain.m
+++ b/modules/gui/macosx/VLCMain.m
@@ -53,7 +53,7 @@
 #import "VLCOpenWindowController.h"
 #import "VLCBookmarksWindowController.h"
 #import "VLCCoreDialogProvider.h"
-#import "simple_prefs.h"
+#import "VLCSimplePrefsController.h"
 #import "VLCCoreInteraction.h"
 #import "VLCTrackSynchronizationWindowController.h"
 #import "VLCExtensionsManager.h"
diff --git a/modules/gui/macosx/VLCMainMenu.m b/modules/gui/macosx/VLCMainMenu.m
index 73c467e..cd40924 100644
--- a/modules/gui/macosx/VLCMainMenu.m
+++ b/modules/gui/macosx/VLCMainMenu.m
@@ -35,7 +35,7 @@
 #import "VLCHelpWindowController.h"
 #import "VLCVideoEffectsWindowController.h"
 #import "VLCBookmarksWindowController.h"
-#import "simple_prefs.h"
+#import "VLCSimplePrefsController.h"
 #import "VLCPlaylist.h"
 #import "VLCPlaylistInfo.h"
 #import "VLCVoutView.h"
diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/VLCSimplePrefsController.h
similarity index 99%
rename from modules/gui/macosx/simple_prefs.h
rename to modules/gui/macosx/VLCSimplePrefsController.h
index 45ec19d..87b9586 100644
--- a/modules/gui/macosx/simple_prefs.h
+++ b/modules/gui/macosx/VLCSimplePrefsController.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
-* simple_prefs.h: Simple Preferences for Mac OS X
+* VLCSimplePrefsController.h: Simple Preferences for Mac OS X
 *****************************************************************************
 * Copyright (C) 2008-2014 VLC authors and VideoLAN
 * $Id$
diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/VLCSimplePrefsController.m
similarity index 99%
rename from modules/gui/macosx/simple_prefs.m
rename to modules/gui/macosx/VLCSimplePrefsController.m
index b04a65a..b33cc6e 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/VLCSimplePrefsController.m
@@ -1,5 +1,5 @@
 /*****************************************************************************
-* simple_prefs.m: Simple Preferences for Mac OS X
+* VLCSimplePrefsController.m: Simple Preferences for Mac OS X
 *****************************************************************************
 * Copyright (C) 2008-2014 VLC authors and VideoLAN
 * $Id$
@@ -25,7 +25,7 @@
 #endif
 
 #import "CompatibilityFixes.h"
-#import "simple_prefs.h"
+#import "VLCSimplePrefsController.h"
 #import "prefs.h"
 #import <vlc_keys.h>
 #import <vlc_interface.h>
diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m
index 6e74409..dbeed47 100644
--- a/modules/gui/macosx/prefs.m
+++ b/modules/gui/macosx/prefs.m
@@ -56,7 +56,7 @@
 #import "CompatibilityFixes.h"
 #import "VLCMain.h"
 #import "prefs.h"
-#import "simple_prefs.h"
+#import "VLCSimplePrefsController.h"
 #import "prefs_widgets.h"
 #import "VLCCoreInteraction.h"
 #import <vlc_keys.h>

More information about the vlc-commits mailing list