From 357e5cce6c80649698084cbc6012e7606b4250d7 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 14 Feb 2012 21:10:39 -0600
Subject: [PATCH] Update various qt function definitions and static methods for
 tqt3

---
 acinclude.m4                      | 12 ++++++------
 krusader/GUI/dirhistorybutton.cpp |  2 +-
 krusader/GUI/kcmdmodebutton.cpp   |  4 ++--
 krusader/GUI/mediabutton.cpp      |  2 +-
 krusader/MountMan/kdiskfreesp.cpp |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 9f9077c..7fa72e3 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1104,7 +1104,7 @@ EOF
 
 if test $kde_qtsubver -gt 0; then
 cat >> conftest.$ac_ext <<EOF
-#if QT_VERSION < 210
+#if TQT_VERSION < 210
 #error 1
 #endif
 EOF
@@ -1201,22 +1201,22 @@ fi
 if test -z "$3"; then
    if test $kde_qtver = 3; then
      if test $kde_qtsubver -gt 0; then
-       kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000"
+       kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000"
        qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
        kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
      else
-       kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000"
+       kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000"
      fi
    fi
    if test $kde_qtver = 2; then
      if test $kde_qtsubver -gt 0; then
-       kde_qt_verstring="QT_VERSION >= 222"
+       kde_qt_verstring="TQT_VERSION >= 222"
      else
-       kde_qt_verstring="QT_VERSION >= 200"
+       kde_qt_verstring="TQT_VERSION >= 200"
      fi
    fi
    if test $kde_qtver = 1; then
-    kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
+    kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200"
    fi
 else
    kde_qt_verstring="$3"
diff --git a/krusader/GUI/dirhistorybutton.cpp b/krusader/GUI/dirhistorybutton.cpp
index d6f2387..68c42dd 100644
--- a/krusader/GUI/dirhistorybutton.cpp
+++ b/krusader/GUI/dirhistorybutton.cpp
@@ -37,7 +37,7 @@ DirHistoryButton::DirHistoryButton( DirHistoryQueue* hQ, TQWidget *parent, const
 	setAcceptDrops( false );
 
 	popupMenu = new TQPopupMenu( this );
-	Q_CHECK_PTR( popupMenu );
+	TQ_CHECK_PTR( popupMenu );
 
 	setPopup( popupMenu );
 	popupMenu->setCheckable( true );
diff --git a/krusader/GUI/kcmdmodebutton.cpp b/krusader/GUI/kcmdmodebutton.cpp
index e8ad0a2..dc5a69a 100644
--- a/krusader/GUI/kcmdmodebutton.cpp
+++ b/krusader/GUI/kcmdmodebutton.cpp
@@ -45,13 +45,13 @@ KCMDModeButton::KCMDModeButton( TQWidget *parent, const char *name ) : TQToolBut
   setIconSet( SmallIcon( "konsole" ) );
   adjustSize();
   action = new KActionMenu( i18n("Execution mode") );
-  Q_CHECK_PTR( action );
+  TQ_CHECK_PTR( action );
   for( int i=0; Krusader::execTypeArray[i] != 0; i++ )
   {
     action->insert( *Krusader::execTypeArray[i] );
   }
   TQPopupMenu *pP = action->popupMenu();
-  Q_CHECK_PTR( pP );
+  TQ_CHECK_PTR( pP );
   setPopup( pP );
   setPopupDelay( 10 );
   setAcceptDrops( false );
diff --git a/krusader/GUI/mediabutton.cpp b/krusader/GUI/mediabutton.cpp
index 9a97f3f..381ed69 100644
--- a/krusader/GUI/mediabutton.cpp
+++ b/krusader/GUI/mediabutton.cpp
@@ -84,7 +84,7 @@ MediaButton::MediaButton( TQWidget *parent, const char *name ) : TQToolButton( p
 
 	popupMenu = new TQPopupMenu( this );
 	popupMenu->installEventFilter( this );
-	Q_CHECK_PTR( popupMenu );
+	TQ_CHECK_PTR( popupMenu );
 
 	setPopup( popupMenu );
 
diff --git a/krusader/MountMan/kdiskfreesp.cpp b/krusader/MountMan/kdiskfreesp.cpp
index 66b2c97..dc8724d 100644
--- a/krusader/MountMan/kdiskfreesp.cpp
+++ b/krusader/MountMan/kdiskfreesp.cpp
@@ -45,7 +45,7 @@
 KDiskFreeSp::KDiskFreeSp(TQObject *parent, const char *name)
     : TQObject(parent,name)
 {
-    dfProc = new KProcess(); Q_CHECK_PTR(dfProc);
+    dfProc = new KProcess(); TQ_CHECK_PTR(dfProc);
     dfProc->setEnvironment("LANGUAGE", "C");
     connect( dfProc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int) ),
              this, TQT_SLOT (receivedDFStdErrOut(KProcess *, char *, int)) );