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

20 files changed, 164 insertions, 156 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>
diff --git a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp
index a52da5d7..d487ab35 100644
--- a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp
+++ b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp
@@ -23,8 +23,8 @@
 
 K_EXPORT_COMPONENT_FACTORY( libkdevkdelibsimporter, KGenericFactory<KDevKDELibsImporter>( "kdevkdelibsimporter" ) )
 
-KDevKDELibsImporter::KDevKDELibsImporter( TQObject * parent, const char * name, const TQStringList& )
-		: KDevPCSImporter( parent, name )
+KDevKDELibsImporter::KDevKDELibsImporter( TQObject * tqparent, const char * name, const TQStringList& )
+		: KDevPCSImporter( tqparent, name )
 {}
 
 KDevKDELibsImporter::~KDevKDELibsImporter()
@@ -76,7 +76,7 @@ TQStringList KDevKDELibsImporter::fileList()
 		{
 			dir.setPath( s.pop() );
 			kdDebug( 9015 ) << "Examining: " << dir.path() << endl;
-			const QFileInfoList *dirEntries = dir.entryInfoList();
+			const TQFileInfoList *dirEntries = dir.entryInfoList();
 			if ( !dirEntries ) continue;
 			TQPtrListIterator<TQFileInfo> it( *dirEntries );
 			for ( ; it.current(); ++it )
@@ -109,9 +109,9 @@ TQStringList KDevKDELibsImporter::includePaths()
 	return includePaths;
 }
 
-TQWidget * KDevKDELibsImporter::createSettingsPage( TQWidget * parent, const char * name )
+TQWidget * KDevKDELibsImporter::createSettingsPage( TQWidget * tqparent, const char * name )
 {
-	m_settings = new SettingsDialog( parent, name );
+	m_settings = new SettingsDialog( tqparent, name );
 	return m_settings;
 }
 //kate: indent-mode csands; tab-width 4; space-indent off;
diff --git a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h
index 45cf470a..1e2c8254 100644
--- a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h
+++ b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h
@@ -9,8 +9,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef KDEVQTIMPORTER_H
-#define KDEVQTIMPORTER_H
+#ifndef KDEVTQTIMPORTER_H
+#define KDEVTQTIMPORTER_H
 
 #include <kdevpcsimporter.h>
 #include <tqguardedptr.h>
@@ -20,15 +20,16 @@ class SettingsDialog;
 class KDevKDELibsImporter : public KDevPCSImporter
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KDevKDELibsImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
+    KDevKDELibsImporter( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() );
     virtual ~KDevKDELibsImporter();
 
-    virtual TQString dbName() const { return TQString::fromLatin1("KDElibs"); }
+    virtual TQString dbName() const { return TQString::tqfromLatin1("KDElibs"); }
     virtual TQStringList fileList();
     virtual TQStringList includePaths();
 
-    virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 );
+    virtual TQWidget* createSettingsPage( TQWidget* tqparent, const char* name=0 );
 
 private:
     TQStringList fileList( const TQString& path );
diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp
index a0763380..612ff79a 100644
--- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp
@@ -29,17 +29,17 @@
 
 #include "settingsdialog.h"
 
-TQListBoxItem* QListBox_selectedItem( TQListBox* cpQListBox )
+TQListBoxItem* TQListBox_selectedItem( TQListBox* cpTQListBox )
 {
-	if ( cpQListBox->selectionMode() != TQListBox::Single )
+	if ( cpTQListBox->selectionMode() != TQListBox::Single )
 		return 0;
-	if ( cpQListBox->isSelected( cpQListBox->currentItem() ) )
-		return cpQListBox->item( cpQListBox->currentItem() );
+	if ( cpTQListBox->isSelected( cpTQListBox->currentItem() ) )
+		return cpTQListBox->item( cpTQListBox->currentItem() );
 	return 0;
 }
 
-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 )
 {
 	KApplication::kApplication()->dirs()->addResourceType("include","include");
 	TQStringList kdedirs=KApplication::kApplication()->dirs()->findDirs("include","");
@@ -47,7 +47,7 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl )
 	{
 		TQString kdedir = *it;
 		if ( !kdedir.isEmpty() && isValidKDELibsDir( kdedir ) )
-			if ( !kdeListBox->findItem( kdedir, ExactMatch ) )
+			if ( !kdeListBox->tqfindItem( kdedir, ExactMatch ) )
 				kdeListBox->insertItem( kdedir );
 	}
 
@@ -81,7 +81,7 @@ void SettingsDialog::addUrlButton_clicked()
 	if ( isValidKDELibsDir( kdeUrl->url() ) )
 	{
 		kdeListBox->insertItem( kdeUrl->url() );
-		if ( TQListBoxItem * item = kdeListBox->findItem( kdeUrl->url(), ExactMatch ) )
+		if ( TQListBoxItem * item = kdeListBox->tqfindItem( kdeUrl->url(), ExactMatch ) )
 		{
 			kdeListBox->setSelected( item, true );
 		}
diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h
index 4a06dd12..7de31292 100644
--- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h
+++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h
@@ -17,9 +17,10 @@
 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();
   /*$PUBLIC_FUNCTIONS$*/
 
diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui
index 00b8c3ac..de905d40 100644
--- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/kdelibsimporter/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="QLabel" row="0" column="0" rowspan="1" colspan="4">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>textLabel1_2</cstring>
             </property>
@@ -25,7 +25,7 @@
 Only the selected entry will be used</string>
             </property>
         </widget>
-        <widget class="QComboBox" row="3" column="1">
+        <widget class="TQComboBox" row="3" column="1">
             <item>
                 <property name="text">
                     <string>KDE Libs Headers</string>
@@ -46,7 +46,7 @@ Only the selected entry will be used</string>
                 <string>Decide if you want to restrict the Code Completion database to only the base kdelibs API or the entire KDE include structure</string>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -65,7 +65,7 @@ Only the selected entry will be used</string>
                 <string>If none of the directories KDevelop found is what you want,you can enter a directory of your choice here</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="3">
+        <widget class="TQPushButton" row="2" column="3">
             <property name="name">
                 <cstring>addUrlButton</cstring>
             </property>
@@ -96,7 +96,7 @@ Only the selected entry will be used</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>220</width>
                     <height>20</height>
@@ -110,18 +110,18 @@ Only the selected entry will be used</string>
 <connections>
     <connection>
         <sender>kdeListBox</sender>
-        <signal>selectionChanged(QListBoxItem*)</signal>
+        <signal>selectionChanged(TQListBoxItem*)</signal>
         <receiver>SettingsDialogBase</receiver>
-        <slot>slotSelectionChanged(QListBoxItem*)</slot>
+        <slot>slotSelectionChanged(TQListBoxItem*)</slot>
     </connection>
 </connections>
-<signals>
+<Q_SIGNALS>
     <signal>enabled(int)</signal>
-</signals>
-<slots>
-    <slot>slotSelectionChanged(QListBoxItem*)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SIGNALS>
+<Q_SLOTS>
+    <slot>slotSelectionChanged(TQListBoxItem*)</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
index d4635ba4..5864659c 100644
--- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
+++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
@@ -22,15 +22,15 @@
 #include <tqlabel.h>
 #include <tqdir.h>
 
-K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory<KDevQt4Importer>( "kdevqt4importer" ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory<KDevTQt4Importer>( "kdevqt4importer" ) )
 
-KDevQt4Importer::KDevQt4Importer( TQObject * parent, const char * name, const TQStringList& )
-    : KDevPCSImporter( parent, name )
+KDevTQt4Importer::KDevTQt4Importer( TQObject * tqparent, const char * name, const TQStringList& )
+    : KDevPCSImporter( tqparent, name )
 {
     m_qtfile = 0;
 }
 
-KDevQt4Importer::~KDevQt4Importer()
+KDevTQt4Importer::~KDevTQt4Importer()
 {
     if (m_qtfile)
         delete m_qtfile;
@@ -38,7 +38,7 @@ KDevQt4Importer::~KDevQt4Importer()
     m_qtfile = 0;
 }
 
-TQStringList KDevQt4Importer::fileList()
+TQStringList KDevTQt4Importer::fileList()
 {
     if( !m_settings )
         return TQStringList();
@@ -49,18 +49,18 @@ TQStringList KDevQt4Importer::fileList()
     KTempFile ifile;
     TQTextStream &is = *ifile.textStream();
 
-		is << "#include <QtCore/qobjectdefs.h>\n"
-		   << "#undef Q_SLOTS\n#undef Q_SIGNALS\n#undef slots\n#undef signals"
-		   << "#define Q_SLOTS slots\n"
-			 << "#define Q_SIGNALS signals\n"
-			 << "#include <QtCore/QtCore>\n"
-       << "#include <QtGui/QtGui>\n"
-       << "#include <QtNetwork/QtNetwork>\n"
-       << "#include <QtXml/QtXml>\n"
-       << "#include <Qt3Support/Qt3Support>\n"
-       << "#include <QtSql/QtSql>\n"
-       << "#include <QtTest/QtTest>\n"
-			 << "#include <QtOpenGL/QtOpenGL>\n";
+		is << "#include <TQtCore/tqobjectdefs.h>\n"
+		   << "#undef slots\n#undef signals\n#undef slots\n#undef signals"
+		   << "#define slots slots\n"
+			 << "#define signals signals\n"
+			 << "#include <TQtCore/TQtCore>\n"
+       << "#include <TQtGui/TQtGui>\n"
+       << "#include <TQtNetwork/TQtNetwork>\n"
+       << "#include <TQtXml/TQtXml>\n"
+       << "#include <TQt3Support/TQt3Support>\n"
+       << "#include <TQtSql/TQtSql>\n"
+       << "#include <TQtTest/TQtTest>\n"
+			 << "#include <TQtOpenGL/TQtOpenGL>\n";
 			
 
 
@@ -86,22 +86,22 @@ TQStringList KDevQt4Importer::fileList()
     return m_qtfile->name();
 }
 
-TQStringList KDevQt4Importer::includePaths()
+TQStringList KDevTQt4Importer::includePaths()
 {
     if( !m_settings || !m_qtfile)
         return TQStringList();
 
     TQStringList includePaths;
     includePaths.push_back( m_settings->qtDir() );
-    includePaths.push_back( m_settings->qtDir() + "/Qt" );
+    includePaths.push_back( m_settings->qtDir() + "/TQt" );
 
     /// @todo add mkspec
     return includePaths;
 }
 
-TQWidget * KDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name )
+TQWidget * KDevTQt4Importer::createSettingsPage( TQWidget * tqparent, const char * name )
 {
-    m_settings = new SettingsDialog( parent, name );
+    m_settings = new SettingsDialog( tqparent, name );
     return m_settings;
 }
 
diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
index c430db19..5a365bf6 100644
--- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
+++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h
@@ -9,8 +9,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef KDEVQTIMPORTER_H
-#define KDEVQTIMPORTER_H
+#ifndef KDEVTQTIMPORTER_H
+#define KDEVTQTIMPORTER_H
 
 #include <kdevpcsimporter.h>
 #include <tqguardedptr.h>
@@ -18,18 +18,19 @@
 class SettingsDialog;
 class KTempFile;
 
-class KDevQt4Importer : public KDevPCSImporter
+class KDevTQt4Importer : public KDevPCSImporter
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
-    virtual ~KDevQt4Importer();
+    KDevTQt4Importer( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() );
+    virtual ~KDevTQt4Importer();
 
-    virtual TQString dbName() const { return TQString::fromLatin1("Qt4"); }
+    virtual TQString dbName() const { return TQString::tqfromLatin1("TQt4"); }
     virtual TQStringList fileList();
     virtual TQStringList includePaths();
 
-    virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 );
+    virtual TQWidget* createSettingsPage( TQWidget* tqparent, const char* name=0 );
 
 private:
     TQGuardedPtr<SettingsDialog> m_settings;
diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
index 755b14c4..1b8e46f2 100644
--- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
@@ -27,20 +27,20 @@
 
 #include "settingsdialog.h"
 
-TQListBoxItem* QListBox_selectedItem(TQListBox* cpQListBox)
+TQListBoxItem* TQListBox_selectedItem(TQListBox* cpTQListBox)
 {
-    if ( cpQListBox->selectionMode() != TQListBox::Single )
+    if ( cpTQListBox->selectionMode() != TQListBox::Single )
     return 0;
-    if ( cpQListBox->isSelected( cpQListBox->currentItem() ) )
-    return  cpQListBox->item(cpQListBox->currentItem());
+    if ( cpTQListBox->isSelected( cpTQListBox->currentItem() ) )
+    return  cpTQListBox->item(cpTQListBox->currentItem());
     return 0;
 }
 
-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)
 {
     TQStringList qtdirs;
-	qtdirs.push_back( ::getenv("QTDIR") + TQString("/include") );
+	qtdirs.push_back( ::getenv("TQTDIR") + TQString("/include") );
 	qtdirs.push_back( TQString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt/include" );
 	qtdirs.push_back( TQString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt-main/include" );
 	qtdirs.push_back( "/usr/qt/4/include" );
@@ -48,8 +48,8 @@ SettingsDialog::SettingsDialog(TQWidget* parent, const char* name, WFlags fl)
     for( TQStringList::Iterator it=qtdirs.begin(); it!=qtdirs.end(); ++it )
     {
         TQString qtdir = *it;
-        if( !qtdir.isEmpty() && isValidQtDir(qtdir) )
-            if (!qtListBox->findItem(qtdir, ExactMatch))
+        if( !qtdir.isEmpty() && isValidTQtDir(qtdir) )
+            if (!qtListBox->tqfindItem(qtdir, ExactMatch))
                 qtListBox->insertItem( qtdir );
     }
 
@@ -74,9 +74,9 @@ void SettingsDialog::slotSelectionChanged(TQListBoxItem* item)
     emit enabled( true );
 }
 
-bool SettingsDialog::isValidQtDir( const TQString & path ) const
+bool SettingsDialog::isValidTQtDir( const TQString & path ) const
 {
-    return TQFile::exists( path + "/QtCore/QtCore" );
+    return TQFile::exists( path + "/TQtCore/TQtCore" );
 }
 
 TQString SettingsDialog::qtDir( ) const
@@ -93,10 +93,10 @@ void SettingsDialog::addUrlButton_clicked( )
 {
 	kdDebug(9000) << k_funcinfo << endl;
 
-	if ( isValidQtDir( qtUrl->url() ) )
+	if ( isValidTQtDir( qtUrl->url() ) )
 	{
 		qtListBox->insertItem( qtUrl->url() );
-		if ( TQListBoxItem * item = qtListBox->findItem( qtUrl->url(), ExactMatch ) )
+		if ( TQListBoxItem * item = qtListBox->tqfindItem( qtUrl->url(), ExactMatch ) )
 		{
 			qtListBox->setSelected( item, true );
 		}
@@ -104,7 +104,7 @@ void SettingsDialog::addUrlButton_clicked( )
 	}
 	else
 	{
-		KMessageBox::error( this, i18n("This does not appear to be a valid Qt4 include directory.\nPlease select a different directory."), i18n("Invalid Directory") );
+		KMessageBox::error( this, i18n("This does not appear to be a valid TQt4 include directory.\nPlease select a different directory."), i18n("Invalid Directory") );
 	}
 }
 
diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h b/languages/cpp/pcsimporter/qt4importer/settingsdialog.h
index 118564fb..9a28b2ad 100644
--- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h
+++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.h
@@ -17,13 +17,14 @@
 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();
   /*$PUBLIC_FUNCTIONS$*/
 
-  bool isValidQtDir( const TQString& path ) const;
+  bool isValidTQtDir( const TQString& path ) const;
 
   TQString qtDir() const;
   TQString configuration() const;
diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui
index f655e4f9..d3314b40 100644
--- a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/qt4importer/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="QLabel" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>textLabel1_2</cstring>
             </property>
@@ -25,7 +25,7 @@
 Only the selected entry will be used</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="1">
+        <widget class="TQPushButton" row="2" column="1">
             <property name="name">
                 <cstring>addUrlButton</cstring>
             </property>
@@ -58,18 +58,18 @@ Only the selected entry will be used</string>
 <connections>
     <connection>
         <sender>qtListBox</sender>
-        <signal>selectionChanged(QListBoxItem*)</signal>
+        <signal>selectionChanged(TQListBoxItem*)</signal>
         <receiver>SettingsDialogBase</receiver>
-        <slot>slotSelectionChanged(QListBoxItem*)</slot>
+        <slot>slotSelectionChanged(TQListBoxItem*)</slot>
     </connection>
 </connections>
-<signals>
+<Q_SIGNALS>
     <signal>enabled(int)</signal>
-</signals>
-<slots>
-    <slot>slotSelectionChanged(QListBoxItem*)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SIGNALS>
+<Q_SLOTS>
+    <slot>slotSelectionChanged(TQListBoxItem*)</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp
index 62eb38fd..25937879 100644
--- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp
+++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp
@@ -18,16 +18,16 @@
 #include <tqlabel.h>
 #include <tqdir.h>
 
-K_EXPORT_COMPONENT_FACTORY( libkdevqtimporter, KGenericFactory<KDevQtImporter>( "kdevqtimporter" ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevqtimporter, KGenericFactory<KDevTQtImporter>( "kdevqtimporter" ) )
 
-KDevQtImporter::KDevQtImporter( TQObject * parent, const char * name, const TQStringList& )
-		: KDevPCSImporter( parent, name )
+KDevTQtImporter::KDevTQtImporter( TQObject * tqparent, const char * name, const TQStringList& )
+		: KDevPCSImporter( tqparent, name )
 {}
 
-KDevQtImporter::~KDevQtImporter()
+KDevTQtImporter::~KDevTQtImporter()
 {}
 
-TQStringList KDevQtImporter::fileList()
+TQStringList KDevTQtImporter::fileList()
 {
 	if ( !m_settings )
 		return TQStringList();
@@ -50,7 +50,7 @@ TQStringList KDevQtImporter::fileList()
 	return fileList;
 }
 
-TQStringList KDevQtImporter::includePaths()
+TQStringList KDevTQtImporter::includePaths()
 {
 	if ( !m_settings )
 		return TQStringList();
@@ -64,9 +64,9 @@ TQStringList KDevQtImporter::includePaths()
 	return includePaths;
 }
 
-TQWidget * KDevQtImporter::createSettingsPage( TQWidget * parent, const char * name )
+TQWidget * KDevTQtImporter::createSettingsPage( TQWidget * tqparent, const char * name )
 {
-	m_settings = new SettingsDialog( parent, name );
+	m_settings = new SettingsDialog( tqparent, name );
 	return m_settings;
 }
 
diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
index 3ae35b96..744a4b67 100644
--- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
+++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h
@@ -9,26 +9,27 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef KDEVQTIMPORTER_H
-#define KDEVQTIMPORTER_H
+#ifndef KDEVTQTIMPORTER_H
+#define KDEVTQTIMPORTER_H
 
 #include <kdevpcsimporter.h>
 #include <tqguardedptr.h>
 
 class SettingsDialog;
 
-class KDevQtImporter : public KDevPCSImporter
+class KDevTQtImporter : public KDevPCSImporter
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() );
-    virtual ~KDevQtImporter();
+    KDevTQtImporter( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() );
+    virtual ~KDevTQtImporter();
 
-    virtual TQString dbName() const { return TQString::fromLatin1("Qt"); }
+    virtual TQString dbName() const { return TQString::tqfromLatin1("TQt"); }
     virtual TQStringList fileList();
     virtual TQStringList includePaths();
 
-    virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 );
+    virtual TQWidget* createSettingsPage( TQWidget* tqparent, const char* name=0 );
 
 private:
     TQGuardedPtr<SettingsDialog> m_settings;
diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
index 2df475b7..a03ac0d4 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
@@ -27,20 +27,20 @@
 
 #include "settingsdialog.h"
 
-TQListBoxItem* QListBox_selectedItem( TQListBox* cpQListBox )
+TQListBoxItem* TQListBox_selectedItem( TQListBox* cpTQListBox )
 {
-	if ( cpQListBox->selectionMode() != TQListBox::Single )
+	if ( cpTQListBox->selectionMode() != TQListBox::Single )
 		return 0;
-	if ( cpQListBox->isSelected( cpQListBox->currentItem() ) )
-		return cpQListBox->item( cpQListBox->currentItem() );
+	if ( cpTQListBox->isSelected( cpTQListBox->currentItem() ) )
+		return cpTQListBox->item( cpTQListBox->currentItem() );
 	return 0;
 }
 
-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 )
 {
 	TQStringList qtdirs;
-	qtdirs.push_back( ::getenv( "QTDIR" ) + TQString("/include") );
+	qtdirs.push_back( ::getenv( "TQTDIR" ) + TQString("/include") );
 	qtdirs.push_back( "/usr/lib/qt3/include" );
 	qtdirs.push_back( "/usr/lib/qt/include" );
 	qtdirs.push_back( "/usr/share/qt3/include" );
@@ -49,8 +49,8 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl )
 	for ( TQStringList::Iterator it = qtdirs.begin(); it != qtdirs.end(); ++it )
 	{
 		TQString qtdir = *it;
-		if ( !qtdir.isEmpty() && isValidQtDir( qtdir ) )
-			if ( !qtListBox->findItem( qtdir, ExactMatch ) )
+		if ( !qtdir.isEmpty() && isValidTQtDir( qtdir ) )
+			if ( !qtListBox->tqfindItem( qtdir, ExactMatch ) )
 				qtListBox->insertItem( qtdir );
 	}
 
@@ -71,9 +71,9 @@ void SettingsDialog::slotSelectionChanged( TQListBoxItem* )
 	}
 
 	TQDir dir( qtDir() );
-	TQStringList qconfigFileList = dir.entryList( "qconfig-*.h" );
+	TQStringList qconfigFileList = dir.entryList( "tqconfig-*.h" );
 	qtConfiguration->clear();
-	TQRegExp rx( "qconfig-(\\w+)\\.h" );
+	TQRegExp rx( "tqconfig-(\\w+)\\.h" );
 	for ( TQStringList::Iterator it = qconfigFileList.begin(); it != qconfigFileList.end(); ++it )
 	{
 		( void ) rx.exactMatch( *it );
@@ -83,7 +83,7 @@ void SettingsDialog::slotSelectionChanged( TQListBoxItem* )
 	emit enabled( true );
 }
 
-bool SettingsDialog::isValidQtDir( const TQString & path ) const
+bool SettingsDialog::isValidTQtDir( const TQString & path ) const
 {
 	return TQFile::exists( path + "/tqt.h" );
 }
@@ -101,10 +101,10 @@ void SettingsDialog::addUrlButton_clicked( )
 {
 	kdDebug(9000) << k_funcinfo << endl;
 
-	if ( isValidQtDir( qtUrl->url() ) )
+	if ( isValidTQtDir( qtUrl->url() ) )
 	{
 		qtListBox->insertItem( qtUrl->url() );
-		if ( TQListBoxItem * item = qtListBox->findItem( qtUrl->url(), ExactMatch ) )
+		if ( TQListBoxItem * item = qtListBox->tqfindItem( qtUrl->url(), ExactMatch ) )
 		{
 			qtListBox->setSelected( item, true );
 		}
@@ -112,7 +112,7 @@ void SettingsDialog::addUrlButton_clicked( )
 	}
 	else
 	{
-		KMessageBox::error( this, i18n("This does not appear to be a valid Qt3 include directory.\nPlease select a different directory."), i18n("Invalid Directory") );
+		KMessageBox::error( this, i18n("This does not appear to be a valid TQt3 include directory.\nPlease select a different directory."), i18n("Invalid Directory") );
 	}
 
 }
diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h
index 118564fb..9a28b2ad 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h
+++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h
@@ -17,13 +17,14 @@
 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();
   /*$PUBLIC_FUNCTIONS$*/
 
-  bool isValidQtDir( const TQString& path ) const;
+  bool isValidTQtDir( const TQString& path ) const;
 
   TQString qtDir() const;
   TQString configuration() const;
diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
index fa485d57..fc28b901 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui
+++ b/languages/cpp/pcsimporter/qtimporter/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>
@@ -26,22 +26,22 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>161</width>
                     <height>21</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="3" column="0">
+        <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -75,7 +75,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QPushButton" row="2" column="2">
+        <widget class="TQPushButton" row="2" column="2">
             <property name="name">
                 <cstring>addUrlButton</cstring>
             </property>
@@ -96,7 +96,7 @@
                 <cstring>qtUrl</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>textLabel1_2</cstring>
             </property>
@@ -117,18 +117,18 @@ Only the selected entry will be used</string>
 <connections>
     <connection>
         <sender>qtListBox</sender>
-        <signal>selectionChanged(QListBoxItem*)</signal>
+        <signal>selectionChanged(TQListBoxItem*)</signal>
         <receiver>SettingsDialogBase</receiver>
-        <slot>slotSelectionChanged(QListBoxItem*)</slot>
+        <slot>slotSelectionChanged(TQListBoxItem*)</slot>
     </connection>
 </connections>
-<signals>
+<Q_SIGNALS>
     <signal>enabled(int)</signal>
-</signals>
-<slots>
-    <slot>slotSelectionChanged(QListBoxItem*)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SIGNALS>
+<Q_SLOTS>
+    <slot>slotSelectionChanged(TQListBoxItem*)</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kurlrequester.h</includehint>