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

5 files changed, 23 insertions, 21 deletions

diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp
index 5551cd02..930bcfef 100644
--- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp
+++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp
@@ -19,9 +19,9 @@
 
 K_EXPORT_COMPONENT_FACTORY( libkdevcustompcsimporter, KGenericFactory<KDevCustomImporter>( "kdevcustompcsimporter" ) )
 
-KDevCustomImporter::KDevCustomImporter( TQObject* parent, const char* name, const TQStringList & // args
+KDevCustomImporter::KDevCustomImporter( TQObject* tqparent, const char* name, const TQStringList & // args
                                       )
-		: KDevPCSImporter( parent, name )
+		: KDevPCSImporter( tqparent, name )
 {}
 
 
@@ -75,9 +75,9 @@ TQStringList KDevCustomImporter::includePaths()
 	return m_settings->dirs();
 }
 
-TQWidget* KDevCustomImporter::createSettingsPage( TQWidget* parent, const char* name )
+TQWidget* KDevCustomImporter::createSettingsPage( TQWidget* tqparent, const char* name )
 {
-	m_settings = new SettingsDialog( parent, name );
+	m_settings = new SettingsDialog( tqparent, name );
 	return m_settings;
 }
 
@@ -94,7 +94,7 @@ void KDevCustomImporter::processDir( const TQString path, TQStringList & files )
 		if (!dir.exists())
 		    continue;
 		kdDebug( 9015 ) << "Examining: " << dir.path() << endl;
-		const QFileInfoList *dirEntries = dir.entryInfoList();
+		const TQFileInfoList *dirEntries = dir.entryInfoList();
 		if ( !dirEntries ) continue;
 		TQPtrListIterator<TQFileInfo> it( *dirEntries );
 		for ( ; dirEntries && it.current(); ++it )
diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h
index bca53eeb..0aea3974 100644
--- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h
+++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h
@@ -19,15 +19,16 @@ class SettingsDialog;
 class KDevCustomImporter : public KDevPCSImporter
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    KDevCustomImporter(TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList());
+    KDevCustomImporter(TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList());
 
     ~KDevCustomImporter();
 
     virtual TQString dbName() const;
     virtual TQStringList fileList();
     virtual TQStringList includePaths();
-    virtual TQWidget* createSettingsPage(TQWidget* parent, const char* name);
+    virtual TQWidget* createSettingsPage(TQWidget* tqparent, const char* name);
 
 protected:
     TQStringList fileList( const TQString& path );
diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
index 37f2bfef..ebef44ed 100644
--- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
@@ -34,8 +34,8 @@
 
 #include <cstdlib>
 
-SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl )
-		: SettingsDialogBase( parent, name, fl )
+SettingsDialog::SettingsDialog( TQWidget* tqparent, const char* name, WFlags fl )
+		: SettingsDialogBase( tqparent, name, fl )
 {
 	KURLRequester * req = new KURLRequester( this );
 	req->setMode( KFile::Directory );
@@ -83,17 +83,17 @@ void SettingsDialog::validate()
 
 void SettingsDialog::validateDirectory( const TQString & dir )
 {
-	TQDir d( dir, TQString::null, TQDir::DefaultSort, TQDir::Dirs );
+	TQDir d( dir, TQString(), TQDir::DefaultSort, TQDir::Dirs );
 	if ( !d.exists() )
 	{
 		elb->lineEdit() ->setText( dir );
 
-		if ( TQListBoxItem * item = elb->listBox() ->findItem( dir, Qt::ExactMatch ) )
+		if ( TQListBoxItem * item = elb->listBox() ->tqfindItem( dir, TQt::ExactMatch ) )
 		{
 			elb->listBox() ->removeItem( elb->listBox() ->index( item ) );
 		}
 
-		TQString errormsg = TQString( "<qt><b>%1</b> is not a directory</qt>" ).arg( dir );
+		TQString errormsg = TQString( "<qt><b>%1</b> is not a directory</qt>" ).tqarg( dir );
 		KMessageBox::error( 0, errormsg, "Couldn't find directory" );
 	}
 	emit enabled( elb->listBox()->count() > 0 );
diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.h b/languages/cpp/pcsimporter/customimporter/settingsdialog.h
index 02336f98..3d683f99 100644
--- a/languages/cpp/pcsimporter/customimporter/settingsdialog.h
+++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.h
@@ -19,12 +19,13 @@ class KEditListBox;
 class SettingsDialog : public SettingsDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  SettingsDialog(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
   ~SettingsDialog();
 
-  bool isValidQtDir( const TQString& path ) const;
+  bool isValidTQtDir( const TQString& path ) const;
 
   TQString qtDir() const;
   TQString configuration() const;
diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui
index b9faadb1..a7678844 100644
--- a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>SettingsDialogBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SettingsDialogBase</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>grid</cstring>
             </property>
@@ -32,7 +32,7 @@
                         <string>*.h;*.H;*.hh;*.hxx;*.hpp;*.tlh</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1_2</cstring>
                     </property>
@@ -40,7 +40,7 @@
                         <string>Filename pattern:</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="0">
+                <widget class="TQCheckBox" row="2" column="0">
                     <property name="name">
                         <cstring>recursive_box</cstring>
                     </property>
@@ -55,8 +55,8 @@
         </widget>
     </vbox>
 </widget>
-<signals>
+<Q_SIGNALS>
     <signal>enabled(int)</signal>
-</signals>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SIGNALS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>