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, 16 insertions, 14 deletions

diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp
index 58ef9444..16cad089 100644
--- a/parts/vcsmanager/vcsmanagerpart.cpp
+++ b/parts/vcsmanager/vcsmanagerpart.cpp
@@ -48,8 +48,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( data ) )
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
-VCSManagerPart::VCSManagerPart(TQObject *parent, const char *name, const TQStringList &/*args*/)
-	: KDevPlugin(&data, parent, name ? name : "VCSManagerPart")
+VCSManagerPart::VCSManagerPart(TQObject *tqparent, const char *name, const TQStringList &/*args*/)
+	: KDevPlugin(&data, tqparent, name ? name : "VCSManagerPart")
 {
 	kdDebug() << " ********** VCSManagerPart::VCSManagerPart() ************** " << endl;
 
@@ -95,7 +95,7 @@ void VCSManagerPart::loadVCSPlugin()
 	m_vcsPluginName = DomUtil::readEntry( dom, "/general/versioncontrol" ).stripWhiteSpace();
 	if ( m_vcsPluginName.isEmpty() ) return;
 	
-	TQString constraint = TQString( "DesktopEntryName=='%1'" ).arg( m_vcsPluginName );
+	TQString constraint = TQString( "DesktopEntryName=='%1'" ).tqarg( m_vcsPluginName );
 	pluginController()->loadPlugin( "KDevelop/VersionControl", constraint );
 }
 
diff --git a/parts/vcsmanager/vcsmanagerpart.h b/parts/vcsmanager/vcsmanagerpart.h
index 2d8cf63d..2d135b73 100644
--- a/parts/vcsmanager/vcsmanagerpart.h
+++ b/parts/vcsmanager/vcsmanagerpart.h
@@ -38,8 +38,9 @@ Please read the README.dox file for more info about this part
 class VCSManagerPart: public KDevPlugin
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	VCSManagerPart(TQObject *parent, const char *name, const TQStringList &args);
+	VCSManagerPart(TQObject *tqparent, const char *name, const TQStringList &args);
 	~VCSManagerPart();
 	TQString vcsPlugin();
 	void loadVCSPlugin();
diff --git a/parts/vcsmanager/vcsmanagerprojectconfig.cpp b/parts/vcsmanager/vcsmanagerprojectconfig.cpp
index 9a081f3a..2202484b 100644
--- a/parts/vcsmanager/vcsmanagerprojectconfig.cpp
+++ b/parts/vcsmanager/vcsmanagerprojectconfig.cpp
@@ -28,8 +28,8 @@
 #include "vcsmanagerprojectconfig.h"
 #include "vcsmanagerpart.h"
 
-VCSManagerProjectConfig::VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *parent, const char *name )
-	: VCSManagerProjectConfigBase( parent, name ), m_part( part )
+VCSManagerProjectConfig::VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *tqparent, const char *name )
+	: VCSManagerProjectConfigBase( tqparent, name ), m_part( part )
 {
 	setup();
 }
@@ -51,7 +51,7 @@ void VCSManagerProjectConfig::setup( )
 	
 	int current = 0;
 
-	TQString constraint = TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
+	TQString constraint = TQString("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION);
 	KTrader::OfferList offers = KTrader::self()->query("KDevelop/VersionControl", constraint );
 	KTrader::OfferList::const_iterator it = offers.begin();
 	for ( int i = 1; it != offers.end(); ++it, ++i )
diff --git a/parts/vcsmanager/vcsmanagerprojectconfig.h b/parts/vcsmanager/vcsmanagerprojectconfig.h
index c452ac41..9dbe0b27 100644
--- a/parts/vcsmanager/vcsmanagerprojectconfig.h
+++ b/parts/vcsmanager/vcsmanagerprojectconfig.h
@@ -29,8 +29,9 @@ class VCSManagerPart;
 class VCSManagerProjectConfig: public VCSManagerProjectConfigBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *parent = 0, const char *name = 0);
+	VCSManagerProjectConfig( VCSManagerPart *part, TQWidget *tqparent = 0, const char *name = 0);
 
 public slots:
 	void accept();
diff --git a/parts/vcsmanager/vcsmanagerprojectconfigbase.ui b/parts/vcsmanager/vcsmanagerprojectconfigbase.ui
index 735a018f..471e3efa 100644
--- a/parts/vcsmanager/vcsmanagerprojectconfigbase.ui
+++ b/parts/vcsmanager/vcsmanagerprojectconfigbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>VCSManagerProjectConfigBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>VCSManagerProjectConfigBase</cstring>
     </property>
@@ -19,18 +19,18 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
             <property name="text">
                 <string>Version control system to use for this project:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
-        <widget class="QComboBox">
+        <widget class="TQComboBox">
             <property name="name">
                 <cstring>vcsCombo</cstring>
             </property>
@@ -45,7 +45,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>31</width>
                     <height>131</height>
@@ -54,5 +54,5 @@
         </spacer>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>