Rename a number of old tq methods that are no longer tq specific

10 files changed, 40 insertions, 40 deletions

diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp
index e14be2af0..437e11cfc 100644
--- a/kcontrol/background/bgadvanced.cpp
+++ b/kcontrol/background/bgadvanced.cpp
@@ -24,7 +24,7 @@
 #include <tqcheckbox.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
@@ -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, Qt::AlignLeft);
 
diff --git a/kcontrol/background/bgadvanced_ui.ui b/kcontrol/background/bgadvanced_ui.ui
index 55dbc384e..441b918de 100644
--- a/kcontrol/background/bgadvanced_ui.ui
+++ b/kcontrol/background/bgadvanced_ui.ui
@@ -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>
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 02669bdd0..00b784a8c 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 );
@@ -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);
@@ -441,14 +441,14 @@ void BGDialog::initUI()
    else {
       for (unsigned i = 0; i < (m_numDesks/m_numViewports); ++i) {
          for (unsigned j = 0; j < m_numViewports; ++j) {
-            m_comboDesktop->insertItem(i18n("Desktop %1 Viewport %2").tqarg(i+1).tqarg(j+1));
+            m_comboDesktop->insertItem(i18n("Desktop %1 Viewport %2").arg(i+1).arg(j+1));
          }
       }
    }
    
    // Screens
    for (unsigned i = 0; i < m_numScreens; ++i)
-      m_comboScreen->insertItem( i18n("Screen %1").tqarg(TQString::number(i+1)) );
+      m_comboScreen->insertItem( i18n("Screen %1").arg(TQString::number(i+1)) );
 
    // Patterns
    m_comboPattern->insertItem(i18n("Single Color"));
@@ -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 c3d1a0344..3960b4009 100644
--- a/kcontrol/background/bgdialog_ui.ui
+++ b/kcontrol/background/bgdialog_ui.ui
@@ -105,7 +105,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>0</height>
@@ -132,7 +132,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>100</width>
                             <height>0</height>
@@ -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>
@@ -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>
diff --git a/kcontrol/background/bghash.h b/kcontrol/background/bghash.h
index 61e9d7300..7cc09ca43 100644
--- a/kcontrol/background/bghash.h
+++ b/kcontrol/background/bghash.h
@@ -8,7 +8,7 @@
 static int TQHash(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 696edc56c..f78a7b616 100644
--- a/kcontrol/background/bgmonitor.cpp
+++ b/kcontrol/background/bgmonitor.cpp
@@ -157,7 +157,7 @@ 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);
@@ -168,8 +168,8 @@ BGMonitorLabel::BGMonitorLabel(TQWidget *parent, const char *name)
 
 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 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 65ef3c12b..3b67667a2 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -129,7 +129,7 @@ TQString KBackgroundRenderer::buildCommand()
         if (pos == (int) (cmd.length() - 1))
             break;
 
-        switch (cmd.tqat(pos+1).latin1()) {
+        switch (cmd.at(pos+1).latin1()) {
         case 'f':
             createTempFile();
             cmd.replace(pos, 2, KShellProcess::quote(m_Tempfile->name()));
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index c98376cc4..818a00f31 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -148,7 +148,7 @@ bool KBackgroundPattern::isAvailable()
     if (m_Pattern.isEmpty())
        return false;
     TQString file = m_Pattern;
-    if (file.tqat(0) != '/')
+    if (file.at(0) != '/')
         file = m_pDirs->findResource("dtop_pattern", file);
     TQFileInfo fi(file);
     return (fi.exists());
@@ -895,7 +895,7 @@ void KBackgroundSettings::randomizeWallpaperFiles()
    tmpList.pop_front();
    while(tmpList.count())
    {
-      randomList.insert(randomList.tqat(
+      randomList.insert(randomList.at(
          rseq.getLong(randomList.count()+1)),
          1, tmpList.front());
 
@@ -985,7 +985,7 @@ bool KBackgroundSettings::discardCurrentWallpaper()
     {
        return false;
     }
-    m_WallpaperFiles.remove(m_WallpaperFiles.tqat(m_CurrentWallpaper));
+    m_WallpaperFiles.remove(m_WallpaperFiles.at(m_CurrentWallpaper));
     --m_CurrentWallpaper;
     changeWallpaper();
 
diff --git a/kcontrol/background/bgwallpaper_ui.ui b/kcontrol/background/bgwallpaper_ui.ui
index 130157c08..14fca2eb2 100644
--- a/kcontrol/background/bgwallpaper_ui.ui
+++ b/kcontrol/background/bgwallpaper_ui.ui
@@ -69,7 +69,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -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>
diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp
index 321eef90a..e004626be 100644
--- a/kcontrol/background/main.cpp
+++ b/kcontrol/background/main.cpp
@@ -15,7 +15,7 @@
  * License. See the file "COPYING" for the exact licensing terms.
  */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <kconfig.h>