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, 35 insertions, 33 deletions

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>