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

4 files changed, 29 insertions, 28 deletions

diff --git a/buildtools/ant/antoptionswidget.ui b/buildtools/ant/antoptionswidget.ui
index fa78e97f..e7ba954d 100644
--- a/buildtools/ant/antoptionswidget.ui
+++ b/buildtools/ant/antoptionswidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>AntOptionsWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>AntOptionsWidget</cstring>
     </property>
@@ -46,7 +46,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>86</height>
@@ -63,14 +63,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>86</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -81,7 +81,7 @@
                 <cstring>BuildXML</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -92,21 +92,21 @@
                 <cstring>Verbosity</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>TextLabel3</cstring>
             </property>
             <property name="text">
                 <string>&amp;Properties:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignTop</set>
             </property>
             <property name="buddy" stdset="0">
                 <cstring>Properties</cstring>
             </property>
         </widget>
-        <widget class="QTable" row="2" column="1" rowspan="1" colspan="2">
+        <widget class="TQTable" row="2" column="1" rowspan="1" colspan="2">
             <column>
                 <property name="text">
                     <string>Property</string>
@@ -137,7 +137,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>240</width>
                     <height>16</height>
@@ -162,8 +162,8 @@
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp
index d6f66b46..84ad0a5e 100644
--- a/buildtools/ant/antprojectpart.cpp
+++ b/buildtools/ant/antprojectpart.cpp
@@ -45,8 +45,8 @@ AntOptions::AntOptions()
 }
 
 
-AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevBuildTool(&data, parent, name ? name : "AntProjectPart")
+AntProjectPart::AntProjectPart(TQObject *tqparent, const char *name, const TQStringList &)
+  : KDevBuildTool(&data, tqparent, name ? name : "AntProjectPart")
 {
   setInstance(AntProjectFactory::instance());
 
@@ -117,7 +117,7 @@ void AntProjectPart::openProject(const TQString &dirName, const TQString &projec
 
 void AntProjectPart::populateProject()
 {
-  TQApplication::setOverrideCursor(Qt::waitCursor);
+  TQApplication::setOverrideCursor(TQt::waitCursor);
 
   TQValueStack<TQString> s;
   int prefixlen = m_projectDirectory.length()+1;
@@ -128,7 +128,7 @@ void AntProjectPart::populateProject()
   {
     dir.setPath(s.pop());
     kdDebug() << "Examining: " << dir.path() << endl;
-    const QFileInfoList *dirEntries = dir.entryInfoList();
+    const TQFileInfoList *dirEntries = dir.entryInfoList();
     TQPtrListIterator<TQFileInfo> it(*dirEntries);
     for (; it.current(); ++it)
     {
@@ -229,7 +229,7 @@ TQString AntProjectPart::runDirectory() const
     if ( directoryRadioString == "custom" )
         return DomUtil::readEntry(dom, "/kdevantproject/run/customdirectory");
 
-    int pos = DomMainProgram.findRev('/');
+    int pos = DomMainProgram.tqfindRev('/');
     if (pos != -1)
         return buildDirectory() + "/" + DomMainProgram.left(pos);
 
@@ -458,7 +458,7 @@ void AntProjectPart::ant(const TQString &target)
   if (!m_classPath.count() == 0)
     cp = "CLASSPATH="+m_classPath.join(":");
 
-  makeFrontend()->queueCommand(m_projectDirectory, cmd.arg(cp).arg(m_projectDirectory).arg(target).arg(m_antOptions.m_buildXML).arg(verb).arg(options));
+  makeFrontend()->queueCommand(m_projectDirectory, cmd.tqarg(cp).tqarg(m_projectDirectory).tqarg(target).tqarg(m_antOptions.m_buildXML).tqarg(verb).tqarg(options));
 }
 
 
@@ -529,11 +529,11 @@ void AntProjectPart::optionsAccepted()
   for (int i=0; i<m_antOptionsWidget->Properties->numRows(); ++i)
   {
     TQString key = m_antOptionsWidget->Properties->text(i,0);
-    m_antOptions.m_properties.replace(key, m_antOptionsWidget->Properties->text(i,1));
+    m_antOptions.m_properties.tqreplace(key, m_antOptionsWidget->Properties->text(i,1));
     kdDebug() << "PROP: " << key << "  = " << m_antOptionsWidget->Properties->text(i,1);
 
     TQCheckTableItem *item =(TQCheckTableItem*) m_antOptionsWidget->Properties->item(i,0);
-    m_antOptions.m_defineProperties.replace(key, item->isChecked());
+    m_antOptions.m_defineProperties.tqreplace(key, item->isChecked());
   }
 
   m_classPath = m_classPathWidget->ClassPath->items();
@@ -554,7 +554,7 @@ void AntProjectPart::contextMenu(TQPopupMenu *popup, const Context *context)
     return;
 
   m_contextFileName = url.fileName();
-  bool inProject = project()->allFiles().contains(m_contextFileName.mid ( project()->projectDirectory().length() + 1 ) );
+  bool inProject = project()->allFiles().tqcontains(m_contextFileName.mid ( project()->projectDirectory().length() + 1 ) );
   TQString popupstr = TQFileInfo(m_contextFileName).fileName();
   if (m_contextFileName.startsWith(projectDirectory()+ "/"))
     m_contextFileName.remove(0, projectDirectory().length()+1);
@@ -562,15 +562,15 @@ void AntProjectPart::contextMenu(TQPopupMenu *popup, const Context *context)
   popup->insertSeparator();
   if (inProject)
   {
-    int id = popup->insertItem( i18n("Remove %1 From Project").arg(popupstr),
+    int id = popup->insertItem( i18n("Remove %1 From Project").tqarg(popupstr),
                        this, TQT_SLOT(slotRemoveFromProject()) );
-    popup->setWhatsThis(id, i18n("<b>Remove from project</b><p>Removes current file from the project."));
+    popup->tqsetWhatsThis(id, i18n("<b>Remove from project</b><p>Removes current file from the project."));
   }
   else
   {
-    int id = popup->insertItem( i18n("Add %1 to Project").arg(popupstr),
+    int id = popup->insertItem( i18n("Add %1 to Project").tqarg(popupstr),
                        this, TQT_SLOT(slotAddToProject()) );
-    popup->setWhatsThis(id, i18n("<b>Add to project</b><p>Adds current file from the project."));
+    popup->tqsetWhatsThis(id, i18n("<b>Add to project</b><p>Adds current file from the project."));
   }
 }
 
diff --git a/buildtools/ant/antprojectpart.h b/buildtools/ant/antprojectpart.h
index 87cbb6dd..411579e2 100644
--- a/buildtools/ant/antprojectpart.h
+++ b/buildtools/ant/antprojectpart.h
@@ -43,10 +43,11 @@ public:
 class AntProjectPart : public KDevBuildTool
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 	  
-  AntProjectPart(TQObject *parent, const char *name, const TQStringList &args);
+  AntProjectPart(TQObject *tqparent, const char *name, const TQStringList &args);
   ~AntProjectPart();
     TQStringList distFiles() const;
 
diff --git a/buildtools/ant/classpathwidget.ui b/buildtools/ant/classpathwidget.ui
index 8bfde971..52ef6fc5 100644
--- a/buildtools/ant/classpathwidget.ui
+++ b/buildtools/ant/classpathwidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>ClassPathWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ClassPathWidget</cstring>
     </property>
@@ -30,8 +30,8 @@
     <include location="global" impldecl="in implementation">keditlistbox.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>keditlistbox.h</includehint>
     <includehint>klineedit.h</includehint>