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

8 files changed, 51 insertions, 49 deletions

diff --git a/vcs/cvsservice/integrator/Makefile.am b/vcs/cvsservice/integrator/Makefile.am
index 7768aad5..fd1d6922 100644
--- a/vcs/cvsservice/integrator/Makefile.am
+++ b/vcs/cvsservice/integrator/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/extras -I$(top_srcdir)/lib/util \
-	$(all_includes)
+	$(all_includes) -I$(kde_includes)/kde
 METASOURCES = AUTO
 kde_module_LTLIBRARIES = libcvsserviceintegrator.la
 libcvsserviceintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp
index 1bbc3b11..13cc370e 100644
--- a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp
+++ b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp
@@ -28,9 +28,9 @@ static const KDevPluginInfo data("kdevcvsserviceintegrator");
 typedef KDevGenericFactory<CVSServiceIntegrator> CVSIntegratorFactory;
 K_EXPORT_COMPONENT_FACTORY( libcvsserviceintegrator, CVSIntegratorFactory(data) )
 
-CVSServiceIntegrator::CVSServiceIntegrator(TQObject* parent, const char* name, 
+CVSServiceIntegrator::CVSServiceIntegrator(TQObject* tqparent, const char* name, 
     const TQStringList args)
-    :KDevVCSIntegrator(parent, name)
+    :KDevVCSIntegrator(tqparent, name)
 {
 }
 
@@ -38,14 +38,14 @@ CVSServiceIntegrator::~CVSServiceIntegrator( )
 {
 }
 
-VCSDialog* CVSServiceIntegrator::fetcher(TQWidget* parent)
+VCSDialog* CVSServiceIntegrator::fetcher(TQWidget* tqparent)
 {
     return 0;
 }
 
-VCSDialog* CVSServiceIntegrator::integrator(TQWidget* parent)
+VCSDialog* CVSServiceIntegrator::integrator(TQWidget* tqparent)
 {
-    IntegratorDlg *dlg = new IntegratorDlg(this, parent);
+    IntegratorDlg *dlg = new IntegratorDlg(this, tqparent);
     return dlg;
 }
 
diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.h b/vcs/cvsservice/integrator/cvsserviceintegrator.h
index c02547a4..02c94430 100644
--- a/vcs/cvsservice/integrator/cvsserviceintegrator.h
+++ b/vcs/cvsservice/integrator/cvsserviceintegrator.h
@@ -26,12 +26,13 @@
 
 class CVSServiceIntegrator: public KDevVCSIntegrator {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    CVSServiceIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+    CVSServiceIntegrator(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
     virtual ~CVSServiceIntegrator();
 
-    virtual VCSDialog* fetcher(TQWidget* parent);
-    virtual VCSDialog* integrator(TQWidget* parent);
+    virtual VCSDialog* fetcher(TQWidget* tqparent);
+    virtual VCSDialog* integrator(TQWidget* tqparent);
     
 };
 
diff --git a/vcs/cvsservice/integrator/fetcherdlgbase.ui b/vcs/cvsservice/integrator/fetcherdlgbase.ui
index be0556c2..caf30c0d 100644
--- a/vcs/cvsservice/integrator/fetcherdlgbase.ui
+++ b/vcs/cvsservice/integrator/fetcherdlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>FetcherDlgBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>FetcherDlgBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QComboBox" row="1" column="1">
+        <widget class="TQComboBox" row="1" column="1">
             <property name="name">
                 <cstring>module</cstring>
             </property>
@@ -35,7 +35,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>textLabel1_2_2</cstring>
             </property>
@@ -54,7 +54,7 @@
                 <cstring>comboBox5</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -73,7 +73,7 @@
                 <cstring>repository</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="2">
+        <widget class="TQComboBox" row="0" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>repository</cstring>
             </property>
@@ -81,7 +81,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="2">
+        <widget class="TQPushButton" row="1" column="2">
             <property name="name">
                 <cstring>pushButton2</cstring>
             </property>
@@ -97,7 +97,7 @@
                 <string>Fetch &amp;List</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel1_2</cstring>
             </property>
@@ -116,7 +116,7 @@
                 <cstring>module</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="2" column="1" rowspan="1" colspan="2">
+        <widget class="TQComboBox" row="2" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>comboBox5</cstring>
             </property>
@@ -134,7 +134,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -149,5 +149,5 @@
     <tabstop>pushButton2</tabstop>
     <tabstop>comboBox5</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/vcs/cvsservice/integrator/initdlg.ui b/vcs/cvsservice/integrator/initdlg.ui
index 1b36ecfb..c4d0cc4a 100644
--- a/vcs/cvsservice/integrator/initdlg.ui
+++ b/vcs/cvsservice/integrator/initdlg.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>InitDlg</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>InitDlg</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel1_2_2_2</cstring>
             </property>
@@ -53,7 +53,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -62,7 +62,7 @@
         </spacer>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/vcs/cvsservice/integrator/integratordlg.cpp b/vcs/cvsservice/integrator/integratordlg.cpp
index 32184c45..3561f7ad 100644
--- a/vcs/cvsservice/integrator/integratordlg.cpp
+++ b/vcs/cvsservice/integrator/integratordlg.cpp
@@ -40,8 +40,8 @@
 
 #include "initdlg.h"
 
-IntegratorDlg::IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *parent, const char *name)
-    :IntegratorDlgBase(parent, name), m_integrator(integrator)
+IntegratorDlg::IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *tqparent, const char *name)
+    :IntegratorDlgBase(tqparent, name), m_integrator(integrator)
 {
     TQFile cvspass(TQDir::homeDirPath() + "/.cvspass");
     if (cvspass.open(IO_ReadOnly))
@@ -81,11 +81,11 @@ void IntegratorDlg::init_clicked()
         if (!proc->normalExit())
             KMessageBox::error(this, i18n("cvs init did not exit normally. Please check if cvs is installed and works correctly."), i18n("Init CVS Repository"));
         else if (proc->exitStatus() != 0)
-            KMessageBox::error(this, i18n("cvs init exited with status %1. Please check if the cvs location is correct.").arg(proc->exitStatus()), i18n("Init CVS Repository"));
+            KMessageBox::error(this, i18n("cvs init exited with status %1. Please check if the cvs location is correct.").tqarg(proc->exitStatus()), i18n("Init CVS Repository"));
         else
         {
-            repository->insertItem(TQString(":local:%1").arg(url));
-            repository->setCurrentText(TQString(":local:%1").arg(url));
+            repository->insertItem(TQString(":local:%1").tqarg(url));
+            repository->setCurrentText(TQString(":local:%1").tqarg(url));
         }
     }
 }
@@ -122,13 +122,13 @@ void IntegratorDlg::accept()
     proc->setWorkingDirectory(m_projectLocation);
     *proc << "cvs";
     *proc << "-d" << repository->currentText() << "import"
-        << "-m" << TQString("\"%1\"").arg(comment->text()) << module->text()
+        << "-m" << TQString("\"%1\"").tqarg(comment->text()) << module->text()
         << vendorTag->text() << releaseTag->text();
     proc->start(KProcess::Block);
     if (!proc->normalExit())
         KMessageBox::error(this, i18n("cvs import did not exit normally. Please check if cvs is installed and works correctly."), i18n("Init CVS Repository"));
     else if (proc->exitStatus() != 0)
-        KMessageBox::error(this, i18n("cvs import exited with status %1. Please check if the cvs location is correct.").arg(proc->exitStatus()), i18n("Init CVS Repository"));
+        KMessageBox::error(this, i18n("cvs import exited with status %1. Please check if the cvs location is correct.").tqarg(proc->exitStatus()), i18n("Init CVS Repository"));
     else
     {
         kdDebug() << "Project is in: " << m_projectLocation << endl;
diff --git a/vcs/cvsservice/integrator/integratordlg.h b/vcs/cvsservice/integrator/integratordlg.h
index 5a9ab3a8..72ae30fd 100644
--- a/vcs/cvsservice/integrator/integratordlg.h
+++ b/vcs/cvsservice/integrator/integratordlg.h
@@ -27,8 +27,9 @@ class TQDomDocument;
 
 class IntegratorDlg: public IntegratorDlgBase, public VCSDialog {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *parent = 0, const char *name = 0);
+    IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *tqparent = 0, const char *name = 0);
 
     virtual TQWidget *self();
     virtual void init(const TQString &projectName, const TQString &projectLocation);
diff --git a/vcs/cvsservice/integrator/integratordlgbase.ui b/vcs/cvsservice/integrator/integratordlgbase.ui
index e17f44e1..a20b7a75 100644
--- a/vcs/cvsservice/integrator/integratordlgbase.ui
+++ b/vcs/cvsservice/integrator/integratordlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>IntegratorDlgBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>IntegratorDlgBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>createModule</cstring>
             </property>
@@ -27,9 +27,9 @@
                 <string>Create module in the repository</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="1">
+        <widget class="TQLayoutWidget" row="1" column="1">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -46,7 +46,7 @@
                         <string>vendor</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="4">
+                <widget class="TQPushButton" row="1" column="4">
                     <property name="name">
                         <cstring>init</cstring>
                     </property>
@@ -60,7 +60,7 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="4">
+                <widget class="TQComboBox" row="0" column="1" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>repository</cstring>
                     </property>
@@ -79,7 +79,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="3">
+                <widget class="TQPushButton" row="1" column="3">
                     <property name="name">
                         <cstring>login</cstring>
                     </property>
@@ -103,7 +103,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -120,7 +120,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
@@ -135,7 +135,7 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>moduleLabel</cstring>
                     </property>
@@ -157,7 +157,7 @@
                         <cstring>module</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>vendorLabel</cstring>
                     </property>
@@ -179,7 +179,7 @@
                         <cstring>vendorTag</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="0">
+                <widget class="TQLabel" row="4" column="0">
                     <property name="name">
                         <cstring>releaseLabel</cstring>
                     </property>
@@ -201,7 +201,7 @@
                         <cstring>releaseTag</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="5" column="0">
+                <widget class="TQLabel" row="5" column="0">
                     <property name="name">
                         <cstring>commentLabel</cstring>
                     </property>
@@ -223,7 +223,7 @@
                         <cstring>comment</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>repositoryLabel</cstring>
                     </property>
@@ -279,7 +279,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
@@ -389,10 +389,10 @@
     <tabstop>login</tabstop>
     <tabstop>init</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>init_clicked()</slot>
     <slot>login_clicked()</slot>
     <slot>createModule_clicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>