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, 6 insertions, 8 deletions

diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp
index df8ba309..8d533a9e 100644
--- a/languages/sql/sqlactions.cpp
+++ b/languages/sql/sqlactions.cpp
@@ -25,16 +25,14 @@
 #include "kdevlanguagesupport.h"
 #include "sqlsupport_part.h"
 
-SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text, 
+SqlListAction::SqlListAction(STQLSupportPart *part, const TQString &text, 
 				 const KShortcut& cut,
                                  const TQObject *receiver, const char *slot,
-                                 KActionCollection *parent, const char *name)
-    : KWidgetAction( m_combo = new KComboBox(), text, cut, 0, 0, parent, name), m_part(part)
+                                 KActionCollection *tqparent, const char *name)
+    : KWidgetAction( m_combo = new KComboBox(), text, cut, 0, 0, tqparent, name), m_part(part)
 {
-#if (QT_VERSION >= 0x030100)
     m_combo->setEditable( false );
     m_combo->setAutoCompletion( true );
-#endif
 
     m_combo->setMinimumWidth( 200 );
     m_combo->setMaximumWidth( 400 );
@@ -51,7 +49,7 @@ SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text,
 
 void SqlListAction::setCurrentConnectionName(const TQString &name)
 {
-    int idx = m_part->connections().findIndex( name );
+    int idx = m_part->connections().tqfindIndex( name );
     if ( idx < 0 )
         m_combo->setCurrentItem( 0 );
     else
@@ -62,7 +60,7 @@ void SqlListAction::setCurrentConnectionName(const TQString &name)
 TQString SqlListAction::currentConnectionName() const
 {
     if ( m_combo->currentItem() <= 0 )
-        return TQString::null;
+        return TQString();
     return m_part->connections()[ m_combo->currentItem() - 1 ];
 }
 
@@ -88,7 +86,7 @@ void SqlListAction::refresh()
         TQSqlDatabase* db = TQSqlDatabase::database( (*it), false );
         if ( !db ) {
             kdDebug( 9000 ) << "Could not find database connection " << (*it) << endl;
-            m_combo->insertItem( SmallIcon( "no" ), i18n("<error - no connection %1>").arg( *it ) );
+            m_combo->insertItem( SmallIcon( "no" ), i18n("<error - no connection %1>").tqarg( *it ) );
             continue;
         }
         cName = db->driverName();