From 989d6a19014011bd6981abb3decb91a7b3af0971 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 14 Feb 2012 21:16:22 -0600
Subject: Update various qt function definitions and static methods for tqt3

---
 kdesktop/bgmanager.cc        | 2 +-
 kdesktop/bgmanager.h         | 2 +-
 kdesktop/desktop.cc          | 4 ++--
 kdesktop/kdesktopapp.h       | 2 +-
 kdesktop/krootwm.cc          | 2 +-
 kdesktop/lock/lockprocess.cc | 2 +-
 kdesktop/main.cc             | 2 +-
 kdesktop/startupid.cpp       | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'kdesktop')

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 ) );
-- 
cgit v1.2.1