From e76f7235ce9af0b0f46455ca00c23648dfcb73fc Mon Sep 17 00:00:00 2001
From: David Fuhrmann <dfuhrmann@videolan.org>
Date: Thu, 1 Sep 2016 17:16:13 +0200
Subject: [PATCH] macosx: Rename to VLCMainWindowTitleView
---
.../package/macosx/vlc.xcodeproj/project.pbxproj | 16 ++++++++--------
modules/gui/macosx/Makefile.am | 2 +-
modules/gui/macosx/VLCMainWindow.h | 2 +-
...ainWindowTitle.h => VLCMainWindowTitleView.h} | 0
...ainWindowTitle.m => VLCMainWindowTitleView.m} | 2 +-
po/POTFILES.in | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
rename modules/gui/macosx/{MainWindowTitle.h => VLCMainWindowTitleView.h} (100%)
rename modules/gui/macosx/{MainWindowTitle.m => VLCMainWindowTitleView.m} (99%)
diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index 194b788b265c..fbf5417aafcc 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -439,8 +439,8 @@
1CCB5F981A62A724004C3E90 /* Windows.m in Sources */ = {isa = PBXBuildFile; fileRef = E06CF7F516020F6200C698B7 /* Windows.m */; };
1CCB5F991A62A724004C3E90 /* misc.h in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C27F03E2EB1C0059A3A7 /* misc.h */; };
1CCB5F9A1A62A724004C3E90 /* misc.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ED6C28003E2EB1C0059A3A7 /* misc.m */; };
- 1CCB5F9B1A62A724004C3E90 /* MainWindowTitle.h in Sources */ = {isa = PBXBuildFile; fileRef = CC017A0B14A4C8AF00C09A4F /* MainWindowTitle.h */; };
- 1CCB5F9C1A62A724004C3E90 /* MainWindowTitle.m in Sources */ = {isa = PBXBuildFile; fileRef = CC017A0C14A4C8AF00C09A4F /* MainWindowTitle.m */; };
+ 1CCB5F9B1A62A724004C3E90 /* VLCMainWindowTitleView.h in Sources */ = {isa = PBXBuildFile; fileRef = CC017A0B14A4C8AF00C09A4F /* VLCMainWindowTitleView.h */; };
+ 1CCB5F9C1A62A724004C3E90 /* VLCMainWindowTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = CC017A0C14A4C8AF00C09A4F /* VLCMainWindowTitleView.m */; };
1CCB5F9D1A62A724004C3E90 /* BWQuincyManager.h in Sources */ = {isa = PBXBuildFile; fileRef = 7D3F652618805297005776C4 /* BWQuincyManager.h */; };
1CCB5F9E1A62A724004C3E90 /* BWQuincyManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D3F652718805297005776C4 /* BWQuincyManager.m */; };
1CCB5F9F1A62A724004C3E90 /* BWQuincyUI.h in Sources */ = {isa = PBXBuildFile; fileRef = 7D3F652818805297005776C4 /* BWQuincyUI.h */; };
@@ -1358,8 +1358,8 @@
8ED6C28503E2EB1C0059A3A7 /* prefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = prefs.h; path = ../../../modules/gui/macosx/prefs.h; sourceTree = SOURCE_ROOT; };
8ED6C28603E2EB1C0059A3A7 /* prefs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = prefs.m; path = ../../../modules/gui/macosx/prefs.m; sourceTree = SOURCE_ROOT; };
8EDAC3430440F72D0059A3A7 /* README.MacOSX.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = README.MacOSX.rtf; sourceTree = SOURCE_ROOT; };
- CC017A0B14A4C8AF00C09A4F /* MainWindowTitle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MainWindowTitle.h; path = ../../../modules/gui/macosx/MainWindowTitle.h; sourceTree = SOURCE_ROOT; };
- CC017A0C14A4C8AF00C09A4F /* MainWindowTitle.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = MainWindowTitle.m; path = ../../../modules/gui/macosx/MainWindowTitle.m; sourceTree = SOURCE_ROOT; };
+ CC017A0B14A4C8AF00C09A4F /* VLCMainWindowTitleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VLCMainWindowTitleView.h; path = ../../../modules/gui/macosx/VLCMainWindowTitleView.h; sourceTree = SOURCE_ROOT; };
+ CC017A0C14A4C8AF00C09A4F /* VLCMainWindowTitleView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = VLCMainWindowTitleView.m; path = ../../../modules/gui/macosx/VLCMainWindowTitleView.m; sourceTree = SOURCE_ROOT; };
CC04321313B246DF00D7D52E /* effects-double-buttons_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-double-buttons_dark.png"; path = "Resources/mainwindow_dark/effects-double-buttons_dark.png"; sourceTree = "<group>"; };
CC04321513B246DF00D7D52E /* effects-double-buttons-pressed_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-double-buttons-pressed_dark.png"; path = "Resources/mainwindow_dark/effects-double-buttons-pressed_dark.png"; sourceTree = "<group>"; };
CC04321613B246DF00D7D52E /* effects-one-button_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-one-button_dark.png"; path = "Resources/mainwindow_dark/effects-one-button_dark.png"; sourceTree = "<group>"; };
@@ -1926,8 +1926,8 @@
CC448A5B13B61D49009F72E0 /* VLCMainMenu.m */,
CC448A6213B68A0B009F72E0 /* VLCMainWindow.h */,
CC448A6313B68A0B009F72E0 /* VLCMainWindow.m */,
- CC017A0B14A4C8AF00C09A4F /* MainWindowTitle.h */,
- CC017A0C14A4C8AF00C09A4F /* MainWindowTitle.m */,
+ CC017A0B14A4C8AF00C09A4F /* VLCMainWindowTitleView.h */,
+ CC017A0C14A4C8AF00C09A4F /* VLCMainWindowTitleView.m */,
8ED6C27F03E2EB1C0059A3A7 /* misc.h */,
8ED6C28003E2EB1C0059A3A7 /* misc.m */,
8ED6C28103E2EB1C0059A3A7 /* VLCOpenWindowController.h */,
@@ -4050,8 +4050,8 @@
1CCB5F981A62A724004C3E90 /* Windows.m in Sources */,
1CCB5F991A62A724004C3E90 /* misc.h in Sources */,
1CCB5F9A1A62A724004C3E90 /* misc.m in Sources */,
- 1CCB5F9B1A62A724004C3E90 /* MainWindowTitle.h in Sources */,
- 1CCB5F9C1A62A724004C3E90 /* MainWindowTitle.m in Sources */,
+ 1CCB5F9B1A62A724004C3E90 /* VLCMainWindowTitleView.h in Sources */,
+ 1CCB5F9C1A62A724004C3E90 /* VLCMainWindowTitleView.m in Sources */,
6B846FE41CF5D88C00112E54 /* VLCHUDButtonCell.m in Sources */,
1CCB5F9D1A62A724004C3E90 /* BWQuincyManager.h in Sources */,
1CCB5F9E1A62A724004C3E90 /* BWQuincyManager.m in Sources */,
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 29bced30440e..866a5147c4f9 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -43,7 +43,7 @@ libmacosx_plugin_la_SOURCES = \
VLCKeyboardBacklightControl.h VLCKeyboardBacklightControl.m \
macosx.m \
VLCMainMenu.h VLCMainMenu.m \
- MainWindowTitle.h MainWindowTitle.m \
+ VLCMainWindowTitleView.h VLCMainWindowTitleView.m \
misc.h misc.m \
VLCOpenWindowController.h VLCOpenWindowController.m \
VLCOutput.h VLCOutput.m \
diff --git a/modules/gui/macosx/VLCMainWindow.h b/modules/gui/macosx/VLCMainWindow.h
index a2efb0a84f78..940b7d9b3f41 100644
--- a/modules/gui/macosx/VLCMainWindow.h
+++ b/modules/gui/macosx/VLCMainWindow.h
@@ -33,7 +33,7 @@
#import "Windows.h"
#import "misc.h"
#import "VLCFSPanel.h"
-#import "MainWindowTitle.h"
+#import "VLCMainWindowTitleView.h"
@class VLCDetachedVideoWindow;
@class VLCMainWindowControlsBar;
diff --git a/modules/gui/macosx/MainWindowTitle.h b/modules/gui/macosx/VLCMainWindowTitleView.h
similarity index 100%
rename from modules/gui/macosx/MainWindowTitle.h
rename to modules/gui/macosx/VLCMainWindowTitleView.h
diff --git a/modules/gui/macosx/MainWindowTitle.m b/modules/gui/macosx/VLCMainWindowTitleView.m
similarity index 99%
rename from modules/gui/macosx/MainWindowTitle.m
rename to modules/gui/macosx/VLCMainWindowTitleView.m
index ddca569ac88c..e59edff64a1d 100644
--- a/modules/gui/macosx/MainWindowTitle.m
+++ b/modules/gui/macosx/VLCMainWindowTitleView.m
@@ -23,7 +23,7 @@
#import <vlc_common.h>
#import "VLCMain.h"
-#import "MainWindowTitle.h"
+#import "VLCMainWindowTitleView.h"
#import "VLCCoreInteraction.h"
#import "CompatibilityFixes.h"
#import <SystemConfiguration/SystemConfiguration.h> // for the revealInFinder clone
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 71a4261ff05c..352ab0368d5c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -575,8 +575,8 @@ modules/gui/macosx/VLCMainWindow.h
modules/gui/macosx/VLCMainWindow.m
modules/gui/macosx/VLCMainWindowControlsBar.h
modules/gui/macosx/VLCMainWindowControlsBar.m
-modules/gui/macosx/MainWindowTitle.h
-modules/gui/macosx/MainWindowTitle.m
+modules/gui/macosx/VLCMainWindowTitleView.h
+modules/gui/macosx/VLCMainWindowTitleView.m
modules/gui/macosx/misc.h
modules/gui/macosx/misc.m
modules/gui/macosx/VLCOpenWindowController.h
--
GitLab