From d2c58090cb565af81fd829e1446ccb85303f84e3 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 21 Oct 2012 17:31:17 -0500 Subject: Fix inadvertent tq changes. (cherry picked from commit 878b9f48965647bee71294f486f8551074cb42f2) --- src/kvirc/ui/kvi_cryptcontroller.h | 2 +- src/kvirc/ui/kvi_taskbar.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/kvirc/ui/kvi_cryptcontroller.h b/src/kvirc/ui/kvi_cryptcontroller.h index 18574f8c..d311e98f 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.h +++ b/src/kvirc/ui/kvi_cryptcontroller.h @@ -32,7 +32,7 @@ // 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 #include "kvi_tal_listbox.h" #include diff --git a/src/kvirc/ui/kvi_taskbar.h b/src/kvirc/ui/kvi_taskbar.h index f760af84..d2773ec0 100644 --- a/src/kvirc/ui/kvi_taskbar.h +++ b/src/kvirc/ui/kvi_taskbar.h @@ -75,7 +75,7 @@ public: // // 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 @@ -83,7 +83,7 @@ public: // build system that uses TQt4 then you must add the -DCOMPILE_USE_QT4 // commandline parameter to moc (at leat) when parsing this file. -// TQMOC_SKIP_BEGIN +// MOC_SKIP_BEGIN #ifdef COMPILE_USE_QT4 #include @@ -93,10 +93,10 @@ class KVIRC_API KviTaskBarBase : public TQDockWidget Q_OBJECT TQ_OBJECT #endif //COMPILE_USE_QT4 -// TQMOC_SKIP_END +// MOC_SKIP_END // TQt3 version -#ifndef TQ_TQMOC_RUN +#ifndef Q_MOC_RUN #ifndef COMPILE_USE_QT4 #include "kvi_toolbar.h" -- cgit v1.2.1