macosx: Rename to VLCOpenWindowController

extras/package/macosx/Resources/English.lproj/Open.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11129.15" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment version="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11129.15"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
         <capability name="box content view" minToolsVersion="7.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="VLCOpen">
+        <customObject id="-2" userLabel="File's Owner" customClass="VLCOpenWindowController">
             <connections>
                 <outlet property="cancelButton" destination="641" id="QPb-Fs-uG1"/>
                 <outlet property="captureLabel" destination="2302" id="yA2-pt-LWQ"/>

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

@@ -402,8 +402,8 @@
 		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 */; };
-		1CCB5F7A1A62A724004C3E90 /* open.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28203E2EB1C0059A3A7 /* open.m */; };
+		1CCB5F791A62A724004C3E90 /* VLCOpenWindowController.h in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28103E2EB1C0059A3A7 /* VLCOpenWindowController.h */; };
+		1CCB5F7A1A62A724004C3E90 /* VLCOpenWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28203E2EB1C0059A3A7 /* VLCOpenWindowController.m */; };
 		1CCB5F7B1A62A724004C3E90 /* output.h in Sources */ = {isa = PBXBuildFile; fileRef = 8E55FB7F0459B0FD00FB3317 /* output.h */; };
 		1CCB5F7C1A62A724004C3E90 /* output.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E55FB800459B0FD00FB3317 /* output.m */; };
 		1CCB5F7D1A62A724004C3E90 /* VLCPlaylist.h in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28303E2EB1C0059A3A7 /* VLCPlaylist.h */; };
@@ -1340,8 +1340,8 @@
 		8ED6C27E03E2EB1C0059A3A7 /* macosx.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = macosx.m; path = ../../../modules/gui/macosx/macosx.m; sourceTree = SOURCE_ROOT; };
 		8ED6C27F03E2EB1C0059A3A7 /* misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = misc.h; path = ../../../modules/gui/macosx/misc.h; sourceTree = SOURCE_ROOT; };
 		8ED6C28003E2EB1C0059A3A7 /* misc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = misc.m; path = ../../../modules/gui/macosx/misc.m; sourceTree = SOURCE_ROOT; };
-		8ED6C28103E2EB1C0059A3A7 /* open.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = open.h; path = ../../../modules/gui/macosx/open.h; sourceTree = SOURCE_ROOT; };
-		8ED6C28203E2EB1C0059A3A7 /* open.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = open.m; path = ../../../modules/gui/macosx/open.m; sourceTree = SOURCE_ROOT; };
+		8ED6C28103E2EB1C0059A3A7 /* VLCOpenWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCOpenWindowController.h; path = ../../../modules/gui/macosx/VLCOpenWindowController.h; sourceTree = SOURCE_ROOT; };
+		8ED6C28203E2EB1C0059A3A7 /* VLCOpenWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCOpenWindowController.m; path = ../../../modules/gui/macosx/VLCOpenWindowController.m; sourceTree = SOURCE_ROOT; };
 		8ED6C28303E2EB1C0059A3A7 /* VLCPlaylist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCPlaylist.h; path = ../../../modules/gui/macosx/VLCPlaylist.h; sourceTree = SOURCE_ROOT; };
 		8ED6C28403E2EB1C0059A3A7 /* VLCPlaylist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCPlaylist.m; path = ../../../modules/gui/macosx/VLCPlaylist.m; sourceTree = SOURCE_ROOT; };
 		8ED6C28503E2EB1C0059A3A7 /* prefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = prefs.h; path = ../../../modules/gui/macosx/prefs.h; sourceTree = SOURCE_ROOT; };
@@ -1915,8 +1915,8 @@
 				CC017A0C14A4C8AF00C09A4F /* MainWindowTitle.m */,
 				8ED6C27F03E2EB1C0059A3A7 /* misc.h */,
 				8ED6C28003E2EB1C0059A3A7 /* misc.m */,
-				8ED6C28103E2EB1C0059A3A7 /* open.h */,
-				8ED6C28203E2EB1C0059A3A7 /* open.m */,
+				8ED6C28103E2EB1C0059A3A7 /* VLCOpenWindowController.h */,
+				8ED6C28203E2EB1C0059A3A7 /* VLCOpenWindowController.m */,
 				8E55FB7F0459B0FD00FB3317 /* output.h */,
 				8E55FB800459B0FD00FB3317 /* output.m */,
 				7DF812F11B5599E40052293C /* PLItem.h */,
@@ -3993,8 +3993,8 @@
 				1CCB5F771A62A724004C3E90 /* VLCMainWindow.h in Sources */,
 				1CCB5F781A62A724004C3E90 /* VLCMainWindow.m in Sources */,
 				6B846FE61CF5D88C00112E54 /* VLCHUDRadiobuttonCell.m in Sources */,
-				1CCB5F791A62A724004C3E90 /* open.h in Sources */,
-				1CCB5F7A1A62A724004C3E90 /* open.m in Sources */,
+				1CCB5F791A62A724004C3E90 /* VLCOpenWindowController.h in Sources */,
+				1CCB5F7A1A62A724004C3E90 /* VLCOpenWindowController.m in Sources */,
 				1CCB5F7B1A62A724004C3E90 /* output.h in Sources */,
 				1CC25CA81B2C585D0003F994 /* darwinvlc.m in Sources */,
 				1CCB5F7C1A62A724004C3E90 /* output.m in Sources */,

modules/gui/macosx/Makefile.am

@@ -43,7 +43,7 @@ libmacosx_plugin_la_SOURCES = \
 	VLCMainMenu.h VLCMainMenu.m \
 	MainWindowTitle.h MainWindowTitle.m \
 	misc.h misc.m \
-	open.h open.m \
+	VLCOpenWindowController.h VLCOpenWindowController.m \
 	output.h output.m \
 	VLCPlaylistView.h VLCPlaylistView.m \
 	VLCPlaylist.h VLCPlaylist.m \

modules/gui/macosx/VLCCoreInteraction.m

@@ -23,7 +23,7 @@
 
 #import "VLCCoreInteraction.h"
 #import "intf.h"
-#import "open.h"
+#import "VLCOpenWindowController.h"
 #import "VLCPlaylist.h"
 #import <math.h>
 #import <vlc_playlist.h>

modules/gui/macosx/VLCMainMenu.m

@@ -29,7 +29,7 @@
 #import <vlc_input.h>
 
 #import "VLCAboutWindowController.h"
-#import "open.h"
+#import "VLCOpenWindowController.h"
 #import "VLCAudioEffectsWindowController.h"
 #import "VLCTrackSynchronizationWindowController.h"
 #import "VLCHelpWindowController.h"

modules/gui/macosx/VLCMainWindow.m

@@ -32,7 +32,7 @@
 #import "VLCCoreInteraction.h"
 #import "VLCAudioEffectsWindowController.h"
 #import "VLCMainMenu.h"
-#import "open.h"
+#import "VLCOpenWindowController.h"
 #import "VLCPlaylist.h"
 #import "SideBarItem.h"
 #import <math.h>

modules/gui/macosx/open.h → modules/gui/macosx/VLCOpenWindowController.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * open.h: Open dialogues for VLC's MacOS X port
+ * VLCOpenWindowController.h: Open dialogues for VLC's MacOS X port
  *****************************************************************************
  * Copyright (C) 2002-2015 VLC authors and VideoLAN
  * $Id$
@@ -24,7 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-@interface VLCOpen : NSWindowController
+@interface VLCOpenWindowController : NSWindowController
 
 @property (readwrite, weak) IBOutlet NSTextField *mrlTextField;
 @property (readwrite, weak) IBOutlet NSTextField *mrlLabel;

modules/gui/macosx/open.m → modules/gui/macosx/VLCOpenWindowController.m

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * open.m: Open dialogues for VLC's MacOS X port
+ * VLCOpenWindowController.m: Open dialogues for VLC's MacOS X port
  *****************************************************************************
  * Copyright (C) 2002-2015 VLC authors and VideoLAN
  * $Id$
@@ -38,7 +38,7 @@
 
 #import "intf.h"
 #import "VLCPlaylist.h"
-#import "open.h"
+#import "VLCOpenWindowController.h"
 #import "output.h"
 #import "VLCEyeTvController.h"
 #import "misc.h"
@@ -51,7 +51,7 @@ struct display_info_t
     CGDirectDisplayID id;
 };
 
-@interface VLCOpen()
+@interface VLCOpenWindowController()
 {
     VLCOutput *_output;
     BOOL b_outputNibLoaded;
@@ -80,7 +80,7 @@ struct display_info_t
 
 @end
 
-@implementation VLCOpen
+@implementation VLCOpenWindowController
 
 #pragma mark -
 #pragma mark Init

modules/gui/macosx/VLCPlaylist.m

@@ -46,7 +46,7 @@
 #import "VLCMainMenu.h"
 #import "VLCPlaylistInfo.h"
 #import "VLCResumeDialogController.h"
-#import "open.h"
+#import "VLCOpenWindowController.h"
 
 #include <vlc_keys.h>
 #import <vlc_interface.h>

modules/gui/macosx/intf.h

@@ -65,7 +65,7 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
 @class VLCPrefs;
 @class VLCCoreDialogProvider;
 @class VLCBookmarksWindowController;
-@class VLCOpen;
+@class VLCOpenWindowController;
 @class VLCDebugMessageWindowController;
 @class VLCTrackSynchronizationWindowController;
 @class VLCAudioEffectsWindowController;
@@ -87,7 +87,7 @@ static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
 - (VLCMainMenu *)mainMenu;
 - (VLCMainWindow *)mainWindow;
 - (VLCBookmarksWindowController *)bookmarks;
-- (VLCOpen *)open;
+- (VLCOpenWindowController *)open;
 - (VLCSimplePrefs *)simplePreferences;
 - (VLCPrefs *)preferences;
 - (VLCPlaylist *)playlist;

modules/gui/macosx/intf.m

@@ -50,7 +50,7 @@
 #import "VLCPlaylist.h"
 #import "VLCPlaylistInfo.h"
 #import "VLCPlaylistInfo.h"
-#import "open.h"
+#import "VLCOpenWindowController.h"
 #import "VLCBookmarksWindowController.h"
 #import "VLCCoreDialogProvider.h"
 #import "simple_prefs.h"
@@ -167,7 +167,7 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable,
     VLCMainMenu *_mainmenu;
     VLCPrefs *_prefs;
     VLCSimplePrefs *_sprefs;
-    VLCOpen *_open;
+    VLCOpenWindowController *_open;
     VLCCoreDialogProvider *_coredialogs;
     VLCBookmarksWindowController *_bookmarks;
     VLCCoreInteraction *_coreinteraction;
@@ -584,10 +584,10 @@ static VLCMain *sharedInstance = nil;
     return _bookmarks;
 }
 
-- (VLCOpen *)open
+- (VLCOpenWindowController *)open
 {
     if (!_open)
-        _open = [[VLCOpen alloc] init];
+        _open = [[VLCOpenWindowController alloc] init];
 
     return _open;
 }