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, 49 insertions, 47 deletions

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>