projects / packages / pokerth.git / blame
| Commit | Line | Data |
|---|---|---|
| 072aff66 JR |
1 | diff -ur PokerTH-1.1.1-src/src/gui/qt/chattools/chattools.h PokerTH-1.1.1-src-moc/src/gui/qt/chattools/chattools.h |
| 2 | --- PokerTH-1.1.1-src/src/gui/qt/chattools/chattools.h 2014-01-10 22:18:20.782643125 +0100 | |
| 3 | +++ PokerTH-1.1.1-src-moc/src/gui/qt/chattools/chattools.h 2017-04-13 00:39:07.356116710 +0200 | |
| 4 | @@ -37,7 +37,9 @@ | |
| 5 | #include <QtWidgets> | |
| 6 | #endif | |
| 7 | #include <QtGui> | |
| 8 | +#ifndef Q_MOC_RUN | |
| 9 | #include <boost/shared_ptr.hpp> | |
| 10 | +#endif | |
| 11 | ||
| 12 | enum ChatType { INET_LOBBY_CHAT, LAN_LOBBY_CHAT, INGAME_CHAT }; | |
| 13 | ||
| 14 | diff -ur PokerTH-1.1.1-src/src/gui/qt/gametable/gametableimpl.h PokerTH-1.1.1-src-moc/src/gui/qt/gametable/gametableimpl.h | |
| 15 | --- PokerTH-1.1.1-src/src/gui/qt/gametable/gametableimpl.h 2014-01-10 22:18:20.788643125 +0100 | |
| 16 | +++ PokerTH-1.1.1-src-moc/src/gui/qt/gametable/gametableimpl.h 2017-04-13 00:45:09.443702802 +0200 | |
| 17 | @@ -31,6 +31,7 @@ | |
| 18 | #ifndef GAMETABLEIMPL_H | |
| 19 | #define GAMETABLEIMPL_H | |
| 20 | ||
| 21 | +#ifndef Q_MOC_RUN | |
| 22 | #ifdef GUI_800x480 | |
| 23 | #include "ui_gametable_800x480.h" | |
| 24 | #include "ui_tabs_800x480.h" | |
| 25 | @@ -38,6 +39,7 @@ | |
| 26 | #include "ui_gametable.h" | |
| 27 | #endif | |
| 28 | #include "game_defs.h" | |
| 29 | +#endif | |
| 30 | ||
| 31 | #include <string> | |
| 32 | ||
| 33 | diff -ur PokerTH-1.1.1-src/src/gui/qt/logfiledialog/logfiledialog.h PokerTH-1.1.1-src-moc/src/gui/qt/logfiledialog/logfiledialog.h | |
| 34 | --- PokerTH-1.1.1-src/src/gui/qt/logfiledialog/logfiledialog.h 2014-01-10 22:18:20.853643118 +0100 | |
| 35 | +++ PokerTH-1.1.1-src-moc/src/gui/qt/logfiledialog/logfiledialog.h 2017-04-13 00:52:54.025749930 +0200 | |
| 36 | @@ -35,7 +35,9 @@ | |
| 37 | #include <QDialog> | |
| 38 | #include <QFile> | |
| 39 | #include <net/uploadcallback.h> | |
| 40 | +#ifndef Q_MOC_RUN | |
| 41 | #include <boost/shared_ptr.hpp> | |
| 42 | +#endif | |
| 43 | ||
| 44 | class UploaderThread; | |
| 45 | ||
| 46 | diff -ur PokerTH-1.1.1-src/src/gui/qt/settingsdialog/settingsdialogimpl.h PokerTH-1.1.1-src-moc/src/gui/qt/settingsdialog/settingsdialogimpl.h | |
| 47 | --- PokerTH-1.1.1-src/src/gui/qt/settingsdialog/settingsdialogimpl.h 2014-01-10 22:18:20.909643111 +0100 | |
| 48 | +++ PokerTH-1.1.1-src-moc/src/gui/qt/settingsdialog/settingsdialogimpl.h 2017-04-13 00:48:14.432361758 +0200 | |
| 49 | @@ -45,7 +45,9 @@ | |
| 50 | #include <QtWidgets> | |
| 51 | #endif | |
| 52 | ||
| 53 | +#ifndef Q_MOC_RUN | |
| 54 | #include <boost/shared_ptr.hpp> | |
| 55 | +#endif | |
| 56 | #include <vector> | |
| 57 | #include <iostream> | |
| 58 | ||
| 59 | diff -ur PokerTH-1.1.1-src/src/gui/qt/sound/sdlplayer.h PokerTH-1.1.1-src-moc/src/gui/qt/sound/sdlplayer.h | |
| 60 | --- PokerTH-1.1.1-src/src/gui/qt/sound/sdlplayer.h 2014-01-10 22:18:20.910643111 +0100 | |
| 61 | +++ PokerTH-1.1.1-src-moc/src/gui/qt/sound/sdlplayer.h 2017-04-13 00:52:12.038603251 +0200 | |
| 62 | @@ -36,11 +36,13 @@ | |
| 63 | #include "configfile.h" | |
| 64 | #include <string> | |
| 65 | ||
| 66 | +#ifndef Q_MOC_RUN | |
| 67 | #ifdef __APPLE__ | |
| 68 | #include <SDL_mixer.h> | |
| 69 | #else | |
| 70 | #include <SDL/SDL_mixer.h> | |
| 71 | #endif | |
| 72 | +#endif | |
| 73 | ||
| 74 | /** | |
| 75 | @author FThauer FHammer <webmaster@pokerth.net> |