[vlc-commits] macosx: rename coredialogs.x to VLCCoreDialogProvider.x

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Mon Aug  8 15:52:13 2016 +0200| [92e11edb6f030b81834b3a07570f525369f58620] | committer: David Fuhrmann

macosx: rename coredialogs.x to VLCCoreDialogProvider.x

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

 extras/package/macosx/vlc.xcodeproj/project.pbxproj      | 16 ++++++++--------
 modules/gui/macosx/ExtensionsDialogProvider.h            |  1 -
 modules/gui/macosx/Makefile.am                           |  2 +-
 .../macosx/{coredialogs.h => VLCCoreDialogProvider.h}    |  2 +-
 .../macosx/{coredialogs.m => VLCCoreDialogProvider.m}    |  4 ++--
 modules/gui/macosx/intf.m                                |  2 +-
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index 06ad34d..2db936c 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -381,8 +381,8 @@
 		1CCB5F611A62A724004C3E90 /* ControlsBar.m in Sources */ = {isa = PBXBuildFile; fileRef = E0382C01160BA09E0031D7FF /* ControlsBar.m */; };
 		1CCB5F621A62A724004C3E90 /* ConvertAndSave.h in Sources */ = {isa = PBXBuildFile; fileRef = CC0663341566C34C003A411C /* ConvertAndSave.h */; };
 		1CCB5F631A62A724004C3E90 /* ConvertAndSave.m in Sources */ = {isa = PBXBuildFile; fileRef = CC0663351566C34C003A411C /* ConvertAndSave.m */; };
-		1CCB5F641A62A724004C3E90 /* coredialogs.h in Sources */ = {isa = PBXBuildFile; fileRef = CC4A33220F8CB017000FC4A7 /* coredialogs.h */; };
-		1CCB5F651A62A724004C3E90 /* coredialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CC4A33210F8CB017000FC4A7 /* coredialogs.m */; };
+		1CCB5F641A62A724004C3E90 /* VLCCoreDialogProvider.h in Sources */ = {isa = PBXBuildFile; fileRef = CC4A33220F8CB017000FC4A7 /* VLCCoreDialogProvider.h */; };
+		1CCB5F651A62A724004C3E90 /* VLCCoreDialogProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = CC4A33210F8CB017000FC4A7 /* VLCCoreDialogProvider.m */; };
 		1CCB5F661A62A724004C3E90 /* CoreInteraction.h in Sources */ = {isa = PBXBuildFile; fileRef = CC448A6013B68A0B009F72E0 /* CoreInteraction.h */; };
 		1CCB5F671A62A724004C3E90 /* CoreInteraction.m in Sources */ = {isa = PBXBuildFile; fileRef = CC448A6113B68A0B009F72E0 /* CoreInteraction.m */; };
 		1CCB5F681A62A724004C3E90 /* DebugMessageVisualizer.h in Sources */ = {isa = PBXBuildFile; fileRef = 7D8BB0B318302AC000FAE9B7 /* DebugMessageVisualizer.h */; };
@@ -1575,8 +1575,8 @@
 		CC448A6313B68A0B009F72E0 /* MainWindow.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = MainWindow.m; path = ../../../modules/gui/macosx/MainWindow.m; sourceTree = SOURCE_ROOT; };
 		CC461F6C160078340022423C /* SharedDialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = SharedDialogs.h; path = ../../../modules/gui/macosx/SharedDialogs.h; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		CC461F6D160078340022423C /* SharedDialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SharedDialogs.m; path = ../../../modules/gui/macosx/SharedDialogs.m; sourceTree = SOURCE_ROOT; };
-		CC4A33210F8CB017000FC4A7 /* coredialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = coredialogs.m; path = ../../../modules/gui/macosx/coredialogs.m; sourceTree = SOURCE_ROOT; };
-		CC4A33220F8CB017000FC4A7 /* coredialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = coredialogs.h; path = ../../../modules/gui/macosx/coredialogs.h; sourceTree = SOURCE_ROOT; };
+		CC4A33210F8CB017000FC4A7 /* VLCCoreDialogProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCCoreDialogProvider.m; path = ../../../modules/gui/macosx/VLCCoreDialogProvider.m; sourceTree = SOURCE_ROOT; };
+		CC4A33220F8CB017000FC4A7 /* VLCCoreDialogProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCCoreDialogProvider.h; path = ../../../modules/gui/macosx/VLCCoreDialogProvider.h; sourceTree = SOURCE_ROOT; };
 		CC4D67F71348F601003FCC5B /* specific.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = specific.c; path = ../../../src/darwin/specific.c; sourceTree = "<group>"; };
 		CC4EFC2C13E96BD00091D19A /* dropzone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = dropzone.png; path = Resources/mainwindow/dropzone.png; sourceTree = "<group>"; };
 		CC5560231365CDC700D54038 /* AudioEffects.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AudioEffects.h; path = ../../../modules/gui/macosx/AudioEffects.h; sourceTree = SOURCE_ROOT; };
@@ -1883,8 +1883,8 @@
 				E0382C01160BA09E0031D7FF /* ControlsBar.m */,
 				CC0663341566C34C003A411C /* ConvertAndSave.h */,
 				CC0663351566C34C003A411C /* ConvertAndSave.m */,
-				CC4A33220F8CB017000FC4A7 /* coredialogs.h */,
-				CC4A33210F8CB017000FC4A7 /* coredialogs.m */,
+				CC4A33220F8CB017000FC4A7 /* VLCCoreDialogProvider.h */,
+				CC4A33210F8CB017000FC4A7 /* VLCCoreDialogProvider.m */,
 				CC448A6013B68A0B009F72E0 /* CoreInteraction.h */,
 				CC448A6113B68A0B009F72E0 /* CoreInteraction.m */,
 				7D8BB0B318302AC000FAE9B7 /* DebugMessageVisualizer.h */,
@@ -3965,8 +3965,8 @@
 				1CCB5F611A62A724004C3E90 /* ControlsBar.m in Sources */,
 				1CCB5F621A62A724004C3E90 /* ConvertAndSave.h in Sources */,
 				1CCB5F631A62A724004C3E90 /* ConvertAndSave.m in Sources */,
-				1CCB5F641A62A724004C3E90 /* coredialogs.h in Sources */,
-				1CCB5F651A62A724004C3E90 /* coredialogs.m in Sources */,
+				1CCB5F641A62A724004C3E90 /* VLCCoreDialogProvider.h in Sources */,
+				1CCB5F651A62A724004C3E90 /* VLCCoreDialogProvider.m in Sources */,
 				1CCB5F661A62A724004C3E90 /* CoreInteraction.h in Sources */,
 				6BBBB8AA1D108A17001BD9BA /* VLCRendererDialog.m in Sources */,
 				1CCB5F671A62A724004C3E90 /* CoreInteraction.m in Sources */,
diff --git a/modules/gui/macosx/ExtensionsDialogProvider.h b/modules/gui/macosx/ExtensionsDialogProvider.h
index 987a1b3..ac72faf 100644
--- a/modules/gui/macosx/ExtensionsDialogProvider.h
+++ b/modules/gui/macosx/ExtensionsDialogProvider.h
@@ -23,7 +23,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#import "coredialogs.h"
 #import "intf.h"
 #import "VLCUIWidgets.h"
 
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 231656e..0cd8123 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -32,7 +32,6 @@ libmacosx_plugin_la_SOURCES = \
 	CompatibilityFixes.h \
 	ControlsBar.m ControlsBar.h \
 	ConvertAndSave.h ConvertAndSave.m \
-	coredialogs.h coredialogs.m \
 	CoreInteraction.h CoreInteraction.m \
 	DebugMessageVisualizer.h DebugMessageVisualizer.m \
 	ExtensionsDialogProvider.h ExtensionsDialogProvider.m \
@@ -78,6 +77,7 @@ libmacosx_plugin_la_SOURCES = \
 	VLCStatusBarIcon.h VLCStatusBarIcon.m \
 	VLCVoutWindowController.h VLCVoutWindowController.m \
 	Windows.h Windows.m \
+	VLCCoreDialogProvider.h VLCCoreDialogProvider.m \
 	VLCHUDSliderCell.h VLCHUDSliderCell.m \
 	VLCHUDButtonCell.h VLCHUDButtonCell.m \
 	VLCHUDCheckboxCell.h VLCHUDCheckboxCell.m \
diff --git a/modules/gui/macosx/coredialogs.h b/modules/gui/macosx/VLCCoreDialogProvider.h
similarity index 97%
rename from modules/gui/macosx/coredialogs.h
rename to modules/gui/macosx/VLCCoreDialogProvider.h
index 6c9097f..d074c08 100644
--- a/modules/gui/macosx/coredialogs.h
+++ b/modules/gui/macosx/VLCCoreDialogProvider.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * coredialogs.h: Mac OS X Core Dialogs
+ * VLCCoreDialogProvider.h: Mac OS X Core Dialogs
  *****************************************************************************
  * Copyright (C) 2005-2016 VLC authors and VideoLAN
  * $Id$
diff --git a/modules/gui/macosx/coredialogs.m b/modules/gui/macosx/VLCCoreDialogProvider.m
similarity index 99%
rename from modules/gui/macosx/coredialogs.m
rename to modules/gui/macosx/VLCCoreDialogProvider.m
index e93dc99..0e59290 100644
--- a/modules/gui/macosx/coredialogs.m
+++ b/modules/gui/macosx/VLCCoreDialogProvider.m
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * coredialogs.m: Mac OS X Core Dialogs
+ * VLCCoreDialogProvider.m: Mac OS X Core Dialogs
  *****************************************************************************
  * Copyright (C) 2005-2016 VLC authors and VideoLAN
  * $Id$
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #import "intf.h"
-#import "coredialogs.h"
+#import "VLCCoreDialogProvider.h"
 #import "misc.h"
 
 /* for the icon in our custom error panel */
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 5c97883..79b22b7 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -52,7 +52,7 @@
 #import "VLCPlaylistInfo.h"
 #import "open.h"
 #import "bookmarks.h"
-#import "coredialogs.h"
+#import "VLCCoreDialogProvider.h"
 #import "simple_prefs.h"
 #import "CoreInteraction.h"
 #import "TrackSynchronization.h"