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, 68 insertions, 68 deletions

diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp
index b78a354be..92859de6c 100644
--- a/kcontrol/kthememanager/ktheme.cpp
+++ b/kcontrol/kthememanager/ktheme.cpp
@@ -48,7 +48,7 @@ KTheme::KTheme( TQWidget *parent, const TQString & xmlFile )
 {
     TQFile file( xmlFile );
     file.open( IO_ReadOnly );
-    m_dom.setContent( file.readAll() );
+    m_dom.setContent( TQByteArray(file.readAll()) );
     file.close();
 
     //kdDebug() << m_dom.toString( 2 ) << endl;
@@ -107,7 +107,7 @@ bool KTheme::load( const KURL & url )
     // create the DOM
     TQFile file( location + m_name + ".xml" );
     file.open( IO_ReadOnly );
-    m_dom.setContent( file.readAll() );
+    m_dom.setContent( TQByteArray(file.readAll()) );
     file.close();
 
     // remove the temp file
@@ -441,7 +441,7 @@ void KTheme::apply()
     DCOPClient *client = kapp->dcopClient();
     if ( !client->isAttached() )
         client->attach();
-    client->send("kdesktop", "KBackgroundIface", "configure()", "");
+    client->send("kdesktop", "KBackgroundIface", "configure()", TQString(""));
     // FIXME Xinerama
 
     // 3. Icons
@@ -469,14 +469,14 @@ void KTheme::apply()
                 iconConf->setGroup( "ToolbarIcons" );
 
             TQString iconName = iconSubElem.tagName();
-            if ( iconName.contains( "Color" ) )
+            if ( iconName.tqcontains( "Color" ) )
             {
                 TQColor iconColor = TQColor( iconSubElem.attribute( "rgb" ) );
                 iconConf->writeEntry( iconName, iconColor, true, true );
             }
-            else if ( iconName.contains( "Value" ) || iconName == "Size" )
+            else if ( iconName.tqcontains( "Value" ) || iconName == "Size" )
                 iconConf->writeEntry( iconName, iconSubElem.attribute( "value" ).toUInt(), true, true );
-            else if ( iconName.contains( "Effect" ) )
+            else if ( iconName.tqcontains( "Effect" ) )
                 iconConf->writeEntry( iconName, iconSubElem.attribute( "name" ), true, true );
             else
                 iconConf->writeEntry( iconName, static_cast<bool>( iconSubElem.attribute( "value" ).toUInt() ), true, true );
@@ -516,7 +516,7 @@ void KTheme::apply()
 
         soundConf.sync();
         kwinSoundConf.sync();
-        client->send("knotify", "", "reconfigure()", "");
+        client->send("knotify", "", "reconfigure()", TQString(""));
         // TODO signal kwin sounds change?
     }
 
@@ -593,7 +593,7 @@ void KTheme::apply()
         kwinConf.writeEntry( "BorderSize", getProperty( wmElem, "border", "size" ) );
 
         kwinConf.sync();
-        client->send( "kwin", "", "reconfigure()", "" );
+        client->send( "kwin", "", "reconfigure()", TQString("") );
     }
 
     // 8. Konqueror
@@ -607,7 +607,7 @@ void KTheme::apply()
         konqConf.writeEntry( "BgColor", TQColor( getProperty( konqElem, "bgcolor", "rgb" ) ) );
 
         konqConf.sync();
-        client->send("konqueror*", "KonquerorIface", "reparseConfiguration()", ""); // FIXME seems not to work :(
+        client->send("konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("")); // FIXME seems not to work :(
     }
 
     // 9. Kicker
@@ -635,7 +635,7 @@ void KTheme::apply()
         kickerConf.writeEntry( "ShowRightHideButton", static_cast<bool>( getProperty( panelElem, "showrighthidebutton", "value").toInt()));
 
         kickerConf.sync();
-        client->send("kicker", "Panel", "configure()", "");
+        client->send("kicker", "Panel", "configure()", TQString(""));
     }
 
     // 10. Widget style
@@ -720,7 +720,7 @@ TQString KTheme::getProperty( TQDomElement parent, const TQString & tag,
     else
     {
         kdWarning() << TQString( "No such property found: %1->%2->%3" )
-            .arg( parent.tagName() ).arg( tag ).arg( attr ) << endl;
+            .tqarg( parent.tagName() ).tqarg( tag ).tqarg( attr ) << endl;
         return TQString::null;
     }
 }
@@ -738,18 +738,18 @@ void KTheme::createIconElems( const TQString & group, const TQString & object,
               << "DisabledColor" << "DisabledColor2" << "DisabledEffect"
               << "DisabledSemiTransparent" << "DisabledValue";
     for ( TQStringList::ConstIterator it = elemNames.begin(); it != elemNames.end(); ++it ) {
-        if ( (*it).contains( "Color" ) )
+        if ( (*it).tqcontains( "Color" ) )
             createColorElem( *it, object, parent, cfg );
         else
         {
             TQDomElement tmpCol = m_dom.createElement( *it );
             tmpCol.setAttribute( "object", object );
 
-            if ( (*it).contains( "Value" ) || *it == "Size" )
+            if ( (*it).tqcontains( "Value" ) || *it == "Size" )
                 tmpCol.setAttribute( "value", cfg->readNumEntry( *it, 1 ) );
-            else if ( (*it).contains( "DisabledEffect" ) )
+            else if ( (*it).tqcontains( "DisabledEffect" ) )
                 tmpCol.setAttribute( "name", cfg->readEntry( *it, "togray" ) );
-	    else if ( (*it).contains( "Effect" ) )
+	    else if ( (*it).tqcontains( "Effect" ) )
                 tmpCol.setAttribute( "name", cfg->readEntry( *it, "none" ) );
             else
                 tmpCol.setAttribute( "value", cfg->readBoolEntry( *it, false ) );
@@ -832,7 +832,7 @@ TQString KTheme::processFilePath( const TQString & section, const TQString & pat
 TQString KTheme::unprocessFilePath( const TQString & section, TQString path )
 {
     if ( path.startsWith( "theme:/" ) )
-        return path.replace( TQRegExp( "^theme:/" ), m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/" );
+        return path.tqreplace( TQRegExp( "^theme:/" ), m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/" );
 
     if ( TQFile::exists( path ) )
         return path;
diff --git a/kcontrol/kthememanager/kthemedlg.ui b/kcontrol/kthememanager/kthemedlg.ui
index 4b46fdc26..9fa86c2c0 100644
--- a/kcontrol/kthememanager/kthemedlg.ui
+++ b/kcontrol/kthememanager/kthemedlg.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KThemeDlg</class>
 <author>Lukas Tinkl &lt;[email protected]&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KThemeDlg</cstring>
     </property>
@@ -28,7 +28,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>layout2</cstring>
             </property>
@@ -36,7 +36,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -60,7 +60,7 @@
                     <property name="sizeType">
                         <enum>MinimumExpanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>170</width>
                             <height>20</height>
@@ -86,7 +86,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
                 <cstring>layout1</cstring>
             </property>
@@ -94,7 +94,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="0" column="1" rowspan="4" colspan="1">
+                <widget class="TQLabel" row="0" column="1" rowspan="4" colspan="1">
                     <property name="name">
                         <cstring>lbPreview</cstring>
                     </property>
@@ -109,11 +109,11 @@
                     <property name="frameShape">
                         <enum>Box</enum>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="0">
+                <widget class="TQPushButton" row="2" column="0">
                     <property name="name">
                         <cstring>btnRemove</cstring>
                     </property>
@@ -121,7 +121,7 @@
                         <string>&amp;Remove Theme</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="3" column="0">
+                <widget class="TQPushButton" row="3" column="0">
                     <property name="name">
                         <cstring>btnCreate</cstring>
                     </property>
@@ -129,7 +129,7 @@
                         <string>Create &amp;New Theme...</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="0">
+                <widget class="TQPushButton" row="1" column="0">
                     <property name="name">
                         <cstring>btnInstall</cstring>
                     </property>
@@ -137,7 +137,7 @@
                         <string>&amp;Install New Theme...</string>
                     </property>
                 </widget>
-                <widget class="QListView" row="0" column="0">
+                <widget class="TQListView" row="0" column="0">
                     <column>
                         <property name="text">
                             <string>Theme</string>
@@ -183,7 +183,7 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>textLabel1_2</cstring>
             </property>
@@ -191,7 +191,7 @@
                 <string>Customize your theme:</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="4" column="0">
+        <widget class="TQLayoutWidget" row="4" column="0">
             <property name="name">
                 <cstring>layout4</cstring>
             </property>
@@ -199,7 +199,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>btnBackground</cstring>
                     </property>
@@ -211,13 +211,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>80</width>
                             <height>60</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>60</height>
@@ -239,7 +239,7 @@
                         <string>Customize the desktop background</string>
                     </property>
                 </widget>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>btnColors</cstring>
                     </property>
@@ -251,13 +251,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>80</width>
                             <height>60</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>60</height>
@@ -279,7 +279,7 @@
                         <string>Customize colors</string>
                     </property>
                 </widget>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>btnStyle</cstring>
                     </property>
@@ -291,13 +291,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>80</width>
                             <height>60</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>60</height>
@@ -319,7 +319,7 @@
                         <string>Customize the widget style</string>
                     </property>
                 </widget>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>btnIcons</cstring>
                     </property>
@@ -331,13 +331,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>80</width>
                             <height>60</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>60</height>
@@ -359,7 +359,7 @@
                         <string>Customize the icon theme</string>
                     </property>
                 </widget>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>btnFonts</cstring>
                     </property>
@@ -371,13 +371,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>80</width>
                             <height>60</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>60</height>
@@ -399,7 +399,7 @@
                         <string>Customize the font theme</string>
                     </property>
                 </widget>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>btnSaver</cstring>
                     </property>
@@ -411,13 +411,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>80</width>
                             <height>60</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>60</height>
@@ -502,15 +502,15 @@
 <includes>
     <include location="local" impldecl="in implementation">kthemedlg.ui.h</include>
 </includes>
-<slots>
-    <slot specifier="non virtual">startKonqui( const QString &amp; url )</slot>
+<Q_SLOTS>
+    <slot specifier="non virtual">startKonqui( const TQString &amp; url )</slot>
     <slot specifier="non virtual">startBackground()</slot>
     <slot specifier="non virtual">startColors()</slot>
     <slot specifier="non virtual">startStyle()</slot>
     <slot specifier="non virtual">startIcons()</slot>
     <slot specifier="non virtual">startFonts()</slot>
     <slot specifier="non virtual">startSaver()</slot>
-</slots>
+</Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurllabel.h</includehint>
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index 2668bd87c..111384bd5 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -136,7 +136,7 @@ void kthememanager::load(bool useDefaults)
 
     conf.setGroup( "General" );
     TQString themeName = conf.readEntry( "CurrentTheme" );
-    TQListViewItem * cur =  dlg->lvThemes->findItem( themeName, 0 );
+    TQListViewItem * cur =  dlg->lvThemes->tqfindItem( themeName, 0 );
     if ( cur )
     {
         dlg->lvThemes->setSelected( cur, true );
@@ -264,7 +264,7 @@ void kthememanager::slotRemoveTheme()
 
 bool kthememanager::themeExist(const TQString &_themeName)
 {
-    return ( dlg->lvThemes->findItem( _themeName, 0 )!=0 );
+    return ( dlg->lvThemes->tqfindItem( _themeName, 0 )!=0 );
 }
 
 void kthememanager::slotCreateTheme()
@@ -298,7 +298,7 @@ void kthememanager::slotCreateTheme()
             m_theme->setAuthor( dlg.getAuthor() );
             m_theme->setEmail( dlg.getEmail() );
             m_theme->setHomepage( dlg.getHomepage() );
-            m_theme->setComment( dlg.getComment().replace( "\n", "" ) );
+            m_theme->setComment( dlg.getComment().tqreplace( "\n", "" ) );
             m_theme->setVersion( dlg.getVersion() );
 
             TQString result = m_theme->createYourself( true );
@@ -407,7 +407,7 @@ void kthememanager::updatePreview( const TQString & pixFile )
      TQImage preview( pixFile, "PNG" );
      if (preview.width()>dlg->lbPreview->contentsRect().width() ||
          preview.height()>dlg->lbPreview->contentsRect().height() )
-         preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), TQImage::ScaleMin );
+         preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), TQ_ScaleMin );
      TQPixmap pix;
      pix.convertFromImage( preview );
      dlg->lbPreview->setPixmap( pix );
diff --git a/kcontrol/kthememanager/newthemewidget.ui b/kcontrol/kthememanager/newthemewidget.ui
index 905b0749a..1a56915aa 100644
--- a/kcontrol/kthememanager/newthemewidget.ui
+++ b/kcontrol/kthememanager/newthemewidget.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>NewThemeWidget</class>
 <author>Lukas Tinkl &lt;[email protected]&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>NewThemeWidget</cstring>
     </property>
@@ -17,7 +17,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>
@@ -28,7 +28,7 @@
                 <cstring>leName</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -39,7 +39,7 @@
                 <cstring>leAuthor</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>textLabel3</cstring>
             </property>
@@ -50,7 +50,7 @@
                 <cstring>leEmail</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>textLabel4</cstring>
             </property>
@@ -61,51 +61,51 @@
                 <cstring>leHomepage</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="2" column="1">
+        <widget class="TQLineEdit" row="2" column="1">
             <property name="name">
                 <cstring>leEmail</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="0" column="1">
+        <widget class="TQLineEdit" row="0" column="1">
             <property name="name">
                 <cstring>leName</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="3" column="1">
+        <widget class="TQLineEdit" row="3" column="1">
             <property name="name">
                 <cstring>leHomepage</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="1" column="1">
+        <widget class="TQLineEdit" row="1" column="1">
             <property name="name">
                 <cstring>leAuthor</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="5" column="0">
+        <widget class="TQLabel" row="5" column="0">
             <property name="name">
                 <cstring>textLabel5</cstring>
             </property>
             <property name="text">
                 <string>Co&amp;mment:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignTop</set>
             </property>
             <property name="buddy" stdset="0">
                 <cstring>teComment</cstring>
             </property>
         </widget>
-        <widget class="QTextEdit" row="5" column="1">
+        <widget class="TQTextEdit" row="5" column="1">
             <property name="name">
                 <cstring>teComment</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="4" column="1">
+        <widget class="TQLineEdit" row="4" column="1">
             <property name="name">
                 <cstring>leVersion</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>textLabel6</cstring>
             </property>