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
---
 vcs/subversion/svn_mergeoptiondlgbase.ui | 42 ++++++++++++++++----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'vcs/subversion/svn_mergeoptiondlgbase.ui')

diff --git a/vcs/subversion/svn_mergeoptiondlgbase.ui b/vcs/subversion/svn_mergeoptiondlgbase.ui
index 0ad25c83..078e5b84 100644
--- a/vcs/subversion/svn_mergeoptiondlgbase.ui
+++ b/vcs/subversion/svn_mergeoptiondlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>SvnMergeOptionDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>SvnMergeOptionDialogBase</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -30,7 +30,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</cstring>
                     </property>
@@ -45,7 +45,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="3">
+        <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>buttonGroup2</cstring>
             </property>
@@ -72,7 +72,7 @@
                         <number>-1</number>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="3" column="0">
+                <widget class="TQRadioButton" row="3" column="0">
                     <property name="name">
                         <cstring>revnumbtn1</cstring>
                     </property>
@@ -83,7 +83,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="3" column="2">
+                <widget class="TQRadioButton" row="3" column="2">
                     <property name="name">
                         <cstring>revkindbtn1</cstring>
                     </property>
@@ -135,7 +135,7 @@
                         <cstring>src1</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4">
+                <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>textLabel3</cstring>
                     </property>
@@ -143,7 +143,7 @@
                         <string>Source URL or working path:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0" rowspan="1" colspan="4">
+                <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -153,7 +153,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="3">
+        <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>buttonGroup2_2</cstring>
             </property>
@@ -164,7 +164,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton" row="3" column="0">
+                <widget class="TQRadioButton" row="3" column="0">
                     <property name="name">
                         <cstring>revnumbtn2</cstring>
                     </property>
@@ -172,7 +172,7 @@
                         <string>Number:</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="3" column="2">
+                <widget class="TQRadioButton" row="3" column="2">
                     <property name="name">
                         <cstring>revkindbtn2</cstring>
                     </property>
@@ -188,7 +188,7 @@
                         <cstring>src2</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0" rowspan="1" colspan="4">
+                <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>textLabel2_2</cstring>
                     </property>
@@ -251,7 +251,7 @@
                         <number>-1</number>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4">
+                <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>textLabel3_2</cstring>
                     </property>
@@ -261,7 +261,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QPushButton" row="7" column="1">
+        <widget class="TQPushButton" row="7" column="1">
             <property name="name">
                 <cstring>okBtn</cstring>
             </property>
@@ -279,14 +279,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>171</width>
                     <height>31</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="7" column="2">
+        <widget class="TQPushButton" row="7" column="2">
             <property name="name">
                 <cstring>cancelBtn</cstring>
             </property>
@@ -294,7 +294,7 @@
                 <string>Cancel</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="3">
+        <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>forceCheck</cstring>
             </property>
@@ -302,7 +302,7 @@
                 <string>--force (Force to delete locally modified or unversioned items.)</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="3">
+        <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>nonRecurse</cstring>
             </property>
@@ -310,7 +310,7 @@
                 <string>--non-recursive</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="3">
+        <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>ignoreAncestryCheck</cstring>
             </property>
@@ -318,7 +318,7 @@
                 <string>--ignore-ancestry</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="3">
+        <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>dryRunCheck</cstring>
             </property>
@@ -351,7 +351,7 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
-- 
cgit v1.2.3