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
---
 embedded/visualboyadvance/vbaconfigwidget.cpp      |  2 +-
 embedded/visualboyadvance/vbaconfigwidget.h        |  3 +-
 embedded/visualboyadvance/vbaconfigwidgetbase.ui   | 50 +++++++++++-----------
 .../visualboyadvance/visualboyadvance_part.cpp     |  4 +-
 embedded/visualboyadvance/visualboyadvance_part.h  |  3 +-
 5 files changed, 32 insertions(+), 30 deletions(-)

(limited to 'embedded')

diff --git a/embedded/visualboyadvance/vbaconfigwidget.cpp b/embedded/visualboyadvance/vbaconfigwidget.cpp
index a89a397f..b9497dfe 100644
--- a/embedded/visualboyadvance/vbaconfigwidget.cpp
+++ b/embedded/visualboyadvance/vbaconfigwidget.cpp
@@ -30,7 +30,7 @@
 
 using namespace VisualBoyAdvance;
 
-VBAConfigWidget::VBAConfigWidget(VisualBoyAdvancePart* part,TQWidget *parent, const char *name ) : VBAConfigWidgetBase(parent,name) {
+VBAConfigWidget::VBAConfigWidget(VisualBoyAdvancePart* part,TQWidget *tqparent, const char *name ) : VBAConfigWidgetBase(tqparent,name) {
   m_part = part;
   TQDomDocument &doc = *m_part->projectDom();
   // read 
diff --git a/embedded/visualboyadvance/vbaconfigwidget.h b/embedded/visualboyadvance/vbaconfigwidget.h
index eb0bd8ea..08735172 100644
--- a/embedded/visualboyadvance/vbaconfigwidget.h
+++ b/embedded/visualboyadvance/vbaconfigwidget.h
@@ -29,8 +29,9 @@ namespace VisualBoyAdvance {
 
 class VBAConfigWidget : public VBAConfigWidgetBase  {
    Q_OBJECT
+  TQ_OBJECT
 public: 
-	VBAConfigWidget(VisualBoyAdvancePart* part,TQWidget *parent=0, const char *name=0);
+	VBAConfigWidget(VisualBoyAdvancePart* part,TQWidget *tqparent=0, const char *name=0);
 	~VBAConfigWidget();
 public slots:
     void accept();
diff --git a/embedded/visualboyadvance/vbaconfigwidgetbase.ui b/embedded/visualboyadvance/vbaconfigwidgetbase.ui
index fb24e2d7..b65fe38b 100644
--- a/embedded/visualboyadvance/vbaconfigwidgetbase.ui
+++ b/embedded/visualboyadvance/vbaconfigwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>VBAConfigWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>VBAConfigWigdet</cstring>
     </property>
@@ -17,12 +17,12 @@
             <cstring>unnamed</cstring>
         </property>
 
-        <widget class="QLineEdit" row="1" column="2" rowspan="1" colspan="2">
+        <widget class="TQLineEdit" row="1" column="2" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>binaryEdit</cstring>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="2" column="0" rowspan="3" colspan="1">
+        <widget class="TQButtonGroup" row="2" column="0" rowspan="3" colspan="1">
             <property name="name">
                 <cstring>ButtonGroup3</cstring>
             </property>
@@ -42,7 +42,7 @@
                     <cstring>unnamed</cstring>
                 </property>
 
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>normalModeButton</cstring>
                     </property>
@@ -50,7 +50,7 @@
                         <string>Normal mode</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>tvModeButton</cstring>
                     </property>
@@ -58,7 +58,7 @@
                         <string>TV mode</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>salModeButton</cstring>
                     </property>
@@ -66,7 +66,7 @@
                         <string>2xSaI</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>superSalModeButton</cstring>
                     </property>
@@ -74,7 +74,7 @@
                         <string>Super 2xSal</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>superEagleModeButton</cstring>
                     </property>
@@ -84,7 +84,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -92,12 +92,12 @@
                 <string>GBA binary:</string>
             </property>
         </widget>
-        <widget class="QLineEdit" row="0" column="2" rowspan="1" colspan="2">
+        <widget class="TQLineEdit" row="0" column="2" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>emuPathEdit</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="5" column="0">
+        <widget class="TQLabel" row="5" column="0">
             <property name="name">
                 <cstring>TextLabel4</cstring>
             </property>
@@ -105,7 +105,7 @@
                 <string>Additional parameters:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>TextLabel3</cstring>
             </property>
@@ -113,7 +113,7 @@
                 <string>VisualBoy Advance (emulator):</string>
             </property>
         </widget>
-        <widget class="QToolButton" row="0" column="4">
+        <widget class="TQToolButton" row="0" column="4">
             <property name="name">
                 <cstring>emuPathButton</cstring>
             </property>
@@ -125,7 +125,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>22</width>
                     <height>0</height>
@@ -135,7 +135,7 @@
                 <string>...</string>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="2" column="1" rowspan="3" colspan="2">
+        <widget class="TQButtonGroup" row="2" column="1" rowspan="3" colspan="2">
             <property name="name">
                 <cstring>ButtonGroup4</cstring>
             </property>
@@ -147,7 +147,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>120</width>
                     <height>0</height>
@@ -161,7 +161,7 @@
                     <cstring>unnamed</cstring>
                 </property>
 
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>scaling1Button</cstring>
                     </property>
@@ -169,7 +169,7 @@
                         <string>1x</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>scaling2Button</cstring>
                     </property>
@@ -177,7 +177,7 @@
                         <string>2x</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>scaling3Button</cstring>
                     </property>
@@ -185,7 +185,7 @@
                         <string>3x</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>scaling4Button</cstring>
                     </property>
@@ -195,7 +195,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QCheckBox" row="2" column="3">
+        <widget class="TQCheckBox" row="2" column="3">
             <property name="name">
                 <cstring>fullscreenCheckBox</cstring>
             </property>
@@ -203,7 +203,7 @@
                 <string>Full screen</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="3" column="3">
+        <widget class="TQCheckBox" row="3" column="3">
             <property name="name">
                 <cstring>terminalCheckBox</cstring>
             </property>
@@ -222,7 +222,7 @@
                 <enum>Expanding</enum>
             </property>
         </spacer>
-        <widget class="QLineEdit" row="5" column="1" rowspan="1" colspan="3">
+        <widget class="TQLineEdit" row="5" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>addOptionsEdit</cstring>
             </property>
@@ -243,7 +243,7 @@
 <includes>
     <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"/>
 
 </UI>
diff --git a/embedded/visualboyadvance/visualboyadvance_part.cpp b/embedded/visualboyadvance/visualboyadvance_part.cpp
index da7acb88..fd8e9ad8 100644
--- a/embedded/visualboyadvance/visualboyadvance_part.cpp
+++ b/embedded/visualboyadvance/visualboyadvance_part.cpp
@@ -23,8 +23,8 @@ typedef KDevGenericFactory<VisualBoyAdvancePart> VisualBoyAdvanceFactory;
 static const KDevPluginInfo data("kdevvisualboyadvance");
 K_EXPORT_COMPONENT_FACTORY( libkdevvisualboyadvance, VisualBoyAdvanceFactory( data ) )
   
-VisualBoyAdvancePart::VisualBoyAdvancePart(TQObject *parent, const char *name, const TQStringList &)
-  : KDevPlugin(&data, parent, name){
+VisualBoyAdvancePart::VisualBoyAdvancePart(TQObject *tqparent, const char *name, const TQStringList &)
+  : KDevPlugin(&data, tqparent, name){
   setInstance(VisualBoyAdvanceFactory::instance());
 
   setXMLFile("kdevpart_visualboyadvance.rc");
diff --git a/embedded/visualboyadvance/visualboyadvance_part.h b/embedded/visualboyadvance/visualboyadvance_part.h
index bb231f0d..8618a5a3 100644
--- a/embedded/visualboyadvance/visualboyadvance_part.h
+++ b/embedded/visualboyadvance/visualboyadvance_part.h
@@ -14,10 +14,11 @@ namespace VisualBoyAdvance {
   class VisualBoyAdvancePart : public KDevPlugin
     {
       Q_OBJECT
+  TQ_OBJECT
 	
 	public:
       
-      VisualBoyAdvancePart(TQObject *parent, const char *name, const TQStringList &);
+      VisualBoyAdvancePart(TQObject *tqparent, const char *name, const TQStringList &);
       ~VisualBoyAdvancePart();
       private slots:
 	void slotExecute();
-- 
cgit v1.2.1