1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
|
Many files #include generated UI-files with the path where they are
generated by CMake 3.8; this breaks autouic in CMake 3.9, which looks
at the actual source path and generates the files in a different
location. All upstreamed in different forms for the forthcoming 0.9.4.
--- src/GUI/Library/ImportFolderDialog/GUI_ImportFolder.h.orig 2016-10-30 11:53:25 UTC
+++ src/GUI/Library/ImportFolderDialog/GUI_ImportFolder.h
@@ -21,7 +21,7 @@
#ifndef GUIIMPORTFOLDER_H_
#define GUIIMPORTFOLDER_H_
-#include "GUI/Library/ui_GUI_ImportFolder.h"
+#include "ui_GUI_ImportFolder.h"
#include "GUI/Helper/SayonaraWidget/SayonaraDialog.h"
#include "Components/Library/Importer/LibraryImporter.h"
--- src/GUI/Library/InfoBox/GUI_LibraryInfoBox.h.orig 2016-10-30 11:53:25 UTC
+++ src/GUI/Library/InfoBox/GUI_LibraryInfoBox.h
@@ -25,7 +25,7 @@
#ifndef GUILIBRARYINFOBOX_H_
#define GUILIBRARYINFOBOX_H_
-#include "GUI/Library/ui_GUI_LibraryInfoBox.h"
+#include "ui_GUI_LibraryInfoBox.h"
#include "GUI/Helper/SayonaraWidget/SayonaraDialog.h"
--- src/GUI/Playlist/BottomBar/GUI_PlaylistBottomBar.h.orig 2016-10-30 11:53:25 UTC
+++ src/GUI/Playlist/BottomBar/GUI_PlaylistBottomBar.h
@@ -24,7 +24,7 @@
#define PLAYLISTBOTTOMBAR_H
#include "GUI/Helper/SayonaraWidget/SayonaraWidget.h"
-#include "GUI/Playlist/ui_GUI_PlaylistBottomBar.h"
+#include "ui_GUI_PlaylistBottomBar.h"
#include "Helper/Shutdown/Shutdown.h"
#include "Helper/Playlist/PlaylistMode.h"
--- src/GUI/Preferences/Broadcast/GUI_BroadcastSetup.h.orig 2016-10-30 11:53:25 UTC
+++ src/GUI/Preferences/Broadcast/GUI_BroadcastSetup.h
@@ -23,7 +23,7 @@
#ifndef GUI_BROADCASTSETUP_H
#define GUI_BROADCASTSETUP_H
-#include "GUI/Preferences/ui_GUI_BroadcastSetup.h"
+#include "ui_GUI_BroadcastSetup.h"
#include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
class GUI_BroadcastSetup :
--- src/GUI/Preferences/Fonts/GUI_FontConfig.h.orig 2016-10-30 11:53:25 UTC
+++ src/GUI/Preferences/Fonts/GUI_FontConfig.h
@@ -24,7 +24,7 @@
#define GUI_FONTCONFIG_H
#include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
-#include "GUI/Preferences/ui_GUI_FontConfig.h"
+#include "ui_GUI_FontConfig.h"
#include <QFontDatabase>
#include <QFont>
--- src/GUI/Preferences/Language/GUI_LanguageChooser.h.orig 2016-10-30 11:53:25 UTC
+++ src/GUI/Preferences/Language/GUI_LanguageChooser.h
@@ -26,7 +26,7 @@
#include <QMap>
#include <QShowEvent>
-#include "GUI/Preferences/ui_GUI_LanguageChooser.h"
+#include "ui_GUI_LanguageChooser.h"
#include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
--- src/GUI/Preferences/LastFM/GUI_LastFM.h.orig 2016-10-30 11:53:25 UTC
+++ src/GUI/Preferences/LastFM/GUI_LastFM.h
@@ -29,7 +29,7 @@
#ifndef GUI_LASTFM_H_
#define GUI_LASTFM_H_
-#include "GUI/Preferences/ui_GUI_LastFM.h"
+#include "ui_GUI_LastFM.h"
#include "Components/StreamPlugins/LastFM/LastFM.h"
#include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
--- src/GUI/Preferences/LibraryPreferences/GUI_LibraryPreferences.h.orig 2016-10-30 11:53:25 UTC
+++ src/GUI/Preferences/LibraryPreferences/GUI_LibraryPreferences.h
@@ -22,7 +22,7 @@
#define GUI_LIBRARYPREFERENCES_H
#include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
-#include "GUI/Preferences/ui_GUI_LibraryPreferences.h"
+#include "ui_GUI_LibraryPreferences.h"
class GUI_LibraryPreferences :
--- src/GUI/Preferences/Notifications/GUI_Notifications.h.orig 2016-10-30 11:53:25 UTC
+++ src/GUI/Preferences/Notifications/GUI_Notifications.h
@@ -25,7 +25,7 @@
#include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
#include "Interfaces/Notification/NotificationHandler.h"
-#include "GUI/Preferences/ui_GUI_Notifications.h"
+#include "ui_GUI_Notifications.h"
class GUI_Notifications :
--- src/GUI/Preferences/PlayerPreferences/GUI_PlayerPreferences.h.orig 2016-10-30 11:53:25 UTC
+++ src/GUI/Preferences/PlayerPreferences/GUI_PlayerPreferences.h
@@ -24,7 +24,7 @@
#define GUI_PLAYERPREFERENCES_H
#include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
-#include "GUI/Preferences/ui_GUI_PlayerPreferences.h"
+#include "ui_GUI_PlayerPreferences.h"
class GUI_PlayerPreferences :
--- src/GUI/Preferences/PlaylistPreferences/GUI_PlaylistPreferences.h.orig 2016-10-30 11:53:25 UTC
+++ src/GUI/Preferences/PlaylistPreferences/GUI_PlaylistPreferences.h
@@ -28,7 +28,7 @@
#include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
-#include "GUI/Preferences/ui_GUI_PlaylistPreferences.h"
+#include "ui_GUI_PlaylistPreferences.h"
class GUI_PlaylistPreferences :
--- src/GUI/Preferences/PreferenceDialog/GUI_PreferenceDialog.h.orig 2016-10-30 11:53:25 UTC
+++ src/GUI/Preferences/PreferenceDialog/GUI_PreferenceDialog.h
@@ -25,7 +25,7 @@
#include <QDialog>
#include <QList>
-#include "GUI/Preferences/ui_GUI_PreferenceDialog.h"
+#include "ui_GUI_PreferenceDialog.h"
#include "GUI/Helper/SayonaraWidget/SayonaraWidget.h"
#include "Interfaces/PreferenceDialog/PreferenceDialogInterface.h"
--- src/GUI/Preferences/RemoteControl/GUI_RemoteControl.h.orig 2016-10-30 11:53:25 UTC
+++ src/GUI/Preferences/RemoteControl/GUI_RemoteControl.h
@@ -25,7 +25,7 @@
#ifndef GUISOCKETSETUP_H_
#define GUISOCKETSETUP_H_
-#include "GUI/Preferences/ui_GUI_RemoteControl.h"
+#include "ui_GUI_RemoteControl.h"
#include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
--- src/GUI/Preferences/Shortcuts/GUI_ShortcutEntry.h.orig 2016-10-30 11:53:25 UTC
+++ src/GUI/Preferences/Shortcuts/GUI_ShortcutEntry.h
@@ -24,7 +24,7 @@
#include "GUI/Helper/SayonaraWidget/SayonaraWidget.h"
#include "GUI/Helper/Shortcuts/ShortcutHandler.h"
-#include "GUI/Preferences/ui_GUI_ShortcutEntry.h"
+#include "ui_GUI_ShortcutEntry.h"
/**
--- src/GUI/Preferences/Shortcuts/GUI_Shortcuts.h.orig 2016-10-30 11:53:25 UTC
+++ src/GUI/Preferences/Shortcuts/GUI_Shortcuts.h
@@ -24,7 +24,7 @@
#define GUI_SHORTCUTS_H
-#include "GUI/Preferences/ui_GUI_Shortcuts.h"
+#include "ui_GUI_Shortcuts.h"
#include "GUI/Helper/Shortcuts/ShortcutHandler.h"
#include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
--- src/GUI/Preferences/StreamRecorder/GUI_StreamRecorder.h.orig 2016-10-30 11:53:25 UTC
+++ src/GUI/Preferences/StreamRecorder/GUI_StreamRecorder.h
@@ -25,7 +25,7 @@
#ifndef GUI_STREAMRECORDER_H_
#define GUI_STREAMRECORDER_H_
-#include "GUI/Preferences/ui_GUI_StreamRecorder.h"
+#include "ui_GUI_StreamRecorder.h"
#include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h"
class GUI_StreamRecorder :
|
