TQt4 port kdevelop

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 3 insertions, 11 deletions

diff --git a/parts/regexptest/regexptestdlg.cpp b/parts/regexptest/regexptestdlg.cpp
index 834b7a1e..5d9b6e88 100644
--- a/parts/regexptest/regexptestdlg.cpp
+++ b/parts/regexptest/regexptestdlg.cpp
@@ -66,23 +66,19 @@ void RegexpTestDialog::somethingChanged()
     subgroups_listview->clear();
 
     if ( qregexp_button->isChecked() || qregexp_min_button->isChecked() )
-        checkQRegExp();
+        checkTQRegExp();
     else if ( kregexp_button->isChecked() )
 	checkKRegExp();
     else
         checkPOSIX();
 }
 
-void RegexpTestDialog::checkQRegExp()
+void RegexpTestDialog::checkTQRegExp()
 {
     TQRegExp rx( pattern_edit->text() );
     rx.setMinimal( qregexp_min_button->isChecked() );
     if ( !rx.isValid() ) {
-#if QT_VERSION >= 0x030100
 	success_label->setText( rx.errorString() );
-#else
-	success_label->setText( i18n("Error compiling the regular expression.") );
-#endif
 	return;
     }
     if ( rx.search( teststring_edit->text() ) < 0 ) {
@@ -90,11 +86,7 @@ void RegexpTestDialog::checkQRegExp()
 	return;
     }
     success_label->setText( i18n("Successfully matched") );
-#if QT_VERSION >= 0x030100
     int numCaptures = rx.numCaptures() + 1;
-#else
-    int numCaptures = 10;
-#endif
     for ( int i = 0; i < numCaptures; ++i ) {
 	new TQListViewItem( subgroups_listview, TQString::number( i ), rx.cap( i ) );
     }
@@ -152,7 +144,7 @@ void RegexpTestDialog::checkPOSIX()
                 regcompMessage = i18n("Invalid collating element");
                 break;
             case REG_EPAREN:
-                regcompMessage = i18n("Unmatched parenthesis group operators");
+                regcompMessage = i18n("Unmatched tqparenthesis group operators");
                 break;
             case REG_ESUBREG:
                 regcompMessage = i18n("Invalid back reference to subexpression");