Update various qt function definitions and static methods for tqt3

27 files changed, 48 insertions, 48 deletions

diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 00b784a8c..204e812f3 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -256,7 +256,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
    initUI();
    updateUI();
 
-#if (QT_VERSION-0 >= 0x030200)
+#if (TQT_VERSION-0 >= 0x030200)
    connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
 #endif
 }
diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp
index 0fc10f235..c3ba773ea 100644
--- a/kcontrol/randr/krandrtray.cpp
+++ b/kcontrol/randr/krandrtray.cpp
@@ -70,7 +70,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
 
 	connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
 
-#if (QT_VERSION-0 >= 0x030200) // XRANDR support
+#if (TQT_VERSION-0 >= 0x030200) // XRANDR support
 //	connect(this, TQT_SIGNAL(screenSizeChanged(int, int)), kapp->desktop(), TQT_SLOT( desktopResized()));
 #endif
 
diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc
index cd0ff4c1d..341cc5b88 100644
--- a/kdesktop/bgmanager.cc
+++ b/kdesktop/bgmanager.cc
@@ -116,7 +116,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule
             TQT_SLOT(slotChangeViewport(int, const TQPoint&)));
 
 
-#if (QT_VERSION-0 >= 0x030200)
+#if (TQT_VERSION-0 >= 0x030200)
     connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
 #endif
 
diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h
index 529944700..d78d64212 100644
--- a/kdesktop/bgmanager.h
+++ b/kdesktop/bgmanager.h
@@ -15,7 +15,7 @@
 
 #include <KBackgroundIface.h>
 
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
+#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
 #define COMPOSITE
 #endif
 
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index d4ccd4df8..cf571a8e4 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -202,7 +202,7 @@ KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) :
 
   TQTimer::singleShot(0, this, TQT_SLOT( slotStart() ));
 
-#if (QT_VERSION-0 >= 0x030200) // XRANDR support
+#if (TQT_VERSION-0 >= 0x030200) // XRANDR support
   connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
 #endif
 }
@@ -547,7 +547,7 @@ void KDesktop::slotShowTaskManager()
 {
     //kdDebug(1204) << "Launching KSysGuard..." << endl;
     KProcess* p = new KProcess;
-    Q_CHECK_PTR(p);
+    TQ_CHECK_PTR(p);
 
     *p << "ksysguard";
     *p << "--showprocesses";
diff --git a/kdesktop/kdesktopapp.h b/kdesktop/kdesktopapp.h
index 44b3caa54..94cdd1d33 100644
--- a/kdesktop/kdesktopapp.h
+++ b/kdesktop/kdesktopapp.h
@@ -23,7 +23,7 @@
 #include <config.h>
 #include <kuniqueapplication.h>
 
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
+#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
 #define COMPOSITE
 #endif
 
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index 17428f4d4..1f5aee86f 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -755,7 +755,7 @@ void KRootWm::slotOpenTerminal()
 {
     // kdDebug() << "KRootWm::slotOpenTerminal" << endl;
     KProcess* p = new KProcess;
-    Q_CHECK_PTR(p);
+    TQ_CHECK_PTR(p);
 
     KConfigGroupSaver gs(KGlobal::config(), "General");
     TQString terminal = KGlobal::config()->readPathEntry("TerminalApplication", "konsole");
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 2e9c9d3eb..635e15e1f 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -281,7 +281,7 @@ LockProcess::LockProcess(bool child, bool useBlankOnly)
     }
 #endif
 
-#if (QT_VERSION-0 >= 0x030200) // XRANDR support
+#if (TQT_VERSION-0 >= 0x030200) // XRANDR support
     connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
 #endif
 
diff --git a/kdesktop/main.cc b/kdesktop/main.cc
index 8bcde85e3..e15596ffb 100644
--- a/kdesktop/main.cc
+++ b/kdesktop/main.cc
@@ -43,7 +43,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
+#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
 #define COMPOSITE
 #endif
 
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index 720dd4bba..fdde3dbde 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -159,7 +159,7 @@ void StartupId::stop_startupid()
 
 static TQPixmap scalePixmap( const TQPixmap& pm, int w, int h )
 {
-#if QT_VERSION >= 0x030200
+#if TQT_VERSION >= 0x030200
 	TQPixmap result( 20, 20, pm.depth() );
 	result.setMask( TQBitmap( 20, 20, true ) );
 	TQPixmap scaled( pm.convertToImage().smoothScale( w, h ) );
diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp
index c55531234..d6d9b975e 100644
--- a/kicker/kicker/core/kicker.cpp
+++ b/kicker/kicker/core/kicker.cpp
@@ -128,7 +128,7 @@ Kicker::Kicker()
     connect(this, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
     connect(this, TQT_SIGNAL(kdisplayStyleChanged()), TQT_SLOT(slotStyleChanged()));
 
-#if (QT_VERSION-0 >= 0x030200) // XRANDR support
+#if (TQT_VERSION-0 >= 0x030200) // XRANDR support
     connect(desktop(), TQT_SIGNAL(resized(int)), TQT_SLOT(slotDesktopResized()));
 #endif
 
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 902782045..61607f0ce 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -3649,7 +3649,7 @@ void KonqMainWindow::slotUpdateFullScreen( bool set )
   }
   else
   {
-#if QT_VERSION >= 0x030300
+#if TQT_VERSION >= 0x030300
     setWindowState( windowState() & ~WindowFullScreen );
 #else
     if( isMaximized())
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index cb21f6aff..44a3929af 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -46,7 +46,7 @@
 
 #include "konsole.h"
 
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
+#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
 #define COMPOSITE
 #endif
 
diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cc b/ksysguard/gui/SensorDisplayLib/ListView.cc
index c980196e6..97b1a3c0f 100644
--- a/ksysguard/gui/SensorDisplayLib/ListView.cc
+++ b/ksysguard/gui/SensorDisplayLib/ListView.cc
@@ -207,7 +207,7 @@ ListView::ListView(TQWidget* parent, const char* name, const TQString& title, in
 	setBackgroundColor(KSGRD::Style->backgroundColor());
 
 	monitor = new PrivateListView( frame() );
-	Q_CHECK_PTR(monitor);
+	TQ_CHECK_PTR(monitor);
 	monitor->setSelectionMode(TQListView::NoSelection);
 	monitor->setItemMargin(2);
 
@@ -328,7 +328,7 @@ void
 ListView::configureSettings()
 {
 	lvs = new ListViewSettings(this, "ListViewSettings");
-	Q_CHECK_PTR(lvs);
+	TQ_CHECK_PTR(lvs);
 	connect(lvs, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings()));
 
 	TQColorGroup colorGroup = monitor->colorGroup();
diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cc
index 7de7899ab..bb29af7a9 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFile.cc
+++ b/ksysguard/gui/SensorDisplayLib/LogFile.cc
@@ -40,7 +40,7 @@ LogFile::LogFile(TQWidget *parent, const char *name, const TQString& title)
 	: KSGRD::SensorDisplay(parent, name, title)
 {
 	monitor = new TQListBox(this);
-	Q_CHECK_PTR(monitor);
+	TQ_CHECK_PTR(monitor);
 
 	setMinimumSize(50, 25);
 
@@ -82,7 +82,7 @@ void LogFile::configureSettings(void)
 	TQColorGroup cgroup = monitor->colorGroup();
 
 	lfs = new LogFileSettings(this);
-	Q_CHECK_PTR(lfs);
+	TQ_CHECK_PTR(lfs);
 
 	lfs->fgColor->setColor(cgroup.text());
 	lfs->fgColor->setText(i18n("Foreground color:"));
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc
index 8a9cc9b60..111c4787b 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc
@@ -50,7 +50,7 @@ MultiMeter::MultiMeter(TQWidget* parent, const char* name,
 		lcd = new TQLCDNumber(this, "meterLCD");
 	else
 		lcd = new TQLCDNumber(frame(), "meterLCD");
-	Q_CHECK_PTR(lcd);
+	TQ_CHECK_PTR(lcd);
 	lcd->setSegmentStyle(TQLCDNumber::Filled);
 	setDigitColor(KSGRD::Style->backgroundColor());
 	lcd->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
@@ -191,7 +191,7 @@ void
 MultiMeter::configureSettings()
 {
 	mms = new MultiMeterSettings(this, "MultiMeterSettings");
-	Q_CHECK_PTR(mms);
+	TQ_CHECK_PTR(mms);
 	mms->setTitle(title());
 	mms->setShowUnit(showUnit());
 	mms->setLowerLimitActive(lowerLimitActive);
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cc
index f02b02af9..664870374 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc
+++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cc
@@ -67,16 +67,16 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
 
 	// Setup the geometry management.
 	gm = new TQVBoxLayout(this, 10);
-	Q_CHECK_PTR(gm);
+	TQ_CHECK_PTR(gm);
 	gm->addSpacing(15);
 
 	gmSearch = new TQHBoxLayout();
-	Q_CHECK_PTR(gmSearch);
+	TQ_CHECK_PTR(gmSearch);
 	gm->addLayout(gmSearch, 0);
 
 	// Create the table that lists the processes.
 	pList = new ProcessList(this, "pList");
-	Q_CHECK_PTR(pList);
+	TQ_CHECK_PTR(pList);
 	pList->setShowSortIndicator(true);
 	pListSearchLine = new KListViewSearchLineWidget(pList, this, "process_list_search_line");
 	gmSearch->addWidget(pListSearchLine, 1);
@@ -92,7 +92,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
 	 * cbFilter must be created prior to constructing pList as the
 	 * pList constructor sets cbFilter to its start value. */
 	cbFilter = new TQComboBox(this, "pList_cbFilter");
-	Q_CHECK_PTR(cbFilter);
+	TQ_CHECK_PTR(cbFilter);
 	gmSearch->addWidget(cbFilter,0);
 	cbFilter->insertItem(i18n("All Processes"), 0);
 	cbFilter->insertItem(i18n("System Processes"), 1);
@@ -101,7 +101,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
 	cbFilter->setMinimumSize(cbFilter->sizeHint());
 	// Create the check box to switch between tree view and list view.
 	xbTreeView = new TQCheckBox(i18n("&Tree"), this, "xbTreeView");
-	Q_CHECK_PTR(xbTreeView);
+	TQ_CHECK_PTR(xbTreeView);
 	xbTreeView->setMinimumSize(xbTreeView->sizeHint());
 	connect(xbTreeView, TQT_SIGNAL(toggled(bool)),
 			this, TQT_SLOT(setTreeView(bool)));
@@ -115,13 +115,13 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
 	// Create the 'Refresh' button.
 	bRefresh = new KPushButton( KGuiItem(  i18n( "&Refresh" ), "reload" ),
             this, "bRefresh" );
-	Q_CHECK_PTR(bRefresh);
+	TQ_CHECK_PTR(bRefresh);
 	bRefresh->setMinimumSize(bRefresh->sizeHint());
 	connect(bRefresh, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateList()));
 
 	// Create the 'Kill' button.
 	bKill = new KPushButton(i18n("&Kill"), this, "bKill");
-	Q_CHECK_PTR(bKill);
+	TQ_CHECK_PTR(bKill);
 	bKill->setMinimumSize(bKill->sizeHint());
 	connect(bKill, TQT_SIGNAL(clicked()), this, TQT_SLOT(killProcess()));
 	/* Disable the kill button until we know that the daemon supports the
@@ -132,7 +132,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
 	gm->addWidget(pList, 1);
 
 	gm1 = new TQHBoxLayout();
-	Q_CHECK_PTR(gm1);
+	TQ_CHECK_PTR(gm1);
 	gm->addLayout(gm1, 0);
 	gm1->addStretch();
 	gm1->addWidget(xbTreeView);
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc
index 939b66d6d..3d207aa2c 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc
@@ -39,12 +39,12 @@ LogSensor::LogSensor(TQListView *parent)
 	: timerID( NONE ), lowerLimitActive( 0 ), upperLimitActive( 0 ),
 	  lowerLimit( 0 ), upperLimit( 0 )
 {
-	Q_CHECK_PTR(parent);
+	TQ_CHECK_PTR(parent);
 
 	monitor = parent;
 
 	lvi = new SLListViewItem(monitor);
-	Q_CHECK_PTR(lvi);
+	TQ_CHECK_PTR(lvi);
 
 	pixmap_running = UserIcon( "running" );
 	pixmap_waiting = UserIcon( "waiting" );
@@ -131,7 +131,7 @@ SensorLogger::SensorLogger(TQWidget *parent, const char *name, const TQString& t
 	: KSGRD::SensorDisplay(parent, name, title)
 {
 	monitor = new TQListView(this, "monitor");
-	Q_CHECK_PTR(monitor);
+	TQ_CHECK_PTR(monitor);
 
 	monitor->addColumn(i18n("Logging"));
 	monitor->addColumn(i18n("Timer Interval"));
@@ -169,12 +169,12 @@ SensorLogger::addSensor(const TQString& hostName, const TQString& sensorName, co
 		return (false);
 
 	sld = new SensorLoggerDlg(this, "SensorLoggerDlg");
-	Q_CHECK_PTR(sld);
+	TQ_CHECK_PTR(sld);
 
 	if (sld->exec()) {
 		if (!sld->fileName().isEmpty()) {
 			LogSensor *sensor = new LogSensor(monitor);
-			Q_CHECK_PTR(sensor);
+			TQ_CHECK_PTR(sensor);
 
 			sensor->setHostName(hostName);
 			sensor->setSensorName(sensorName);
@@ -201,7 +201,7 @@ bool
 SensorLogger::editSensor(LogSensor* sensor)
 {
 	sld = new SensorLoggerDlg(this, "SensorLoggerDlg");
-	Q_CHECK_PTR(sld);
+	TQ_CHECK_PTR(sld);
 
 	sld->setFileName(sensor->getFileName());
 	sld->setTimerInterval(sensor->getTimerInterval());
@@ -235,7 +235,7 @@ SensorLogger::configureSettings()
 	TQColorGroup cgroup = monitor->colorGroup();
 
 	sls = new SensorLoggerSettings(this, "SensorLoggerSettings");
-	Q_CHECK_PTR(sls);
+	TQ_CHECK_PTR(sls);
 
 	connect( sls, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) );
 
@@ -295,7 +295,7 @@ SensorLogger::restoreSettings(TQDomElement& element)
 	for (uint i = 0; i < dnList.count(); i++) {
 		TQDomElement element = dnList.item(i).toElement();
 		LogSensor* sensor = new LogSensor(monitor);
-		Q_CHECK_PTR(sensor);
+		TQ_CHECK_PTR(sensor);
 
 		sensor->setHostName(element.attribute("hostName"));
 		sensor->setSensorName(element.attribute("sensorName"));
diff --git a/ktip/ktipwindow.cpp b/ktip/ktipwindow.cpp
index 8281c13e2..3ddbba05a 100644
--- a/ktip/ktipwindow.cpp
+++ b/ktip/ktipwindow.cpp
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
 	KUniqueApplication app;
 
 	KTipDialog *tipDialog = new KTipDialog(new KTipDatabase(locate("data", TQString("kdewizard/tips"))));
-	Q_CHECK_PTR(tipDialog);
+	TQ_CHECK_PTR(tipDialog);
 #ifdef Q_WS_X11
 	KWin::setState(tipDialog->winId(), NET::StaysOnTop);
 #endif
diff --git a/libkonq/konq_historymgr.cc b/libkonq/konq_historymgr.cc
index 451b61ecf..a01c53471 100644
--- a/libkonq/konq_historymgr.cc
+++ b/libkonq/konq_historymgr.cc
@@ -150,7 +150,7 @@ bool KonqHistoryManager::loadHistory()
 
         while ( !stream->atEnd() ) {
 	    KonqHistoryEntry *entry = new KonqHistoryEntry;
-	    Q_CHECK_PTR( entry );
+	    TQ_CHECK_PTR( entry );
             *stream >> *entry;
 	    // kdDebug(1203) << "## loaded entry: " << entry->url << ",  Title: " << entry->title << endl;
 	    m_history.append( entry );
diff --git a/nsplugins/viewer/kxt.cpp b/nsplugins/viewer/kxt.cpp
index 1d85f674a..05b2673be 100644
--- a/nsplugins/viewer/kxt.cpp
+++ b/nsplugins/viewer/kxt.cpp
@@ -45,7 +45,7 @@
 *****************************************************************************/
 
 #include <tqglobal.h>
-#if QT_VERSION < 0x030100
+#if TQT_VERSION < 0x030100
 
 #include <kapplication.h>
 #include <tqwidget.h>
diff --git a/nsplugins/viewer/kxt.h b/nsplugins/viewer/kxt.h
index 44f05db19..d7c46a594 100644
--- a/nsplugins/viewer/kxt.h
+++ b/nsplugins/viewer/kxt.h
@@ -47,7 +47,7 @@
 #define KXT_H
 
 #include <tqglobal.h>
-#if QT_VERSION < 0x030100
+#if TQT_VERSION < 0x030100
 
 #include <kapplication.h>
 #include <tqwidget.h>
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index 310210c66..7092d1024 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -1292,7 +1292,7 @@ void NSPluginViewer::shutdown()
 {
    kdDebug(1431) << "NSPluginViewer::shutdown" << endl;
    _classes.clear();
-#if QT_VERSION < 0x030100
+#if TQT_VERSION < 0x030100
    quitXt();
 #else
    tqApp->quit();
diff --git a/nsplugins/viewer/qxteventloop.cpp b/nsplugins/viewer/qxteventloop.cpp
index 4e1d13a21..8250f6bba 100644
--- a/nsplugins/viewer/qxteventloop.cpp
+++ b/nsplugins/viewer/qxteventloop.cpp
@@ -37,7 +37,7 @@
 
 #include "qxteventloop.h"
 
-#if QT_VERSION >= 0x030100
+#if TQT_VERSION >= 0x030100
 
 #include <tqapplication.h>
 #include <tqwidgetintdict.h>
diff --git a/nsplugins/viewer/qxteventloop.h b/nsplugins/viewer/qxteventloop.h
index 31351f201..5fdb81414 100644
--- a/nsplugins/viewer/qxteventloop.h
+++ b/nsplugins/viewer/qxteventloop.h
@@ -38,7 +38,7 @@
 
 #include <tqglobal.h>
 
-// #if QT_VERSION >= 0x030100
+// #if TQT_VERSION >= 0x030100
 #include <tqeventloop.h>
 
 
diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp
index e15b52eb0..eb5a0956d 100644
--- a/nsplugins/viewer/viewer.cpp
+++ b/nsplugins/viewer/viewer.cpp
@@ -46,7 +46,7 @@
 #endif
 #include <kconfig.h>
 
-#if QT_VERSION < 0x030100
+#if TQT_VERSION < 0x030100
 #include "kxt.h"
 #include <X11/Intrinsic.h>
 #include <X11/Shell.h>
@@ -103,7 +103,7 @@ void parseCommandLine(int argc, char *argv[])
    }
 }
 
-#if QT_VERSION < 0x030100
+#if TQT_VERSION < 0x030100
 
 static XtAppContext g_appcon;
 static bool g_quit = false;
@@ -227,7 +227,7 @@ int main(int argc, char** argv)
    kdDebug(1430) << "2 - parseCommandLine" << endl;
    parseCommandLine(argc, argv);
 
-#if QT_VERSION < 0x030100
+#if TQT_VERSION < 0x030100
    // Create application
    kdDebug(1430) << "3 - XtToolkitInitialize" << endl;
    XtToolkitInitialize();
@@ -298,7 +298,7 @@ int main(int argc, char** argv)
    NSPluginViewer *viewer = new NSPluginViewer( "viewer", 0 );
 
    // start main loop
-#if QT_VERSION < 0x030100
+#if TQT_VERSION < 0x030100
    kdDebug(1430) << "8 - XtAppProcessEvent" << endl;
    while (!g_quit)
      XtAppProcessEvent( g_appcon, XtIMAll);
diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index 79d064aeb..5b9f58305 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -208,7 +208,7 @@ Workspace::Workspace( bool restore )
 
     init();
 
-#if (QT_VERSION-0 >= 0x030200) // XRANDR support
+#if (TQT_VERSION-0 >= 0x030200) // XRANDR support
     connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
 #endif