macosx: Rename to VLCExtensionsDialogProvider

extras/package/macosx/vlc.xcodeproj/project.pbxproj

@@ -390,8 +390,8 @@
 		1CCB5F671A62A724004C3E90 /* VLCCoreInteraction.m in Sources */ = {isa = PBXBuildFile; fileRef = CC448A6113B68A0B009F72E0 /* VLCCoreInteraction.m */; };
 		1CCB5F681A62A724004C3E90 /* VLCDebugMessageWindowController.h in Sources */ = {isa = PBXBuildFile; fileRef = 7D8BB0B318302AC000FAE9B7 /* VLCDebugMessageWindowController.h */; };
 		1CCB5F691A62A724004C3E90 /* VLCDebugMessageWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D8BB0B418302AC000FAE9B7 /* VLCDebugMessageWindowController.m */; };
-		1CCB5F6A1A62A724004C3E90 /* ExtensionsDialogProvider.h in Sources */ = {isa = PBXBuildFile; fileRef = 5CCED71014C0D4A90057F8D1 /* ExtensionsDialogProvider.h */; };
-		1CCB5F6B1A62A724004C3E90 /* ExtensionsDialogProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 5CCED71114C0D4A90057F8D1 /* ExtensionsDialogProvider.m */; };
+		1CCB5F6A1A62A724004C3E90 /* VLCExtensionsDialogProvider.h in Sources */ = {isa = PBXBuildFile; fileRef = 5CCED71014C0D4A90057F8D1 /* VLCExtensionsDialogProvider.h */; };
+		1CCB5F6B1A62A724004C3E90 /* VLCExtensionsDialogProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 5CCED71114C0D4A90057F8D1 /* VLCExtensionsDialogProvider.m */; };
 		1CCB5F6C1A62A724004C3E90 /* ExtensionsManager.h in Sources */ = {isa = PBXBuildFile; fileRef = 5CCED71214C0D4A90057F8D1 /* ExtensionsManager.h */; };
 		1CCB5F6D1A62A724004C3E90 /* ExtensionsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5CCED71314C0D4A90057F8D1 /* ExtensionsManager.m */; };
 		1CCB5F6E1A62A724004C3E90 /* VLCEyeTvController.h in Sources */ = {isa = PBXBuildFile; fileRef = CC6EDD4F0B9CA2140096068A /* VLCEyeTvController.h */; };
@@ -1259,8 +1259,8 @@
 		1CE5ED2019DD6AB700FCEFD3 /* lion-window-fullscreen@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lion-window-fullscreen@2x.png"; sourceTree = "<group>"; };
 		2AEF857609A5FEC900130822 /* VLCFSPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCFSPanel.h; path = ../../../modules/gui/macosx/VLCFSPanel.h; sourceTree = SOURCE_ROOT; };
 		2AEF857709A5FEC900130822 /* VLCFSPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCFSPanel.m; path = ../../../modules/gui/macosx/VLCFSPanel.m; sourceTree = SOURCE_ROOT; };
-		5CCED71014C0D4A90057F8D1 /* ExtensionsDialogProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExtensionsDialogProvider.h; path = ../../../modules/gui/macosx/ExtensionsDialogProvider.h; sourceTree = SOURCE_ROOT; };
-		5CCED71114C0D4A90057F8D1 /* ExtensionsDialogProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ExtensionsDialogProvider.m; path = ../../../modules/gui/macosx/ExtensionsDialogProvider.m; sourceTree = SOURCE_ROOT; };
+		5CCED71014C0D4A90057F8D1 /* VLCExtensionsDialogProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCExtensionsDialogProvider.h; path = ../../../modules/gui/macosx/VLCExtensionsDialogProvider.h; sourceTree = SOURCE_ROOT; };
+		5CCED71114C0D4A90057F8D1 /* VLCExtensionsDialogProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCExtensionsDialogProvider.m; path = ../../../modules/gui/macosx/VLCExtensionsDialogProvider.m; sourceTree = SOURCE_ROOT; };
 		5CCED71214C0D4A90057F8D1 /* ExtensionsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExtensionsManager.h; path = ../../../modules/gui/macosx/ExtensionsManager.h; sourceTree = SOURCE_ROOT; };
 		5CCED71314C0D4A90057F8D1 /* ExtensionsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ExtensionsManager.m; path = ../../../modules/gui/macosx/ExtensionsManager.m; sourceTree = SOURCE_ROOT; };
 		5CCED71414C0D4A90057F8D1 /* VLCUIWidgets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCUIWidgets.h; path = ../../../modules/gui/macosx/VLCUIWidgets.h; sourceTree = SOURCE_ROOT; };
@@ -1900,8 +1900,8 @@
 				CC448A6113B68A0B009F72E0 /* VLCCoreInteraction.m */,
 				7D8BB0B318302AC000FAE9B7 /* VLCDebugMessageWindowController.h */,
 				7D8BB0B418302AC000FAE9B7 /* VLCDebugMessageWindowController.m */,
-				5CCED71014C0D4A90057F8D1 /* ExtensionsDialogProvider.h */,
-				5CCED71114C0D4A90057F8D1 /* ExtensionsDialogProvider.m */,
+				5CCED71014C0D4A90057F8D1 /* VLCExtensionsDialogProvider.h */,
+				5CCED71114C0D4A90057F8D1 /* VLCExtensionsDialogProvider.m */,
 				5CCED71214C0D4A90057F8D1 /* ExtensionsManager.h */,
 				5CCED71314C0D4A90057F8D1 /* ExtensionsManager.m */,
 				CC6EDD4F0B9CA2140096068A /* VLCEyeTvController.h */,
@@ -3990,9 +3990,9 @@
 				1CCB5F681A62A724004C3E90 /* VLCDebugMessageWindowController.h in Sources */,
 				1CCB5F691A62A724004C3E90 /* VLCDebugMessageWindowController.m in Sources */,
 				6B846FE51CF5D88C00112E54 /* VLCHUDCheckboxCell.m in Sources */,
-				1CCB5F6A1A62A724004C3E90 /* ExtensionsDialogProvider.h in Sources */,
+				1CCB5F6A1A62A724004C3E90 /* VLCExtensionsDialogProvider.h in Sources */,
 				7DBB06641CC2314D004C74D2 /* caopengllayer.m in Sources */,
-				1CCB5F6B1A62A724004C3E90 /* ExtensionsDialogProvider.m in Sources */,
+				1CCB5F6B1A62A724004C3E90 /* VLCExtensionsDialogProvider.m in Sources */,
 				1CCB5F6C1A62A724004C3E90 /* ExtensionsManager.h in Sources */,
 				1CCB5F6D1A62A724004C3E90 /* ExtensionsManager.m in Sources */,
 				6BBBB8B41D112BAC001BD9BA /* VLCRendererItem.m in Sources */,

modules/gui/macosx/ExtensionsManager.h

@@ -25,14 +25,14 @@
 # include "config.h"
 #endif
 
-#import "ExtensionsDialogProvider.h"
+#import "VLCExtensionsDialogProvider.h"
 #import "VLCMain.h"
 
 #import <vlc_extensions.h>
 
 #import <Cocoa/Cocoa.h>
 
-@class ExtensionsDialogProvider;
+@class VLCExtensionsDialogProvider;
 
 @protocol ExtensionsDelegate <NSObject>
 - (void)extensionsUpdated;

modules/gui/macosx/ExtensionsManager.m

@@ -24,7 +24,7 @@
 
 #import "ExtensionsManager.h"
 
-#import "ExtensionsDialogProvider.h"
+#import "VLCExtensionsDialogProvider.h"
 
 #import <vlc_modules.h>
 #import "assert.h"
@@ -36,7 +36,7 @@
 @interface ExtensionsManager()
 {
     extensions_manager_t *p_extensions_manager;
-    ExtensionsDialogProvider *_extensionDialogProvider;
+    VLCExtensionsDialogProvider *_extensionDialogProvider;
 
     NSMutableDictionary *p_extDict;
 
@@ -54,7 +54,7 @@
 
     if (self) {
         p_extensions_manager = NULL;
-        _extensionDialogProvider = [[ExtensionsDialogProvider alloc] init];
+        _extensionDialogProvider = [[VLCExtensionsDialogProvider alloc] init];
 
         p_extDict = [[NSMutableDictionary alloc] init];
 

modules/gui/macosx/Makefile.am

@@ -32,7 +32,7 @@ libmacosx_plugin_la_SOURCES = \
 	VLCMainWindowControlsBar.m VLCMainWindowControlsBar.h \
 	VLCConvertAndSaveWindowController.h VLCConvertAndSaveWindowController.m \
 	VLCCoreInteraction.h VLCCoreInteraction.m \
-	ExtensionsDialogProvider.h ExtensionsDialogProvider.m \
+	VLCExtensionsDialogProvider.h VLCExtensionsDialogProvider.m \
 	ExtensionsManager.h ExtensionsManager.m \
 	VLCFSPanel.h VLCFSPanel.m \
 	VLCHelpWindowController.h VLCHelpWindowController.m \

modules/gui/macosx/ExtensionsDialogProvider.h → modules/gui/macosx/VLCExtensionsDialogProvider.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * ExtensionsDialogProvider.h: Mac OS X Extensions Dialogs
+ * VLCExtensionsDialogProvider.h: Mac OS X Extensions Dialogs
  *****************************************************************************
  * Copyright (C) 2005-2012 VLC authors and VideoLAN
  * $Id$
@@ -35,7 +35,7 @@
 /*****************************************************************************
  * ExtensionsDialogProvider interface
  *****************************************************************************/
-@interface ExtensionsDialogProvider : NSObject <NSWindowDelegate>
+@interface VLCExtensionsDialogProvider : NSObject <NSWindowDelegate>
 
 - (void)performEventWithObject: (NSValue *)o_value ofType:(const char*)type;
 

modules/gui/macosx/ExtensionsDialogProvider.m → modules/gui/macosx/VLCExtensionsDialogProvider.m

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * ExtensionsDialogProvider.m: Mac OS X Extensions Dialogs
+ * VLCExtensionsDialogProvider.m: Mac OS X Extensions Dialogs
  *****************************************************************************
  * Copyright (C) 2010-2015 VLC authors and VideoLAN
  * $Id$
@@ -24,7 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#import "ExtensionsDialogProvider.h"
+#import "VLCExtensionsDialogProvider.h"
 
 #import "VLCMain.h"
 #import "ExtensionsManager.h"
@@ -250,7 +250,7 @@ static void extensionDialogCallback(extension_dialog_t *p_ext_dialog,
 
 {
     @autoreleasepool {
-        ExtensionsDialogProvider *provider = (__bridge ExtensionsDialogProvider *)p_data;
+        VLCExtensionsDialogProvider *provider = (__bridge VLCExtensionsDialogProvider *)p_data;
         if (!provider)
             return;
 
@@ -259,7 +259,7 @@ static void extensionDialogCallback(extension_dialog_t *p_ext_dialog,
     }
 }
 
-@implementation ExtensionsDialogProvider
+@implementation VLCExtensionsDialogProvider
 
 - (id)init
 {

po/POTFILES.in

@@ -555,8 +555,8 @@ modules/gui/macosx/VLCCoreDialogProvider.h
 modules/gui/macosx/VLCCoreDialogProvider.m
 modules/gui/macosx/VLCCoreInteraction.h
 modules/gui/macosx/VLCCoreInteraction.m
-modules/gui/macosx/ExtensionsDialogProvider.h
-modules/gui/macosx/ExtensionsDialogProvider.m
+modules/gui/macosx/VLCExtensionsDialogProvider.h
+modules/gui/macosx/VLCExtensionsDialogProvider.m
 modules/gui/macosx/ExtensionsManager.h
 modules/gui/macosx/ExtensionsManager.m
 modules/gui/macosx/VLCEyeTvController.h