Fix inadvertent tq changes.

(cherry picked from commit 878b9f4896)
v3.5.13-sru
Darrell Anderson 12 years ago committed by Slávek Banko
parent b17e87b381
commit d2c58090cb

@ -32,7 +32,7 @@
// TQt4 moc bails out on this ?????? // TQt4 moc bails out on this ??????
#if defined(COMPILE_CRYPT_SUPPORT) || defined(TQ_TQMOC_RUN) #if defined(COMPILE_CRYPT_SUPPORT) || defined(Q_MOC_RUN)
#include <tqwidget.h> #include <tqwidget.h>
#include "kvi_tal_listbox.h" #include "kvi_tal_listbox.h"
#include <tqpushbutton.h> #include <tqpushbutton.h>

@ -75,7 +75,7 @@ public:
// //
// Please note that TQt3 moc skips the *_SKIP_BEGIN -> *_SKIP_END blocks // Please note that TQt3 moc skips the *_SKIP_BEGIN -> *_SKIP_END blocks
// while the TQt4 moc skips the TQ_TQMOC_RUN ifdef block.. so... // while the TQt4 moc skips the Q_MOC_RUN ifdef block.. so...
// TQt4 version // TQt4 version
@ -83,7 +83,7 @@ public:
// build system that uses TQt4 then you must add the -DCOMPILE_USE_QT4 // build system that uses TQt4 then you must add the -DCOMPILE_USE_QT4
// commandline parameter to moc (at leat) when parsing this file. // commandline parameter to moc (at leat) when parsing this file.
// TQMOC_SKIP_BEGIN // MOC_SKIP_BEGIN
#ifdef COMPILE_USE_QT4 #ifdef COMPILE_USE_QT4
#include <TQDockWidget> #include <TQDockWidget>
@ -93,10 +93,10 @@ class KVIRC_API KviTaskBarBase : public TQDockWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
#endif //COMPILE_USE_QT4 #endif //COMPILE_USE_QT4
// TQMOC_SKIP_END // MOC_SKIP_END
// TQt3 version // TQt3 version
#ifndef TQ_TQMOC_RUN #ifndef Q_MOC_RUN
#ifndef COMPILE_USE_QT4 #ifndef COMPILE_USE_QT4
#include "kvi_toolbar.h" #include "kvi_toolbar.h"

Loading…
Cancel
Save