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

---
 acinclude.m4                               | 12 ++++++------
 ksquirrel/ksquirrelpart/sq_glwidget.cpp    |  6 +++---
 ksquirrel/ksquirrelpart/sq_utils_scale.cpp |  2 +-
 ksquirrel/sq_glwidget.cpp                  |  6 +++---
 ksquirrel/sq_utils_scale.cpp               |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 4803b7c..1fa20a6 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/ksquirrel/ksquirrelpart/sq_glwidget.cpp b/ksquirrel/ksquirrelpart/sq_glwidget.cpp
index 5b42e58..d97f05d 100644
--- a/ksquirrel/ksquirrelpart/sq_glwidget.cpp
+++ b/ksquirrel/ksquirrelpart/sq_glwidget.cpp
@@ -192,8 +192,8 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent
     timer_prev = new TQTimer(this);
     timer_next = new TQTimer(this);
 
-    Q_CHECK_PTR(timer_prev);
-    Q_CHECK_PTR(timer_next);
+    TQ_CHECK_PTR(timer_prev);
+    TQ_CHECK_PTR(timer_next);
 
     connect(timer_prev, TQT_SIGNAL(timeout()), SQ_WidgetStack::instance(), TQT_SLOT(emitPreviousSelected()));
     connect(timer_next, TQT_SIGNAL(timeout()), SQ_WidgetStack::instance(), TQT_SLOT(emitNextSelected()));
@@ -201,7 +201,7 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent
 
     timer_anim = new TQTimer(this);
 
-    Q_CHECK_PTR(timer_anim);
+    TQ_CHECK_PTR(timer_anim);
 
     connect(timer_anim, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimateNext()));
 
diff --git a/ksquirrel/ksquirrelpart/sq_utils_scale.cpp b/ksquirrel/ksquirrelpart/sq_utils_scale.cpp
index 3e121a1..fac4586 100644
--- a/ksquirrel/ksquirrelpart/sq_utils_scale.cpp
+++ b/ksquirrel/ksquirrelpart/sq_utils_scale.cpp
@@ -630,7 +630,7 @@ static TQImage ResizeImage(const TQImage& image,const int columns,
   if (support < filtersupport)
     support=filtersupport;
   contribution=new ContributionInfo[ fasttolong( 2.0*Max(support,0.5)+3 ) ];
-  Q_CHECK_PTR( contribution );
+  TQ_CHECK_PTR( contribution );
   /*
     Resize image.
   */
diff --git a/ksquirrel/sq_glwidget.cpp b/ksquirrel/sq_glwidget.cpp
index 5b42e58..d97f05d 100644
--- a/ksquirrel/sq_glwidget.cpp
+++ b/ksquirrel/sq_glwidget.cpp
@@ -192,8 +192,8 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent
     timer_prev = new TQTimer(this);
     timer_next = new TQTimer(this);
 
-    Q_CHECK_PTR(timer_prev);
-    Q_CHECK_PTR(timer_next);
+    TQ_CHECK_PTR(timer_prev);
+    TQ_CHECK_PTR(timer_next);
 
     connect(timer_prev, TQT_SIGNAL(timeout()), SQ_WidgetStack::instance(), TQT_SLOT(emitPreviousSelected()));
     connect(timer_next, TQT_SIGNAL(timeout()), SQ_WidgetStack::instance(), TQT_SLOT(emitNextSelected()));
@@ -201,7 +201,7 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent
 
     timer_anim = new TQTimer(this);
 
-    Q_CHECK_PTR(timer_anim);
+    TQ_CHECK_PTR(timer_anim);
 
     connect(timer_anim, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimateNext()));
 
diff --git a/ksquirrel/sq_utils_scale.cpp b/ksquirrel/sq_utils_scale.cpp
index dbb1bde..f72aea0 100644
--- a/ksquirrel/sq_utils_scale.cpp
+++ b/ksquirrel/sq_utils_scale.cpp
@@ -630,7 +630,7 @@ static TQImage ResizeImage(const TQImage& image,const int columns,
   if (support < filtersupport)
     support=filtersupport;
   contribution=new ContributionInfo[ fasttolong( 2.0*Max(support,0.5)+3 ) ];
-  Q_CHECK_PTR( contribution );
+  TQ_CHECK_PTR( contribution );
   /*
     Resize image.
   */
-- 
cgit v1.2.1