Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


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

10 files changed, 80 insertions, 80 deletions

diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp
index c6b21c38a..e1f9ece96 100644
--- a/kcontrol/background/bgadvanced.cpp
+++ b/kcontrol/background/bgadvanced.cpp
@@ -432,7 +432,7 @@ KProgramEditDialog::KProgramEditDialog(const TQString &program, TQWidget *parent
     m_RefreshEdit->setRange(5, 60);
     m_RefreshEdit->setSteps(5, 10);
     m_RefreshEdit->setSuffix(i18n(" min"));
-    m_RefreshEdit->setFixedSize(m_RefreshEdit->tqsizeHint());
+    m_RefreshEdit->setFixedSize(m_RefreshEdit->sizeHint());
     lbl->setBuddy(m_RefreshEdit);
     grid->addWidget(m_RefreshEdit, 5, 1, AlignLeft);
 
diff --git a/kcontrol/background/bgadvanced_ui.ui b/kcontrol/background/bgadvanced_ui.ui
index 4048c820f..6aa3d436a 100644
--- a/kcontrol/background/bgadvanced_ui.ui
+++ b/kcontrol/background/bgadvanced_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>BGAdvancedBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -91,7 +91,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -138,7 +138,7 @@
                     <property name="enabled">
                         <bool>false</bool>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>400</width>
                             <height>0</height>
@@ -223,7 +223,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>220</width>
                             <height>20</height>
@@ -376,7 +376,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -395,7 +395,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -453,8 +453,8 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 309d19d08..8294f53a3 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -142,7 +142,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
    }
 
    // background image settings
-   TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("fileopen"));
+   TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen"));
    TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
    m_urlWallpaperButton->setIconSet( iconSet );
    m_urlWallpaperButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
@@ -257,7 +257,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
    updateUI();
 
 #if (QT_VERSION-0 >= 0x030200)
-   connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
+   connect( qApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
 #endif
 }
 
@@ -395,7 +395,7 @@ TQString BGDialog::quickHelp() const
       " wallpaper can be overlaid opaquely, or blended in different ways with"
       " the background colors and patterns.<p>"
       " KDE allows you to have the wallpaper change automatically at specified"
-      " intervals of time. You can also tqreplace the background with a program"
+      " intervals of time. You can also replace the background with a program"
       " that updates the desktop dynamically. For example, the \"kdeworld\""
       " program shows a day/night map of the world which is updated periodically.");
 }
@@ -414,14 +414,14 @@ void BGDialog::slotIdentifyScreens()
       screenLabel->setFrameStyle(TQFrame::Panel);
       screenLabel->setFrameShadow(TQFrame::Plain);
 
-      screenLabel->tqsetAlignment(Qt::AlignCenter);
+      screenLabel->setAlignment(Qt::AlignCenter);
       screenLabel->setNum(int(s + 1));
         // BUGLET: we should not allow the identification to be entered again
         //         until the timer fires.
       TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close()));
 
       TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center());
-      TQRect targetGeometry(TQPoint(0,0),screenLabel->tqsizeHint());
+      TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint());
       targetGeometry.moveCenter(screenCenter);
 
       screenLabel->setGeometry(targetGeometry);
@@ -524,7 +524,7 @@ void BGDialog::loadWallpaperFilesList() {
       if (imageCaption.isEmpty())
       {
          imageCaption = fileName;
-         imageCaption.tqreplace('_', ' ');
+         imageCaption.replace('_', ' ');
          imageCaption = KStringHandler::capwords(imageCaption);
       }
 
@@ -571,7 +571,7 @@ void BGDialog::loadWallpaperFilesList() {
             else
                imageCaption = (*it).mid(slash);
 
-            imageCaption.tqreplace('_', ' ');
+            imageCaption.replace('_', ' ');
             imageCaption = KStringHandler::capwords(imageCaption);
          }
 
@@ -943,7 +943,7 @@ void BGDialog::slotWallpaperTypeChanged(int i)
          else
             m_wallpaperPos = KBackgroundSettings::Tiled;
       }
-      else if (KMimeType::tqfindByPath(path)->is("image/svg+xml"))
+      else if (KMimeType::findByPath(path)->is("image/svg+xml"))
       {
          m_wallpaperPos = KBackgroundSettings::Scaled;         
       }
@@ -1004,7 +1004,7 @@ void BGDialog::slotSetupMulti()
 {
     KBackgroundRenderer *r = eRenderer();
 
-    BGMultiWallpaperDialog dlg(r, tqtopLevelWidget());
+    BGMultiWallpaperDialog dlg(r, topLevelWidget());
     if (dlg.exec() == TQDialog::Accepted) {
         r->stop();
         m_slideShowRandom = r->multiWallpaperMode();
@@ -1182,7 +1182,7 @@ void BGDialog::slotAdvanced()
     KBackgroundRenderer *r = eRenderer();
 
     m_previewUpdates = false;
-    BGAdvancedDialog dlg(r, tqtopLevelWidget(), m_multidesktop);
+    BGAdvancedDialog dlg(r, topLevelWidget(), m_multidesktop);
 
     if (!m_pMonitorArrangement->isEnabled()) {
        dlg.makeReadOnly();
diff --git a/kcontrol/background/bgdialog_ui.ui b/kcontrol/background/bgdialog_ui.ui
index 93df51428..7cc6571d5 100644
--- a/kcontrol/background/bgdialog_ui.ui
+++ b/kcontrol/background/bgdialog_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>BGDialog_UI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -105,7 +105,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>0</height>
@@ -114,7 +114,7 @@
         </spacer>
         <widget class="QLayoutWidget" row="1" column="4" rowspan="2" colspan="1">
             <property name="name">
-                <cstring>tqlayout36</cstring>
+                <cstring>layout36</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -132,7 +132,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>100</width>
                             <height>0</height>
@@ -141,7 +141,7 @@
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout35</cstring>
+                        <cstring>layout35</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -161,7 +161,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>4</width>
                                     <height>20</height>
@@ -197,7 +197,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>4</width>
                                     <height>20</height>
@@ -219,7 +219,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>4</width>
                                     <height>20</height>
@@ -255,7 +255,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>4</width>
                                     <height>20</height>
@@ -277,7 +277,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>4</width>
                                     <height>20</height>
@@ -313,7 +313,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>4</width>
                                     <height>20</height>
@@ -333,7 +333,7 @@
                     <property name="sizeType">
                         <enum>MinimumExpanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -386,7 +386,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="3" column="1">
                     <property name="name">
-                        <cstring>tqlayout31</cstring>
+                        <cstring>layout31</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -440,7 +440,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="6" column="1">
                     <property name="name">
-                        <cstring>tqlayout23</cstring>
+                        <cstring>layout23</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -522,7 +522,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>120</width>
                             <height>10</height>
@@ -539,7 +539,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>130</width>
                             <height>10</height>
@@ -613,7 +613,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>260</width>
                             <height>20</height>
@@ -641,7 +641,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>110</width>
                             <height>16</height>
@@ -711,8 +711,8 @@
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kcontrol/background/bghash.h b/kcontrol/background/bghash.h
index b59a46f96..ab13daf90 100644
--- a/kcontrol/background/bghash.h
+++ b/kcontrol/background/bghash.h
@@ -8,7 +8,7 @@
 static int QHash(TQString key)
 {
     int g, h = 0;
-    const TQChar *p = key.tqunicode();
+    const TQChar *p = key.unicode();
     for (unsigned i=0; i < key.length(); i++) {
         h = (h << 4) + p[i].cell();
         if ((g = (h & 0xf0000000)))
diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp
index 3c2278722..f78a7b616 100644
--- a/kcontrol/background/bgmonitor.cpp
+++ b/kcontrol/background/bgmonitor.cpp
@@ -91,7 +91,7 @@ void BGMonitorArrangement::updateArrangement()
 {
     // In this function, sizes, etc have a normal value, and their "expanded"
     // value. The expanded value is used for setting the size of the monitor
-    // image that tqcontains the preview of the background. The monitor image
+    // image that contains the preview of the background. The monitor image
     // will set the background preview back to the normal value.
     
     TQRect overallGeometry;
@@ -157,21 +157,21 @@ void BGMonitorArrangement::setPixmap( const KPixmap & pm )
 BGMonitorLabel::BGMonitorLabel(TQWidget *parent, const char *name)
     : TQLabel(parent, name)
 {
-    tqsetAlignment(AlignCenter);
+    setAlignment(AlignCenter);
     setScaledContents(true);
     setPixmap( TQPixmap( locate("data",  "kcontrol/pics/monitor.png") ) );
     m_pBGMonitor = new BGMonitor(this);
     
-    TQWhatsThis::add( this, i18n("This picture of a monitor tqcontains a preview of what the current settings will look like on your desktop.") );
+    TQWhatsThis::add( this, i18n("This picture of a monitor contains a preview of what the current settings will look like on your desktop.") );
 }
 
 
 void BGMonitorLabel::updateMonitorGeometry()
 {
-    double scaleX = double(width()) / double(tqsizeHint().width());
-    double scaleY = double(height()) / double(tqsizeHint().height());
+    double scaleX = double(width()) / double(sizeHint().width());
+    double scaleY = double(height()) / double(sizeHint().height());
     
-    kdDebug() << k_funcinfo << " Setting tqgeometry to " << TQRect( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) ) << endl;
+    kdDebug() << k_funcinfo << " Setting geometry to " << TQRect( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) ) << endl;
     m_pBGMonitor->setGeometry( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) );
 }
 
@@ -189,7 +189,7 @@ void BGMonitorLabel::resizeEvent( TQResizeEvent * e )
 BGMonitor::BGMonitor(TQWidget *parent, const char *name)
     : TQLabel(parent, name)
 {
-    tqsetAlignment(AlignCenter);
+    setAlignment(AlignCenter);
     setScaledContents(true);
     setAcceptDrops(true);
 }
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index 288a06aa3..f11363982 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -54,7 +54,7 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou
     m_isBusyCursor = false;
     m_enableBusyCursor = false;
     m_pDirs = KGlobal::dirs();
-    m_rSize = m_Size = drawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->tqgeometry().size();
+    m_rSize = m_Size = drawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->geometry().size();
     m_pProc = 0L;
     m_Tempfile = 0L;
     m_bPreview = false;
@@ -85,7 +85,7 @@ void KBackgroundRenderer::setSize(const TQSize &size)
 void KBackgroundRenderer::desktopResized()
 {
     m_State = 0;
-    m_rSize = drawBackgroundPerScreen() ? KApplication::desktop()->screenGeometry(screen()).size() : KApplication::desktop()->tqgeometry().size();
+    m_rSize = drawBackgroundPerScreen() ? KApplication::desktop()->screenGeometry(screen()).size() : KApplication::desktop()->geometry().size();
     if( !m_bPreview )
         m_Size = m_rSize;
 }
@@ -132,24 +132,24 @@ TQString KBackgroundRenderer::buildCommand()
         switch (cmd.at(pos+1).latin1()) {
         case 'f':
             createTempFile();
-            cmd.tqreplace(pos, 2, KShellProcess::quote(m_Tempfile->name()));
+            cmd.replace(pos, 2, KShellProcess::quote(m_Tempfile->name()));
             pos += m_Tempfile->name().length() - 2;
             break;
 
         case 'x':
             num.setNum(m_Size.width());
-            cmd.tqreplace(pos, 2, num);
+            cmd.replace(pos, 2, num);
             pos += num.length() - 2;
             break;
 
         case 'y':
             num.setNum(m_Size.height());
-            cmd.tqreplace(pos, 2, num);
+            cmd.replace(pos, 2, num);
             pos += num.length() - 2;
             break;
 
         case '%':
-            cmd.tqreplace(pos, 2, "%");
+            cmd.replace(pos, 2, "%");
             pos--;
             break;
         default:
@@ -191,7 +191,7 @@ int KBackgroundRenderer::doBackground(bool quit)
         int tile_val = TQPixmap::defaultDepth() >= 24 ? 1 : 2;
     // some dithering may be needed even with bpb==15/16, so don't use tileWidth==1
     // for them
-    // with tileWidth>2, tqrepainting the desktop causes nasty effect (XFree86 4.1.0 )
+    // with tileWidth>2, repainting the desktop causes nasty effect (XFree86 4.1.0 )
         if( XQueryBestTile( qt_xdisplay(), qt_xrootwin(), tile_val, tile_val,
             &tileWidth, &tileHeight ) != Success )
             tileWidth = tileHeight = tile_val; // some defaults
@@ -584,7 +584,7 @@ void KBackgroundRenderer::fastWallpaperBlend()
             m_Pixmap.convertFromImage( m_Wallpaper );
         return;
     }
-    else if( m_WallpaperRect.tqcontains( TQRect( TQPoint( 0, 0 ), m_Size ))
+    else if( m_WallpaperRect.contains( TQRect( TQPoint( 0, 0 ), m_Size ))
         && !m_Wallpaper.hasAlphaBuffer()) // wallpaper covers all and no blending
         m_Pixmap = TQPixmap( m_Size );
     else if (m_Background.size() == m_Size)
@@ -730,10 +730,10 @@ void KBackgroundRenderer::blend(TQImage& dst, TQRect dr, const TQImage& src, TQP
 			+ (dr.x() + x) * sizeof(QRgb));
                 d = reinterpret_cast<QRgb*>(src.scanLine(soffs.y() + y)
 			+ (soffs.x() + x) * sizeof(QRgb));
-                a = (tqAlpha(*d) * blendFactor) / 100;
-                *b = tqRgb(tqRed(*b) - (((tqRed(*b) - tqRed(*d)) * a) >> 8),
-                          tqGreen(*b) - (((tqGreen(*b) - tqGreen(*d)) * a) >> 8),
-                          tqBlue(*b) - (((tqBlue(*b) - tqBlue(*d)) * a) >> 8));
+                a = (qAlpha(*d) * blendFactor) / 100;
+                *b = qRgb(qRed(*b) - (((qRed(*b) - qRed(*d)) * a) >> 8),
+                          qGreen(*b) - (((qGreen(*b) - qGreen(*d)) * a) >> 8),
+                          qBlue(*b) - (((qBlue(*b) - qBlue(*d)) * a) >> 8));
             }
         }
     }
@@ -946,8 +946,8 @@ void KBackgroundRenderer::createTempFile()
 TQString KBackgroundRenderer::cacheFileName()
 {
     TQString f = fingerprint();
-    f.tqreplace ( ':', '_' ); // avoid characters that shouldn't be in filenames
-    f.tqreplace ( '/', '#' );
+    f.replace ( ':', '_' ); // avoid characters that shouldn't be in filenames
+    f.replace ( '/', '#' );
     f = locateLocal( "cache", TQString( "background/%1x%2_%3.png" )
         .arg( m_Size.width()).arg( m_Size.height()).arg( f ));
     return f;
@@ -1046,7 +1046,7 @@ KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config )
     }
 
     initRenderers();
-    m_size = KApplication::desktop()->tqgeometry().size();
+    m_size = KApplication::desktop()->geometry().size();
 }
 
 KVirtualBGRenderer::~KVirtualBGRenderer()
@@ -1153,7 +1153,7 @@ void KVirtualBGRenderer::setEnabled(bool enable)
 
 void KVirtualBGRenderer::desktopResized()
 {
-    m_size = KApplication::desktop()->tqgeometry().size();
+    m_size = KApplication::desktop()->geometry().size();
 
     if (m_pPixmap)
     {
@@ -1194,7 +1194,7 @@ void KVirtualBGRenderer::setPreview(const TQSize & size)
 
 TQSize KVirtualBGRenderer::renderSize(int screen)
 {
-    return m_bDrawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->tqgeometry().size();
+    return m_bDrawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->geometry().size();
 }
 
 
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index 90d028e22..8d3bdac0f 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -751,7 +751,7 @@ void KBackgroundSettings::readSettings(bool reparse)
     m_BackgroundMode = defBackgroundMode;
     s = m_pConfig->readEntry("BackgroundMode", "invalid");
 
-    if (m_BMMap.tqcontains(s)) {
+    if (m_BMMap.contains(s)) {
         int mode = m_BMMap[s];
         // consistency check
         if  ( ((mode != Pattern) && (mode != Program)) ||
@@ -763,7 +763,7 @@ void KBackgroundSettings::readSettings(bool reparse)
 
     m_BlendMode = defBlendMode;
     s = m_pConfig->readEntry("BlendMode", "invalid");
-    if (m_BlMMap.tqcontains(s)) {
+    if (m_BlMMap.contains(s)) {
       m_BlendMode = m_BlMMap[s];
     }
 
@@ -784,7 +784,7 @@ void KBackgroundSettings::readSettings(bool reparse)
 
     m_MultiMode = defMultiMode;
     s = m_pConfig->readEntry("MultiWallpaperMode");
-    if (m_MMMap.tqcontains(s)) {
+    if (m_MMMap.contains(s)) {
 	int mode = m_MMMap[s];
 	m_MultiMode = mode;
     }
@@ -799,7 +799,7 @@ void KBackgroundSettings::readSettings(bool reparse)
     m_WallpaperMode = defWallpaperMode;
     m_Wallpaper = m_pConfig->readPathEntry("Wallpaper");
     s = m_pConfig->readEntry("WallpaperMode", "invalid");
-    if (m_WMMap.tqcontains(s)) {
+    if (m_WMMap.contains(s)) {
         int mode = m_WMMap[s];
         // consistency check.
         if ((mode == NoWallpaper) || !m_Wallpaper.isEmpty() || (m_MultiMode == InOrder || m_MultiMode == Random))
@@ -1029,7 +1029,7 @@ TQString KBackgroundSettings::fingerprint()
     s += TQString("wm:%1;").arg(m_WallpaperMode);
     if (m_WallpaperMode != NoWallpaper)
     {
-        TQ_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false);
+        Q_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false);
         s += TQString("wp:%2:%1;").arg(rh).arg(currentWallpaper());
         
     }
diff --git a/kcontrol/background/bgwallpaper_ui.ui b/kcontrol/background/bgwallpaper_ui.ui
index a0a4a2a96..c3d9a9a40 100644
--- a/kcontrol/background/bgwallpaper_ui.ui
+++ b/kcontrol/background/bgwallpaper_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>BGMultiWallPaperBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -37,7 +37,7 @@
         </widget>
         <widget class="QLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -69,7 +69,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -80,7 +80,7 @@
         </widget>
         <widget class="QLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -98,7 +98,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>300</width>
                             <height>100</height>
@@ -123,7 +123,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -162,6 +162,6 @@
     <include location="local" impldecl="in declaration">bgwallpaper.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp
index e6e7bce35..da77d7cda 100644
--- a/kcontrol/background/main.cpp
+++ b/kcontrol/background/main.cpp
@@ -54,11 +54,11 @@ KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList
 	configname.sprintf("kdesktop-screen-%drc", screen_number);
     m_pConfig = new KConfig(configname, false, false);
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout *layout = new TQVBoxLayout(this);
     m_base = new BGDialog(this, m_pConfig);
     setQuickHelp( m_base->quickHelp());
-    tqlayout->add(m_base);
-    tqlayout->addStretch();
+    layout->add(m_base);
+    layout->addStretch();
 
     KImageIO::registerFormats();