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

diff --git a/parts/uimode/uichooser.ui b/parts/uimode/uichooser.ui
index 149a1db1..4a5a8c98 100644
--- a/parts/uimode/uichooser.ui
+++ b/parts/uimode/uichooser.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>UIChooser</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>UIChooser</cstring>
     </property>
@@ -22,15 +22,15 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QButtonGroup">
+                <widget class="TQButtonGroup">
                     <property name="name">
                         <cstring>TabModeGroup</cstring>
                     </property>
@@ -44,7 +44,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>AlwaysShowTabs</cstring>
                             </property>
@@ -55,7 +55,7 @@
                                 <bool>true</bool>
                             </property>
                         </widget>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>NeverShowTabs</cstring>
                             </property>
@@ -65,7 +65,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QButtonGroup">
+                <widget class="TQButtonGroup">
                     <property name="name">
                         <cstring>HoverCloseGroup</cstring>
                     </property>
@@ -82,7 +82,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>DoNotCloseOnHover</cstring>
                             </property>
@@ -93,7 +93,7 @@
                                 <bool>true</bool>
                             </property>
                         </widget>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>DoCloseOnHover</cstring>
                             </property>
@@ -105,15 +105,15 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QButtonGroup">
+                <widget class="TQButtonGroup">
                     <property name="name">
                         <cstring>IDEAlButtonGroup</cstring>
                     </property>
@@ -127,7 +127,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>IconsOnly</cstring>
                             </property>
@@ -135,7 +135,7 @@
                                 <string>Icons</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>TextOnly</cstring>
                             </property>
@@ -146,7 +146,7 @@
                                 <bool>true</bool>
                             </property>
                         </widget>
-                        <widget class="QRadioButton">
+                        <widget class="TQRadioButton">
                             <property name="name">
                                 <cstring>TextAndIcons</cstring>
                             </property>
@@ -156,7 +156,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QGroupBox">
+                <widget class="TQGroupBox">
                     <property name="name">
                         <cstring>TabbedBrowsingGroup</cstring>
                     </property>
@@ -170,7 +170,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QCheckBox" row="0" column="0">
+                        <widget class="TQCheckBox" row="0" column="0">
                             <property name="name">
                                 <cstring>OpenNewTabAfterCurrent</cstring>
                             </property>
@@ -178,7 +178,7 @@
                                 <string>Open &amp;new tab after current tab</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="1" column="0">
+                        <widget class="TQCheckBox" row="1" column="0">
                             <property name="name">
                                 <cstring>ShowTabIcons</cstring>
                             </property>
@@ -186,7 +186,7 @@
                                 <string>&amp;Show icons on document tabs</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="2" column="0">
+                        <widget class="TQCheckBox" row="2" column="0">
                             <property name="name">
                                 <cstring>ShowCloseTabsButton</cstring>
                             </property>
@@ -198,7 +198,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -213,7 +213,7 @@
             <property name="text">
                 <string>Note: Changes will take effect after KDevelop is restarted</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignCenter</set>
             </property>
         </widget>
@@ -242,9 +242,9 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">maybeEnableCloseOnHover(bool)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/parts/uimode/uichooser_part.cpp b/parts/uimode/uichooser_part.cpp
index 855f4daf..64a07b70 100644
--- a/parts/uimode/uichooser_part.cpp
+++ b/parts/uimode/uichooser_part.cpp
@@ -18,8 +18,8 @@ typedef KDevGenericFactory<UIChooserPart> UIChooserFactory;
 static const KDevPluginInfo data("kdevuichooser");
 K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( data ) )
 
-UIChooserPart::UIChooserPart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevPlugin( &data, parent, name ? name : "UIChooserPart")
+UIChooserPart::UIChooserPart(TQObject *tqparent, const char *name, const TQStringList &)
+  : KDevPlugin( &data, tqparent, name ? name : "UIChooserPart")
 {
 	setInstance(UIChooserFactory::instance());
 
diff --git a/parts/uimode/uichooser_part.h b/parts/uimode/uichooser_part.h
index 5f0826fa..1e48d35b 100644
--- a/parts/uimode/uichooser_part.h
+++ b/parts/uimode/uichooser_part.h
@@ -15,9 +15,10 @@ class ConfigWidgetProxy;
 class UIChooserPart : public KDevPlugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  UIChooserPart(TQObject *parent, const char *name, const TQStringList &);
+  UIChooserPart(TQObject *tqparent, const char *name, const TQStringList &);
   ~UIChooserPart();
   
 private slots:
diff --git a/parts/uimode/uichooser_widget.cpp b/parts/uimode/uichooser_widget.cpp
index 2fe6b919..064380e0 100644
--- a/parts/uimode/uichooser_widget.cpp
+++ b/parts/uimode/uichooser_widget.cpp
@@ -27,8 +27,8 @@
 #include "kdevmainwindow.h"
 #include "uichooser_widget.h"
 
-UIChooserWidget::UIChooserWidget( UIChooserPart * part, TQWidget *parent, const char *name)
-  : UIChooser(parent, name)
+UIChooserWidget::UIChooserWidget( UIChooserPart * part, TQWidget *tqparent, const char *name)
+  : UIChooser(tqparent, name)
   ,m_part(part), _lastMode(0L)
 {
   load();
diff --git a/parts/uimode/uichooser_widget.h b/parts/uimode/uichooser_widget.h
index e9f7a7ed..4901f1af 100644
--- a/parts/uimode/uichooser_widget.h
+++ b/parts/uimode/uichooser_widget.h
@@ -12,6 +12,7 @@ class UIChooserPart;
 class UIChooserWidget : public UIChooser
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -20,7 +21,7 @@ public:
     _NeverShowTabs          = 2
   };
 
-  UIChooserWidget( UIChooserPart * part, TQWidget *parent=0, const char *name=0 );
+  UIChooserWidget( UIChooserPart * part, TQWidget *tqparent=0, const char *name=0 );
 
 public slots:
   void accept();