projects / packages / mythtv.git / blame
| Commit | Line | Data |
|---|---|---|
| cfcd6b87 JR |
1 | diff -ur mythtv-0.26.1/external/nzmqt/src/NzmqtApp.h mythtv-0.26.1.fixed/external/nzmqt/src/NzmqtApp.h |
| 2 | --- mythtv-0.26.1/external/nzmqt/src/NzmqtApp.h 2013-08-15 16:44:02.000000000 +0200 | |
| 3 | +++ mythtv-0.26.1.fixed/external/nzmqt/src/NzmqtApp.h 2017-05-26 22:34:48.272809942 +0200 | |
| 4 | @@ -34,7 +34,9 @@ | |
| 5 | #include <QTextStream> | |
| 6 | #include <QTimer> | |
| 7 | ||
| 8 | +#ifndef Q_MOC_RUN | |
| 9 | #include "nzmqt/nzmqt.hpp" | |
| 10 | +#endif | |
| 11 | ||
| 12 | #include "pubsub/PubSubClient.h" | |
| 13 | #include "pubsub/PubSubServer.h" | |
| 14 | diff -ur mythtv-0.26.1/external/nzmqt/src/pubsub/PubSubClient.h mythtv-0.26.1.fixed/external/nzmqt/src/pubsub/PubSubClient.h | |
| 15 | --- mythtv-0.26.1/external/nzmqt/src/pubsub/PubSubClient.h 2013-08-15 16:44:02.000000000 +0200 | |
| 16 | +++ mythtv-0.26.1.fixed/external/nzmqt/src/pubsub/PubSubClient.h 2017-05-26 22:32:22.730693639 +0200 | |
| 17 | @@ -33,7 +33,9 @@ | |
| 18 | #include <QList> | |
| 19 | #include <QByteArray> | |
| 20 | ||
| 21 | +#ifndef Q_MOC_RUN | |
| 22 | #include "nzmqt/nzmqt.hpp" | |
| 23 | +#endif | |
| 24 | ||
| 25 | ||
| 26 | namespace nzmqt | |
| 27 | diff -ur mythtv-0.26.1/external/nzmqt/src/pubsub/PubSubServer.h mythtv-0.26.1.fixed/external/nzmqt/src/pubsub/PubSubServer.h | |
| 28 | --- mythtv-0.26.1/external/nzmqt/src/pubsub/PubSubServer.h 2013-08-15 16:44:02.000000000 +0200 | |
| 29 | +++ mythtv-0.26.1.fixed/external/nzmqt/src/pubsub/PubSubServer.h 2017-05-26 22:31:45.249193954 +0200 | |
| 30 | @@ -35,7 +35,9 @@ | |
| 31 | #include <QTimer> | |
| 32 | #include <QDateTime> | |
| 33 | ||
| 34 | +#ifndef Q_MOC_RUN | |
| 35 | #include "nzmqt/nzmqt.hpp" | |
| 36 | +#endif | |
| 37 | ||
| 38 | ||
| 39 | namespace nzmqt | |
| 40 | diff -ur mythtv-0.26.1/external/nzmqt/src/pushpull/PushPullSink.h mythtv-0.26.1.fixed/external/nzmqt/src/pushpull/PushPullSink.h | |
| 41 | --- mythtv-0.26.1/external/nzmqt/src/pushpull/PushPullSink.h 2013-08-15 16:44:02.000000000 +0200 | |
| 42 | +++ mythtv-0.26.1.fixed/external/nzmqt/src/pushpull/PushPullSink.h 2017-05-26 22:34:08.544709365 +0200 | |
| 43 | @@ -35,7 +35,9 @@ | |
| 44 | #include <QList> | |
| 45 | #include <QByteArray> | |
| 46 | ||
| 47 | +#ifndef Q_MOC_RUN | |
| 48 | #include "nzmqt/nzmqt.hpp" | |
| 49 | +#endif | |
| 50 | ||
| 51 | ||
| 52 | namespace nzmqt | |
| 53 | diff -ur mythtv-0.26.1/external/nzmqt/src/pushpull/PushPullVentilator.h mythtv-0.26.1.fixed/external/nzmqt/src/pushpull/PushPullVentilator.h | |
| 54 | --- mythtv-0.26.1/external/nzmqt/src/pushpull/PushPullVentilator.h 2013-08-15 16:44:02.000000000 +0200 | |
| 55 | +++ mythtv-0.26.1.fixed/external/nzmqt/src/pushpull/PushPullVentilator.h 2017-05-26 22:34:20.021794105 +0200 | |
| 56 | @@ -37,7 +37,9 @@ | |
| 57 | #include <QDateTime> | |
| 58 | #include <QTextStream> | |
| 59 | ||
| 60 | +#ifndef Q_MOC_RUN | |
| 61 | #include "nzmqt/nzmqt.hpp" | |
| 62 | +#endif | |
| 63 | ||
| 64 | ||
| 65 | namespace nzmqt | |
| 66 | diff -ur mythtv-0.26.1/external/nzmqt/src/pushpull/PushPullWorker.h mythtv-0.26.1.fixed/external/nzmqt/src/pushpull/PushPullWorker.h | |
| 67 | --- mythtv-0.26.1/external/nzmqt/src/pushpull/PushPullWorker.h 2013-08-15 16:44:02.000000000 +0200 | |
| 68 | +++ mythtv-0.26.1.fixed/external/nzmqt/src/pushpull/PushPullWorker.h 2017-05-26 22:34:28.138754541 +0200 | |
| 69 | @@ -34,7 +34,9 @@ | |
| 70 | #include <QByteArray> | |
| 71 | #include <QTimer> | |
| 72 | ||
| 73 | +#ifndef Q_MOC_RUN | |
| 74 | #include "nzmqt/nzmqt.hpp" | |
| 75 | +#endif | |
| 76 | ||
| 77 | #include "common/Tools.h" // For sleep() function. | |
| 78 | ||
| 79 | diff -ur mythtv-0.26.1/external/nzmqt/src/reqrep/ReqRepClient.h mythtv-0.26.1.fixed/external/nzmqt/src/reqrep/ReqRepClient.h | |
| 80 | --- mythtv-0.26.1/external/nzmqt/src/reqrep/ReqRepClient.h 2013-08-15 16:44:02.000000000 +0200 | |
| 81 | +++ mythtv-0.26.1.fixed/external/nzmqt/src/reqrep/ReqRepClient.h 2017-05-26 22:33:25.053095320 +0200 | |
| 82 | @@ -36,7 +36,9 @@ | |
| 83 | #include <QDateTime> | |
| 84 | ||
| 85 | ||
| 86 | +#ifndef Q_MOC_RUN | |
| 87 | #include "nzmqt/nzmqt.hpp" | |
| 88 | +#endif | |
| 89 | ||
| 90 | ||
| 91 | namespace nzmqt | |
| 92 | diff -ur mythtv-0.26.1/external/nzmqt/src/reqrep/ReqRepServer.h mythtv-0.26.1.fixed/external/nzmqt/src/reqrep/ReqRepServer.h | |
| 93 | --- mythtv-0.26.1/external/nzmqt/src/reqrep/ReqRepServer.h 2013-08-15 16:44:02.000000000 +0200 | |
| 94 | +++ mythtv-0.26.1.fixed/external/nzmqt/src/reqrep/ReqRepServer.h 2017-05-26 22:33:39.950320297 +0200 | |
| 95 | @@ -35,7 +35,9 @@ | |
| 96 | #include <QTimer> | |
| 97 | #include <QDateTime> | |
| 98 | ||
| 99 | +#ifndef Q_MOC_RUN | |
| 100 | #include "nzmqt/nzmqt.hpp" | |
| 101 | +#endif | |
| 102 | ||
| 103 | ||
| 104 | namespace nzmqt |