Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

5 files changed, 68 insertions, 68 deletions

diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index 792951aec..8239d2997 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -499,7 +499,7 @@ void KArtsModule::updateWidgets()
 	if (item >= 0)
 	{
 		audioIO = audioIOList.at(item)->name;
-		bool jack = (audioIO == TQString::fromLatin1("jack"));
+		bool jack = (audioIO == TQString::tqfromLatin1("jack"));
 		if(jack)
 		{
 			customRate->setChecked(false);
@@ -620,39 +620,39 @@ TQString KArtsModule::createArgs(bool netTrans,
 	TQString args;
 
 	if(fragmentCount)
-		args += TQString::fromLatin1(" -F %1").arg(fragmentCount);
+		args += TQString::tqfromLatin1(" -F %1").arg(fragmentCount);
 
 	if(fragmentSize)
-		args += TQString::fromLatin1(" -S %1").arg(fragmentSize);
+		args += TQString::tqfromLatin1(" -S %1").arg(fragmentSize);
 
 	if (!audioIO.isEmpty())
-		args += TQString::fromLatin1(" -a %1").arg(audioIO);
+		args += TQString::tqfromLatin1(" -a %1").arg(audioIO);
 
 	if (duplex)
-		args += TQString::fromLatin1(" -d");
+		args += TQString::tqfromLatin1(" -d");
 
 	if (netTrans)
-		args += TQString::fromLatin1(" -n");
+		args += TQString::tqfromLatin1(" -n");
 
 	if (!deviceName.isEmpty())
-		args += TQString::fromLatin1(" -D ") + deviceName;
+		args += TQString::tqfromLatin1(" -D ") + deviceName;
 
 	if (rate)
-		args += TQString::fromLatin1(" -r %1").arg(rate);
+		args += TQString::tqfromLatin1(" -r %1").arg(rate);
 
 	if (bits)
-		args += TQString::fromLatin1(" -b %1").arg(bits);
+		args += TQString::tqfromLatin1(" -b %1").arg(bits);
 
 	if (autoSuspend && suspendTime)
-		args += TQString::fromLatin1(" -s %1").arg(suspendTime);
+		args += TQString::tqfromLatin1(" -s %1").arg(suspendTime);
 
 	if (!addOptions.isEmpty())
 		args += TQChar(' ') + addOptions;
 
-	args += TQString::fromLatin1(" -m artsmessage");
-	args += TQString::fromLatin1(" -c drkonqi");
-	args += TQString::fromLatin1(" -l 3");
-	args += TQString::fromLatin1(" -f");
+	args += TQString::tqfromLatin1(" -m artsmessage");
+	args += TQString::tqfromLatin1(" -c drkonqi");
+	args += TQString::tqfromLatin1(" -l 3");
+	args += TQString::tqfromLatin1(" -f");
 
 	return args;
 }
diff --git a/kcontrol/arts/generaltab.ui b/kcontrol/arts/generaltab.ui
index 5b7ba7f79..f0d42dd8a 100644
--- a/kcontrol/arts/generaltab.ui
+++ b/kcontrol/arts/generaltab.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>generalTab</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>generalTab</cstring>
     </property>
@@ -12,7 +12,7 @@
             <height>613</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>450</height>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>startServer</cstring>
             </property>
@@ -42,7 +42,7 @@
 Recommended if you want sound.</string>
             </property>
         </widget>
-        <widget class="QFrame">
+        <widget class="TQFrame">
             <property name="name">
                 <cstring>frame3</cstring>
             </property>
@@ -53,7 +53,7 @@ Recommended if you want sound.</string>
                 <enum>Sunken</enum>
             </property>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>networkedSoundGroupBox</cstring>
             </property>
@@ -75,7 +75,7 @@ Recommended if you want sound.</string>
                         <string>&lt;i&gt;Enable this option if you want to play sound on a remote computer or you want to be able to control sound on this system from another computer.&lt;/i&gt;</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>networkTransparent</cstring>
                     </property>
@@ -88,7 +88,7 @@ Recommended if you want sound.</string>
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>realtimeGroupBox</cstring>
             </property>
@@ -107,7 +107,7 @@ Recommended if you want sound.</string>
                         <string>&lt;i&gt;If your sound is skipping during playback, enable running with highest possible priority. Increasing your sound buffer might also help.&lt;/i&gt;</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>startRealtime</cstring>
                     </property>
@@ -121,7 +121,7 @@ Recommended if you want sound.</string>
                         <string>On systems which support realtime scheduling, if you have sufficient permissions, this option will enable a very high priority for processing sound requests.</string>
                     </property>
                 </widget>
-                <widget class="QSlider" row="2" column="1">
+                <widget class="TQSlider" row="2" column="1">
                     <property name="name">
                         <cstring>latencySlider</cstring>
                     </property>
@@ -144,7 +144,7 @@ Recommended if you want sound.</string>
                         <number>50</number>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>textLabel5</cstring>
                     </property>
@@ -155,7 +155,7 @@ Recommended if you want sound.</string>
                         <cstring>latencySlider</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="1">
+                <widget class="TQLabel" row="3" column="1">
                     <property name="name">
                         <cstring>latencyLabel</cstring>
                     </property>
@@ -165,7 +165,7 @@ Recommended if you want sound.</string>
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>autoSuspendGroupBox</cstring>
             </property>
@@ -184,7 +184,7 @@ Recommended if you want sound.</string>
                         <string>&lt;i&gt;The KDE sound system takes exclusive control over your audio hardware, blocking programs that may wish to use it directly. If the KDE sound system sits idle it can give up this exclusive control.&lt;/i&gt;</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>layout7</cstring>
                     </property>
@@ -192,7 +192,7 @@ Recommended if you want sound.</string>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>autoSuspend</cstring>
                             </property>
@@ -227,7 +227,7 @@ Recommended if you want sound.</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>173</width>
                                     <height>20</height>
@@ -238,7 +238,7 @@ Recommended if you want sound.</string>
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout3</cstring>
             </property>
@@ -256,14 +256,14 @@ Recommended if you want sound.</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>testSound</cstring>
                     </property>
@@ -289,7 +289,7 @@ Recommended if you want sound.</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -308,7 +308,7 @@ Recommended if you want sound.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
diff --git a/kcontrol/arts/hardwaretab.ui b/kcontrol/arts/hardwaretab.ui
index c11f19962..68ed5916f 100644
--- a/kcontrol/arts/hardwaretab.ui
+++ b/kcontrol/arts/hardwaretab.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>hardwareTab</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>hardwareTab</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox4</cstring>
             </property>
@@ -33,7 +33,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>layout57</cstring>
                     </property>
@@ -41,7 +41,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel3_2</cstring>
                             </property>
@@ -60,7 +60,7 @@
                                 <cstring>audioIO</cstring>
                             </property>
                         </widget>
-                        <widget class="QComboBox">
+                        <widget class="TQComboBox">
                             <property name="name">
                                 <cstring>audioIO</cstring>
                             </property>
@@ -75,7 +75,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
+                <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>layout31</cstring>
                     </property>
@@ -83,7 +83,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>fullDuplex</cstring>
                             </property>
@@ -99,7 +99,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QCheckBox" row="5" column="0">
+                <widget class="TQCheckBox" row="5" column="0">
                     <property name="name">
                         <cstring>customOptions</cstring>
                     </property>
@@ -107,7 +107,7 @@
                         <string>Use other custom &amp;options:</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="4" column="0">
+                <widget class="TQCheckBox" row="4" column="0">
                     <property name="name">
                         <cstring>customDevice</cstring>
                     </property>
@@ -115,7 +115,7 @@
                         <string>Override &amp;device location:</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
+                <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>layout4</cstring>
                     </property>
@@ -133,14 +133,14 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel2</cstring>
                             </property>
@@ -151,7 +151,7 @@
                                 <cstring>soundQuality</cstring>
                             </property>
                         </widget>
-                        <widget class="QComboBox">
+                        <widget class="TQComboBox">
                             <item>
                                 <property name="text">
                                     <string>Default</string>
@@ -189,7 +189,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>0</width>
                                     <height>20</height>
@@ -198,7 +198,7 @@
                         </spacer>
                     </hbox>
                 </widget>
-                <widget class="QCheckBox" row="2" column="0">
+                <widget class="TQCheckBox" row="2" column="0">
                     <property name="name">
                         <cstring>customRate</cstring>
                     </property>
@@ -206,7 +206,7 @@
                         <string>Use &amp;custom sampling rate:</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="2" column="1">
+                <widget class="TQLayoutWidget" row="2" column="1">
                     <property name="name">
                         <cstring>layout6</cstring>
                     </property>
@@ -214,7 +214,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QSpinBox">
+                        <widget class="TQSpinBox">
                             <property name="name">
                                 <cstring>samplingRate</cstring>
                             </property>
@@ -252,7 +252,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>0</width>
                                     <height>20</height>
@@ -261,7 +261,7 @@
                         </spacer>
                     </hbox>
                 </widget>
-                <widget class="QLineEdit" row="5" column="1">
+                <widget class="TQLineEdit" row="5" column="1">
                     <property name="name">
                         <cstring>addOptions</cstring>
                     </property>
@@ -269,7 +269,7 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="4" column="1">
+                <widget class="TQLineEdit" row="4" column="1">
                     <property name="name">
                         <cstring>deviceName</cstring>
                     </property>
@@ -282,7 +282,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox3</cstring>
             </property>
@@ -293,7 +293,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox" row="1" column="0">
+                <widget class="TQCheckBox" row="1" column="0">
                     <property name="name">
                         <cstring>midiUseMapper</cstring>
                     </property>
@@ -301,7 +301,7 @@
                         <string>Use MIDI ma&amp;pper:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel4</cstring>
                     </property>
@@ -312,7 +312,7 @@
                         <cstring>deviceName</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="0" column="1">
+                <widget class="TQComboBox" row="0" column="1">
                     <property name="name">
                         <cstring>midiDevice</cstring>
                     </property>
@@ -345,7 +345,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>60</height>
diff --git a/kcontrol/arts/krichtextlabel.cpp b/kcontrol/arts/krichtextlabel.cpp
index 5c7618a1b..d15d344a7 100644
--- a/kcontrol/arts/krichtextlabel.cpp
+++ b/kcontrol/arts/krichtextlabel.cpp
@@ -40,15 +40,15 @@ static TQString qrichtextify( const TQString& text )
 
 KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
-  m_defaultWidth = QMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
-  setAlignment( Qt::WordBreak );
+  m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
+  tqsetAlignment( TQt::WordBreak );
   setText(text);
 }
 
 KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
-  m_defaultWidth = QMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
-  setAlignment( Qt::WordBreak );
+  m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
+  tqsetAlignment( TQt::WordBreak );
 }
 
 void KRichTextLabel::setDefaultWidth(int defaultWidth)
@@ -62,7 +62,7 @@ TQSizePolicy KRichTextLabel::sizePolicy() const
   return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false);
 }
 
-TQSize KRichTextLabel::minimumSizeHint() const
+TQSize KRichTextLabel::tqminimumSizeHint() const
 {
   TQString qt_text = qrichtextify( text() );
   int pref_width = 0;
@@ -97,9 +97,9 @@ TQSize KRichTextLabel::minimumSizeHint() const
   return TQSize(pref_width, rt.height());
 }
 
-TQSize KRichTextLabel::sizeHint() const
+TQSize KRichTextLabel::tqsizeHint() const
 {
-  return minimumSizeHint();
+  return tqminimumSizeHint();
 }
 
 void KRichTextLabel::setText( const TQString &text ) {
diff --git a/kcontrol/arts/krichtextlabel.h b/kcontrol/arts/krichtextlabel.h
index 40ead0375..6f6ef1343 100644
--- a/kcontrol/arts/krichtextlabel.h
+++ b/kcontrol/arts/krichtextlabel.h
@@ -45,8 +45,8 @@ public:
   int defaultWidth() const { return m_defaultWidth; }
   void setDefaultWidth(int defaultWidth);
 
-  virtual TQSize minimumSizeHint() const;
-  virtual TQSize sizeHint() const;
+  virtual TQSize tqminimumSizeHint() const;
+  virtual TQSize tqsizeHint() const;
   TQSizePolicy sizePolicy() const;
 
 public slots: