|
a/src/qtgui/rclmain_w.cpp |
|
b/src/qtgui/rclmain_w.cpp |
|
... |
|
... |
65 |
#include "fragbuts.h"
|
65 |
#include "fragbuts.h"
|
66 |
#include "systray.h"
|
66 |
#include "systray.h"
|
67 |
#include "rclmain_w.h"
|
67 |
#include "rclmain_w.h"
|
68 |
#include "rclhelp.h"
|
68 |
#include "rclhelp.h"
|
69 |
#include "moc_rclmain_w.cpp"
|
69 |
#include "moc_rclmain_w.cpp"
|
70 |
|
|
|
71 |
/* Qt5 moc expands macros when defining signals. The SIGNAL() macro is
|
|
|
72 |
a stringification, so it does not expand macros. We have signals
|
|
|
73 |
where one of the types is a #define (for the variations on
|
|
|
74 |
std::shared_ptr). In qt5, the connection does not work because the
|
|
|
75 |
signal string is different between the definition and the connect
|
|
|
76 |
call, because of the different macro expansion. We have to use
|
|
|
77 |
another level of macro in Qt5 to force macro expansion, but not in
|
|
|
78 |
Qt4, so we both define the XSIGNAL and XSLOT macros here, and have
|
|
|
79 |
ifdefs in the code. What a mess... */
|
|
|
80 |
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
|
|
|
81 |
#define XSIGNAL(X) SIGNAL(X)
|
|
|
82 |
#define XSLOT(X) SLOT(X)
|
|
|
83 |
#endif
|
|
|
84 |
|
70 |
|
85 |
using std::pair;
|
71 |
using std::pair;
|
86 |
|
72 |
|
87 |
QString g_stringAllStem, g_stringNoStem;
|
73 |
QString g_stringAllStem, g_stringNoStem;
|
88 |
|
74 |
|