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

4 files changed, 48 insertions, 48 deletions

diff --git a/kcontrol/privacy/kcmprivacydialog.ui b/kcontrol/privacy/kcmprivacydialog.ui
index df79e2ec1..003cf235f 100644
--- a/kcontrol/privacy/kcmprivacydialog.ui
+++ b/kcontrol/privacy/kcmprivacydialog.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>KCMPrivacyDialog</class>
 <author>Ralf Hoelzer</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KCMPrivacyDialog</cstring>
     </property>
@@ -43,7 +43,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QSplitter">
+        <widget class="TQSplitter">
             <property name="name">
                 <cstring>splitter1</cstring>
             </property>
@@ -79,13 +79,13 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="minimumSize">
+                <property name="tqminimumSize">
                     <size>
                         <width>0</width>
                         <height>50</height>
                     </size>
                 </property>
-                <property name="maximumSize">
+                <property name="tqmaximumSize">
                     <size>
                         <width>32767</width>
                         <height>200</height>
@@ -102,7 +102,7 @@
                 </property>
             </widget>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout1</cstring>
             </property>
@@ -110,17 +110,17 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>selectAllButton</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>80</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>32767</height>
@@ -130,17 +130,17 @@
                         <string>Select All</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>selectNoneButton</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>80</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>32767</height>
@@ -160,14 +160,14 @@
                     <property name="sizeType">
                         <enum>Maximum</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>80</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cleanupButton</cstring>
                     </property>
@@ -179,7 +179,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>32767</height>
diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp
index bbf5e088a..6df0d04f9 100644
--- a/kcontrol/privacy/kprivacymanager.cpp
+++ b/kcontrol/privacy/kprivacymanager.cpp
@@ -75,12 +75,12 @@ bool KPrivacyManager::clearThumbnails()
 
 bool KPrivacyManager::clearRunCommandHistory() const
 {
-  return kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", "" );
+  return kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", TQString("") );
 }
 
 bool KPrivacyManager::clearAllCookies() const
 {
-  return kapp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", "" );
+  return kapp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", TQString("") );
 }
 
 bool KPrivacyManager::clearSavedClipboardContents()
@@ -98,7 +98,7 @@ bool KPrivacyManager::clearSavedClipboardContents()
     return true;
   }
 
-  return kapp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", "" );
+  return kapp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", TQString("") );
 }
 
 bool KPrivacyManager::clearFormCompletion() const
@@ -123,7 +123,7 @@ bool KPrivacyManager::clearRecentDocuments() const
 
 bool KPrivacyManager::clearQuickStartMenu() const
 {
-  return kapp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", "" );
+  return kapp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", TQString("") );
 }
 
 bool KPrivacyManager::clearWebHistory()
@@ -138,7 +138,7 @@ bool KPrivacyManager::clearWebHistory()
   }
 
   return kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
-                                   "notifyClear(TQCString)", "" );
+                                   "notifyClear(TQCString)", TQString("") );
 }
 
 bool KPrivacyManager::clearFavIcons()
@@ -161,7 +161,7 @@ bool KPrivacyManager::isApplicationRegistered(const TQString &appName)
   QCStringList regApps = kapp->dcopClient()->registeredApplications();
 
   for ( QCStringList::Iterator it = regApps.begin(); it != regApps.end(); ++it )
-    if((*it).find(appName.latin1()) != -1) return true;
+    if((*it).tqfind(appName.latin1()) != -1) return true;
 
   return false;
 }
diff --git a/kcontrol/privacy/kprivacymanager.h b/kcontrol/privacy/kprivacymanager.h
index 6d950c903..11d4941fe 100644
--- a/kcontrol/privacy/kprivacymanager.h
+++ b/kcontrol/privacy/kprivacymanager.h
@@ -27,7 +27,7 @@
 @author Ralf Hoelzer
 */
 
-class KPrivacyManager : public QObject
+class KPrivacyManager : public TQObject
 {
 Q_OBJECT
 public:
diff --git a/kcontrol/privacy/kprivacysettings.ui b/kcontrol/privacy/kprivacysettings.ui
index 93afe5dff..ddcc93ec9 100644
--- a/kcontrol/privacy/kprivacysettings.ui
+++ b/kcontrol/privacy/kprivacysettings.ui
@@ -5,7 +5,7 @@ Licensed under the terms of the LGPL.
 Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
 </comment>
 <author>George Staikos &lt;[email protected]&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KPrivacySettings</cstring>
     </property>
@@ -38,7 +38,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -49,7 +49,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                 <cstring>_privacyLevel</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="0" column="1">
+        <widget class="TQComboBox" row="0" column="1">
             <item>
                 <property name="text">
                     <string>Low</string>
@@ -82,7 +82,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="6" column="0" rowspan="1" colspan="2">
+        <widget class="TQButtonGroup" row="6" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>buttonGroup1_2</cstring>
             </property>
@@ -93,7 +93,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -101,7 +101,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                         <string>Warn me when I visit a site that uses my financial or purchase information:</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>_warnFinancialMarketeer</cstring>
                     </property>
@@ -109,7 +109,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                         <string>For marketing or advertising purposes</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>_warnFinancialSpammer</cstring>
                     </property>
@@ -119,7 +119,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                 </widget>
             </vbox>
         </widget>
-        <widget class="QButtonGroup" row="5" column="0" rowspan="1" colspan="2">
+        <widget class="TQButtonGroup" row="5" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>buttonGroup1</cstring>
             </property>
@@ -130,7 +130,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel2_2</cstring>
                     </property>
@@ -138,7 +138,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                         <string>Warn me when I visit a site that uses my health or medical information: </string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>_warnHealthMarketeer</cstring>
                     </property>
@@ -146,7 +146,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                         <string>For marketing or advertising purposes</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>_warnHealthSpammer</cstring>
                     </property>
@@ -156,7 +156,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                 </widget>
             </vbox>
         </widget>
-        <widget class="QButtonGroup" row="7" column="0" rowspan="1" colspan="2">
+        <widget class="TQButtonGroup" row="7" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>buttonGroup1_2_2</cstring>
             </property>
@@ -167,7 +167,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel2_3</cstring>
                     </property>
@@ -175,7 +175,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                         <string>Warn me when I visit a site that uses my non-personally identifiable information:</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>_warnDemographicsBigBrother</cstring>
                     </property>
@@ -183,7 +183,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                         <string>To determine my interests, habits or general behavior</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>_warnDemographicsSpammer</cstring>
                     </property>
@@ -193,7 +193,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                 </widget>
             </vbox>
         </widget>
-        <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>_warnSpammers</cstring>
             </property>
@@ -201,7 +201,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                 <string>Warn me when I visit a site that shares my personal information with other companies</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>_warnShady</cstring>
             </property>
@@ -209,7 +209,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                 <string>Warn me when I visit a site that does not let me know what information they have about me</string>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="4" column="0" rowspan="1" colspan="2">
+        <widget class="TQButtonGroup" row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>buttonGroup4</cstring>
             </property>
@@ -220,7 +220,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <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>textLabel2_2_2</cstring>
                     </property>
@@ -228,7 +228,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                         <string>Warn me when I visit a site that may contact me about other products or services:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2">
+                <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>textLabel2_2_2_2</cstring>
                     </property>
@@ -236,7 +236,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                         <string>Warn me when I visit a site that may use my personal information to:</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>_warnPersonalHabits</cstring>
                     </property>
@@ -244,7 +244,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                         <string>Determine my habits, interests or general behavior</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="1" column="0">
+                <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
                         <cstring>layout1</cstring>
                     </property>
@@ -252,7 +252,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>_warnPersonalTelephone</cstring>
                             </property>
@@ -260,7 +260,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                                 <string>Via telephone</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>_warnPersonalMail</cstring>
                             </property>
@@ -270,7 +270,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QLayoutWidget" row="1" column="1">
+                <widget class="TQLayoutWidget" row="1" column="1">
                     <property name="name">
                         <cstring>layout3</cstring>
                     </property>
@@ -278,7 +278,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>_warnPersonalEmail</cstring>
                             </property>
@@ -286,7 +286,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                                 <string>Via email</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>_warnPersonalBigBrother</cstring>
                             </property>