From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 14 Jun 2011 16:45:05 +0000
Subject: 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
---
 editors/editor-chooser/editchooser.ui           | 26 ++++++++++++-------------
 editors/editor-chooser/editorchooser_part.cpp   |  4 ++--
 editors/editor-chooser/editorchooser_part.h     |  3 ++-
 editors/editor-chooser/editorchooser_widget.cpp |  4 ++--
 editors/editor-chooser/editorchooser_widget.h   |  3 ++-
 5 files changed, 21 insertions(+), 19 deletions(-)

(limited to 'editors')

diff --git a/editors/editor-chooser/editchooser.ui b/editors/editor-chooser/editchooser.ui
index 66f46b59..2e2139d7 100644
--- a/editors/editor-chooser/editchooser.ui
+++ b/editors/editor-chooser/editchooser.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>EditChooser</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>EditChooser</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -27,12 +27,12 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QComboBox" row="0" column="0">
+                <widget class="TQComboBox" row="0" column="0">
                     <property name="name">
                         <cstring>EditorPart</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -43,7 +43,7 @@ already open files.</string>
                 </widget>
             </grid>
         </widget>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>external_changes_group</cstring>
             </property>
@@ -60,7 +60,7 @@ already open files.</string>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>nothing</cstring>
                     </property>
@@ -71,7 +71,7 @@ already open files.</string>
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>alert</cstring>
                     </property>
@@ -82,7 +82,7 @@ already open files.</string>
                         <string>&amp;Alert the user</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>reload</cstring>
                     </property>
@@ -102,7 +102,7 @@ already open files.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>
@@ -122,9 +122,9 @@ already open files.</string>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>slotEditPartChanged(const QString &amp;)</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/editors/editor-chooser/editorchooser_part.cpp b/editors/editor-chooser/editorchooser_part.cpp
index 4dffa96d..ca210b95 100644
--- a/editors/editor-chooser/editorchooser_part.cpp
+++ b/editors/editor-chooser/editorchooser_part.cpp
@@ -16,8 +16,8 @@ typedef KDevGenericFactory<EditorChooserPart> EditorChooserFactory;
 static const KDevPluginInfo data("kdeveditorchooser");
 K_EXPORT_COMPONENT_FACTORY( libkdeveditorchooser, EditorChooserFactory( data ) )
 
-EditorChooserPart::EditorChooserPart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevPlugin(&data, parent, name ? name : "EditorChooserPart")
+EditorChooserPart::EditorChooserPart(TQObject *tqparent, const char *name, const TQStringList &)
+  : KDevPlugin(&data, tqparent, name ? name : "EditorChooserPart")
 {
   setInstance(EditorChooserFactory::instance());
 
diff --git a/editors/editor-chooser/editorchooser_part.h b/editors/editor-chooser/editorchooser_part.h
index 810e1066..ebf7ed48 100644
--- a/editors/editor-chooser/editorchooser_part.h
+++ b/editors/editor-chooser/editorchooser_part.h
@@ -16,10 +16,11 @@ class KDialogBase;
 class EditorChooserPart : public KDevPlugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
    
-  EditorChooserPart(TQObject *parent, const char *name, const TQStringList &);
+  EditorChooserPart(TQObject *tqparent, const char *name, const TQStringList &);
   ~EditorChooserPart();
 
   
diff --git a/editors/editor-chooser/editorchooser_widget.cpp b/editors/editor-chooser/editorchooser_widget.cpp
index 3a8a3584..25bbb10e 100644
--- a/editors/editor-chooser/editorchooser_widget.cpp
+++ b/editors/editor-chooser/editorchooser_widget.cpp
@@ -12,8 +12,8 @@
 #include "editorchooser_widget.h"
 
 
-EditorChooserWidget::EditorChooserWidget(TQWidget *parent, const char *name)
-        : EditChooser(parent, name)
+EditorChooserWidget::EditorChooserWidget(TQWidget *tqparent, const char *name)
+        : EditChooser(tqparent, name)
 {
     // ask the trader which editors he has to offer
     m_offers = KTrader::self()->query("text/plain", "'KTextEditor/Document' in ServiceTypes");
diff --git a/editors/editor-chooser/editorchooser_widget.h b/editors/editor-chooser/editorchooser_widget.h
index 75880af7..471eb3db 100644
--- a/editors/editor-chooser/editorchooser_widget.h
+++ b/editors/editor-chooser/editorchooser_widget.h
@@ -11,10 +11,11 @@
 class EditorChooserWidget : public EditChooser
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    EditorChooserWidget(TQWidget *parent=0, const char *name=0);
+    EditorChooserWidget(TQWidget *tqparent=0, const char *name=0);
 
 public slots:
     virtual void slotEditPartChanged(const TQString &);
-- 
cgit v1.2.3