Update various qt function definitions and static methods for tqt3

2 files changed, 16 insertions, 16 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index f3c1c8a..6aed3ec 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/src/kfeedback.cpp b/src/kfeedback.cpp
index b83e7cd..67ef633 100644
--- a/src/kfeedback.cpp
+++ b/src/kfeedback.cpp
@@ -42,7 +42,7 @@ KFeedbackDialog::KFeedbackDialog( const TQString & feedbackMailAddress,
 	setHelp( helpTopic );
 
     _form = new KFeedbackForm( feedbackMailAddress, plainPage() );
-    Q_CHECK_PTR( _form );
+    TQ_CHECK_PTR( _form );
 
     layout->addWidget( _form );
     checkSendButton();
@@ -96,7 +96,7 @@ KFeedbackForm::KFeedbackForm( const TQString &	feedbackMailAddress,
     //
     
     _questionList = new KFeedbackQuestionList( this );
-    Q_CHECK_PTR( _questionList );
+    TQ_CHECK_PTR( _questionList );
     
     connect( _questionList, TQT_SIGNAL( checkComplete()     ),
 	     this,	    TQT_SLOT  ( slotCheckComplete() ) );
@@ -107,21 +107,21 @@ KFeedbackForm::KFeedbackForm( const TQString &	feedbackMailAddress,
     //
 
     TQHBox * hbox = new TQHBox( this );
-    Q_CHECK_PTR( hbox );
+    TQ_CHECK_PTR( hbox );
 
     TQSizePolicy pol( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); // hor / vert
     
     label = new TQLabel( i18n( "Questions marked with " ), hbox ); 
-    Q_CHECK_PTR( label );
+    TQ_CHECK_PTR( label );
     label->setSizePolicy( pol );
 
     label = new TQLabel( hbox );
-    Q_CHECK_PTR( label );
+    TQ_CHECK_PTR( label );
     label->setPixmap( KGlobal::iconLoader()->loadIcon( "edit", KIcon::Small ) );
     label->setSizePolicy( pol );
 
     label = new TQLabel( i18n( " must be answered before a mail can be sent.") , hbox );
-    Q_CHECK_PTR( label );
+    TQ_CHECK_PTR( label );
     label->setSizePolicy( pol );
     
     new TQWidget( hbox );	// Fill any leftover space to the right.
@@ -131,8 +131,8 @@ KFeedbackForm::KFeedbackForm( const TQString &	feedbackMailAddress,
     // Free-text comment field
     //
 
-    label = new TQLabel( "\n" + i18n( "&Additional Comments:" ), this );	Q_CHECK_PTR( label );
-    _comment = new TQMultiLineEdit( this );				Q_CHECK_PTR( _comment );
+    label = new TQLabel( "\n" + i18n( "&Additional Comments:" ), this );	TQ_CHECK_PTR( label );
+    _comment = new TQMultiLineEdit( this );				TQ_CHECK_PTR( _comment );
 
     label->setBuddy( _comment );
     _comment->setWordWrap( TQMultiLineEdit::FixedColumnWidth );
@@ -290,7 +290,7 @@ KFeedbackQuestionList::addQuestion( const TQString & 	text,
     KFeedbackQuestion * question = new KFeedbackQuestion( this, text, id,
 							  exclusiveAnswer,
 							  required );
-    Q_CHECK_PTR( question );
+    TQ_CHECK_PTR( question );
 
     return question;
 }
@@ -305,7 +305,7 @@ KFeedbackQuestionList::addYesNoQuestion( const TQString & 	text,
     KFeedbackQuestion * question = new KFeedbackQuestion( this, text, id,
 							  true,	// exclusive
 							  required );
-    Q_CHECK_PTR( question );
+    TQ_CHECK_PTR( question );
     question->addAnswer( i18n( "yes" ), "yes" );
     question->addAnswer( i18n( "no"  ), "no"  );
 }