]> git.pld-linux.org Git - packages/clementine.git/blame - moc.patch
projects / packages / clementine.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- release 20 (by relup.sh)
[packages/clementine.git] / moc.patch
CommitLineData
d6115694
JR		 1diff -ur clementine-1.3.1/src/core/organise.h clementine-1.3.1-moc/src/core/organise.h
2--- clementine-1.3.1/src/core/organise.h 2015-12-15 13:13:23.000000000 +0100
3+++ clementine-1.3.1-moc/src/core/organise.h 2017-04-17 13:47:08.050705259 +0200
e1e09755
JR		 4@@ -28,8 +28,10 @@
5 #include <QObject>
6 #include <QTemporaryFile>
7
8+#ifndef Q_MOC_RUN
9 #include "organiseformat.h"
10 #include "transcoder/transcoder.h"
11+#endif
12
13 class MusicStorage;
14 class TaskManager;
d6115694
JR		 15diff -ur clementine-1.3.1/src/core/songloader.h clementine-1.3.1-moc/src/core/songloader.h
16--- clementine-1.3.1/src/core/songloader.h 2015-12-15 13:13:23.000000000 +0100
17+++ clementine-1.3.1-moc/src/core/songloader.h 2017-04-17 13:47:52.098480736 +0200
e1e09755
JR		 18@@ -26,7 +26,9 @@
19 #include <functional>
20 #include <memory>
21
22+#ifndef Q_MOC_RUN
23 #include <gst/gst.h>
24+#endif
25
26 #include <QObject>
27 #include <QThreadPool>
d6115694
JR		 28diff -ur clementine-1.3.1/src/devices/cddadevice.h clementine-1.3.1-moc/src/devices/cddadevice.h
29--- clementine-1.3.1/src/devices/cddadevice.h 2015-12-15 13:13:23.000000000 +0100
30+++ clementine-1.3.1-moc/src/devices/cddadevice.h 2017-04-17 13:57:56.667079915 +0200
e1e09755
JR		 31@@ -20,6 +20,7 @@
32
33 #include <QMutex>
34
35+#ifndef Q_MOC_RUN
36 // These must come after Qt includes (issue 3247)
37 #include <cdio/cdio.h>
38 #include <gst/audio/gstaudiocdsrc.h>
39@@ -28,6 +29,7 @@
40 #include "connecteddevice.h"
41 #include "core/song.h"
42 #include "musicbrainz/musicbrainzclient.h"
43+#endif
44
45 class CddaDevice : public ConnectedDevice {
46 Q_OBJECT
d6115694
JR		 47diff -ur clementine-1.3.1/src/devices/cddasongloader.h clementine-1.3.1-moc/src/devices/cddasongloader.h
48--- clementine-1.3.1/src/devices/cddasongloader.h 2015-12-15 13:13:23.000000000 +0100
49+++ clementine-1.3.1-moc/src/devices/cddasongloader.h 2017-04-17 13:58:10.834104995 +0200
e1e09755
JR		 50@@ -22,12 +22,14 @@
51 #include <QObject>
52 #include <QUrl>
53
54+#ifndef Q_MOC_RUN
55 // These must come after Qt includes (issue 3247)
56 #include <cdio/cdio.h>
57 #include <gst/audio/gstaudiocdsrc.h>
58
59 #include "core/song.h"
60 #include "musicbrainz/musicbrainzclient.h"
61+#endif
62
63 // This class provides a (hopefully) nice, high level interface to get CD
64 // information and load tracks
d6115694
JR		 65diff -ur clementine-1.3.1/src/devices/giolister.h clementine-1.3.1-moc/src/devices/giolister.h
66--- clementine-1.3.1/src/devices/giolister.h 2015-12-15 13:13:23.000000000 +0100
67+++ clementine-1.3.1-moc/src/devices/giolister.h 2017-04-17 13:57:40.673341979 +0200
e1e09755
JR		 68@@ -18,15 +18,19 @@
69 #ifndef GIOLISTER_H
70 #define GIOLISTER_H
71
72+#ifndef Q_MOC_RUN
73 #include "devicelister.h"
74 #include "core/scopedgobject.h"
75+#endif
76
77 // Work around compile issue with glib >= 2.25
78 #ifdef signals
79 #undef signals
80 #endif
81
82+#ifndef Q_MOC_RUN
83 #include <gio/gio.h>
84+#endif
85
86 #include <QMutex>
87 #include <QStringList>
d6115694
JR		 88diff -ur clementine-1.3.1/src/devices/gpoddevice.h clementine-1.3.1-moc/src/devices/gpoddevice.h
89--- clementine-1.3.1/src/devices/gpoddevice.h 2015-12-15 13:13:23.000000000 +0100
90+++ clementine-1.3.1-moc/src/devices/gpoddevice.h 2017-04-17 13:56:23.918067310 +0200
e1e09755
JR		 91@@ -24,7 +24,9 @@
92 #include <QMutex>
93 #include <QWaitCondition>
94
95+#ifndef Q_MOC_RUN
96 #include <gpod/itdb.h>
97+#endif
98
99 class GPodLoader;
100
d6115694
JR		 101diff -ur clementine-1.3.1/src/devices/gpodloader.h clementine-1.3.1-moc/src/devices/gpodloader.h
102--- clementine-1.3.1/src/devices/gpodloader.h 2015-12-15 13:13:23.000000000 +0100
103+++ clementine-1.3.1-moc/src/devices/gpodloader.h 2017-04-17 13:56:42.741876682 +0200
e1e09755
JR		 104@@ -22,9 +22,11 @@
105
106 #include <QObject>
107
108+#ifndef Q_MOC_RUN
109 #include <gpod/itdb.h>
110
111 #include "core/song.h"
112+#endif
113
114 class ConnectedDevice;
115 class LibraryBackend;
d6115694
JR		 116diff -ur clementine-1.3.1/src/engines/gstelementdeleter.h clementine-1.3.1-moc/src/engines/gstelementdeleter.h
117--- clementine-1.3.1/src/engines/gstelementdeleter.h 2015-12-15 13:13:23.000000000 +0100
118+++ clementine-1.3.1-moc/src/engines/gstelementdeleter.h 2017-04-17 13:50:39.442698729 +0200
e1e09755
JR		 119@@ -20,7 +20,9 @@
120
121 #include <QObject>
122
123+#ifndef Q_MOC_RUN
124 #include <gst/gst.h>
125+#endif
126
127 class GstElementDeleter : public QObject {
128 Q_OBJECT
d6115694
JR		 129diff -ur clementine-1.3.1/src/engines/gstengine.cpp clementine-1.3.1-moc/src/engines/gstengine.cpp
130--- clementine-1.3.1/src/engines/gstengine.cpp 2015-12-15 13:13:23.000000000 +0100
131+++ clementine-1.3.1-moc/src/engines/gstengine.cpp 2017-04-17 13:49:27.607553791 +0200
e1e09755
JR		 132@@ -38,7 +38,9 @@
133 #include <QDir>
134 #include <QtConcurrentRun>
135
136+#ifndef Q_MOC_RUN
137 #include <gst/gst.h>
138+#endif
139
140 #include "config.h"
141 #include "devicefinder.h"
142@@ -49,9 +51,11 @@
143 #include "core/timeconstants.h"
144 #include "core/utilities.h"
145
146+#ifndef Q_MOC_RUN
147 #ifdef HAVE_MOODBAR
148 #include "gst/moodbar/plugin.h"
149 #endif
150+#endif
151
152 #ifdef HAVE_LIBPULSE
153 #include "engines/pulsedevicefinder.h"
d6115694
JR		 154diff -ur clementine-1.3.1/src/engines/gstengine.h clementine-1.3.1-moc/src/engines/gstengine.h
155--- clementine-1.3.1/src/engines/gstengine.h 2015-12-15 13:13:23.000000000 +0100
156+++ clementine-1.3.1-moc/src/engines/gstengine.h 2017-04-17 13:49:50.114787923 +0200
e1e09755
JR		 157@@ -24,7 +24,9 @@
158
159 #include <memory>
160
161+#ifndef Q_MOC_RUN
162 #include <gst/gst.h>
163+#endif
164
165 #include <QFuture>
166 #include <QHash>
167@@ -33,9 +35,11 @@
168 #include <QStringList>
169 #include <QTimerEvent>
170
171+#ifndef Q_MOC_RUN
172 #include "bufferconsumer.h"
173 #include "enginebase.h"
174 #include "core/timeconstants.h"
175+#endif
176
177 class QTimer;
178 class QTimerEvent;
d6115694
JR		 179diff -ur clementine-1.3.1/src/engines/gstenginepipeline.h clementine-1.3.1-moc/src/engines/gstenginepipeline.h
180--- clementine-1.3.1/src/engines/gstenginepipeline.h 2015-12-15 13:13:23.000000000 +0100
181+++ clementine-1.3.1-moc/src/engines/gstenginepipeline.h 2017-04-17 13:50:14.402067082 +0200
e1e09755
JR		 182@@ -28,7 +28,9 @@
183 #include <QTimeLine>
184 #include <QUrl>
185
186+#ifndef Q_MOC_RUN
187 #include <gst/gst.h>
188+#endif
189
190 #include "engine_fwd.h"
191
d6115694
JR		 192diff -ur clementine-1.3.1/src/moodbar/moodbarpipeline.h clementine-1.3.1-moc/src/moodbar/moodbarpipeline.h
193--- clementine-1.3.1/src/moodbar/moodbarpipeline.h 2015-12-15 13:13:23.000000000 +0100
194+++ clementine-1.3.1-moc/src/moodbar/moodbarpipeline.h 2017-04-17 13:58:31.724633544 +0200
e1e09755
JR		 195@@ -21,8 +21,10 @@
196 #include <QObject>
197 #include <QUrl>
198
199+#ifndef Q_MOC_RUN
200 #include <gst/gst.h>
201 #include <gst/app/gstappsink.h>
202+#endif
203
204 #include <memory>
205
d6115694
JR		 206diff -ur clementine-1.3.1/src/networkremote/incomingdataparser.h clementine-1.3.1-moc/src/networkremote/incomingdataparser.h
207--- clementine-1.3.1/src/networkremote/incomingdataparser.h 2015-12-15 13:13:23.000000000 +0100
208+++ clementine-1.3.1-moc/src/networkremote/incomingdataparser.h 2017-04-17 13:52:45.279208411 +0200
e1e09755
JR		 209@@ -1,10 +1,12 @@
210 #ifndef INCOMINGDATAPARSER_H
211 #define INCOMINGDATAPARSER_H
212
213+#ifndef Q_MOC_RUN
214 #include "core/player.h"
215 #include "core/application.h"
216 #include "remotecontrolmessages.pb.h"
217 #include "remoteclient.h"
218+#endif
219
220 class IncomingDataParser : public QObject {
221 Q_OBJECT
d6115694
JR		 222diff -ur clementine-1.3.1/src/networkremote/networkremote.h clementine-1.3.1-moc/src/networkremote/networkremote.h
223--- clementine-1.3.1/src/networkremote/networkremote.h 2016-04-19 17:43:09.000000000 +0200
224+++ clementine-1.3.1-moc/src/networkremote/networkremote.h 2017-04-17 13:52:12.321709516 +0200
e1e09755
JR		 225@@ -6,11 +6,13 @@
226 #include <QTcpServer>
227 #include <QTcpSocket>
228
229+#ifndef Q_MOC_RUN
230 #include "core/player.h"
231 #include "core/application.h"
232 #include "incomingdataparser.h"
233 #include "outgoingdatacreator.h"
234 #include "remoteclient.h"
235+#endif
236
237 class NetworkRemote : public QObject {
238 Q_OBJECT
d6115694
JR		 239diff -ur clementine-1.3.1/src/networkremote/networkremotehelper.h clementine-1.3.1-moc/src/networkremote/networkremotehelper.h
240--- clementine-1.3.1/src/networkremote/networkremotehelper.h 2015-12-15 13:13:23.000000000 +0100
241+++ clementine-1.3.1-moc/src/networkremote/networkremotehelper.h 2017-04-17 13:51:51.207843139 +0200
e1e09755
JR		 242@@ -3,7 +3,9 @@
243
244 #include <QThread>
245
246+#ifndef Q_MOC_RUN
247 #include "networkremote.h"
248+#endif
249
250 class NetworkRemoteHelper : public QObject {
251 Q_OBJECT
d6115694
JR		 252diff -ur clementine-1.3.1/src/networkremote/outgoingdatacreator.h clementine-1.3.1-moc/src/networkremote/outgoingdatacreator.h
253--- clementine-1.3.1/src/networkremote/outgoingdatacreator.h 2015-12-15 13:13:23.000000000 +0100
254+++ clementine-1.3.1-moc/src/networkremote/outgoingdatacreator.h 2017-04-17 13:53:01.996297288 +0200
e1e09755
JR		 255@@ -10,6 +10,7 @@
256 #include <QMap>
257 #include <QQueue>
258
259+#ifndef Q_MOC_RUN
260 #include "core/player.h"
261 #include "core/application.h"
262 #include "engines/enginebase.h"
263@@ -27,6 +28,7 @@
264 #include "songinfo/ultimatelyricsreader.h"
265 #include "remotecontrolmessages.pb.h"
266 #include "remoteclient.h"
267+#endif
268
269 typedef QList<SongInfoProvider*> ProviderList;
270
d6115694
JR		 271diff -ur clementine-1.3.1/src/networkremote/remoteclient.h clementine-1.3.1-moc/src/networkremote/remoteclient.h
272--- clementine-1.3.1/src/networkremote/remoteclient.h 2015-12-15 13:13:23.000000000 +0100
273+++ clementine-1.3.1-moc/src/networkremote/remoteclient.h 2017-04-17 13:53:18.116704477 +0200
e1e09755
JR		 274@@ -5,10 +5,12 @@
275 #include <QTcpSocket>
276 #include <QBuffer>
277
278+#ifndef Q_MOC_RUN
279 #include "songsender.h"
280
281 #include "core/application.h"
282 #include "remotecontrolmessages.pb.h"
283+#endif
284
285 class RemoteClient : public QObject {
286 Q_OBJECT
d6115694
JR		 287diff -ur clementine-1.3.1/src/networkremote/songsender.h clementine-1.3.1-moc/src/networkremote/songsender.h
288--- clementine-1.3.1/src/networkremote/songsender.h 2015-12-15 13:13:23.000000000 +0100
289+++ clementine-1.3.1-moc/src/networkremote/songsender.h 2017-04-17 13:53:34.757124849 +0200
e1e09755
JR		 290@@ -5,10 +5,12 @@
291 #include <QQueue>
292 #include <QUrl>
293
294+#ifndef Q_MOC_RUN
295 #include "remotecontrolmessages.pb.h"
296
297 #include "core/song.h"
298 #include "transcoder/transcoder.h"
299+#endif
300
301 class Application;
302 class RemoteClient;
d6115694
JR		 303diff -ur clementine-1.3.1/src/transcoder/transcoder.h clementine-1.3.1-moc/src/transcoder/transcoder.h
304--- clementine-1.3.1/src/transcoder/transcoder.h 2015-12-15 13:13:23.000000000 +0100
305+++ clementine-1.3.1-moc/src/transcoder/transcoder.h 2017-04-17 13:54:09.638006165 +0200
e1e09755
JR		 306@@ -20,7 +20,9 @@
307
308 #include <memory>
309
310+#ifndef Q_MOC_RUN
311 #include <gst/gst.h>
312+#endif
313
314 #include <QObject>
315 #include <QStringList>
d6115694
JR		 316diff -ur clementine-1.3.1/src/visualisations/projectmvisualisation.cpp clementine-1.3.1-moc/src/visualisations/projectmvisualisation.cpp
317--- clementine-1.3.1/src/visualisations/projectmvisualisation.cpp 2015-12-15 13:13:23.000000000 +0100
318+++ clementine-1.3.1-moc/src/visualisations/projectmvisualisation.cpp 2017-04-17 13:55:41.280322530 +0200
e1e09755
JR		 319@@ -15,10 +15,12 @@
320 along with Clementine. If not, see <http://www.gnu.org/licenses/>.
321 */
322
323+#ifndef Q_MOC_RUN
324 #include "config.h"
325 #include "projectmpresetmodel.h"
326 #include "projectmvisualisation.h"
327 #include "visualisationcontainer.h"
328+#endif
329
330 #include <QCoreApplication>
331 #include <QDir>
332@@ -33,6 +35,7 @@
333 #include <QtDebug>
334 #include <QTimerEvent>
335
336+#ifndef Q_MOC_RUN
337 #ifdef USE_SYSTEM_PROJECTM
338 #include <libprojectM/projectM.hpp>
339 #else
340@@ -45,6 +48,7 @@
341 #else
342 #include <GL/gl.h>
343 #endif
344+#endif
345
346 ProjectMVisualisation::ProjectMVisualisation(QObject* parent)
347 : QGraphicsScene(parent),
d6115694
JR		 348diff -ur clementine-1.3.1/src/visualisations/projectmvisualisation.h clementine-1.3.1-moc/src/visualisations/projectmvisualisation.h
349--- clementine-1.3.1/src/visualisations/projectmvisualisation.h 2015-12-15 13:13:23.000000000 +0100
350+++ clementine-1.3.1-moc/src/visualisations/projectmvisualisation.h 2017-04-17 13:56:02.010846681 +0200
e1e09755
JR		 351@@ -24,7 +24,9 @@
352 #include <QBasicTimer>
353 #include <QSet>
354
355+#ifndef Q_MOC_RUN
356 #include "engines/bufferconsumer.h"
357+#endif
358
359 class projectM;
360
A music player and library organiser
This page took 0.062768 seconds and 4 git commands to generate.