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

18 files changed, 146 insertions, 146 deletions

diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp
index 2d1f392cf..372104c4a 100644
--- a/kcontrol/kicker/advancedDialog.cpp
+++ b/kcontrol/kicker/advancedDialog.cpp
@@ -46,12 +46,12 @@ advancedDialog::advancedDialog(TQWidget* parent, const char* name)
             this, TQT_SLOT(save()));
 
     TQFrame* page = plainPage();
-    TQVBoxLayout* tqlayout = new TQVBoxLayout(page);
+    TQVBoxLayout* layout = new TQVBoxLayout(page);
     m_advancedWidget = new advancedKickerOptions(page);
-    tqlayout->addWidget(m_advancedWidget);
-    tqlayout->addStretch();
+    layout->addWidget(m_advancedWidget);
+    layout->addStretch();
 
-    setMinimumSize( tqsizeHint() );
+    setMinimumSize( sizeHint() );
 
     connect(m_advancedWidget->handles, TQT_SIGNAL(clicked(int)),
             this, TQT_SLOT(changed()));
@@ -86,7 +86,7 @@ void advancedDialog::load()
 
     int defaultHideButtonSize = c.readNumEntry("HideButtonSize", 14);
     m_advancedWidget->hideButtonSize->setValue(defaultHideButtonSize);
-    TQColor color = c.readColorEntry( "TintColor", &tqcolorGroup().mid() );
+    TQColor color = c.readColorEntry( "TintColor", &colorGroup().mid() );
     m_advancedWidget->tintColorB->setColor( color );
     int tintValue = c.readNumEntry( "TintValue", 33 );
     m_advancedWidget->tintSlider->setValue( tintValue );
@@ -123,7 +123,7 @@ void advancedDialog::save()
 
         // is there a config group for this extension?
         if(!c.hasGroup(group) ||
-           group.tqcontains("Extension") < 1)
+           group.contains("Extension") < 1)
         {
             continue;
         }
diff --git a/kcontrol/kicker/advancedOptions.ui b/kcontrol/kicker/advancedOptions.ui
index f88303414..215ef7e8b 100644
--- a/kcontrol/kicker/advancedOptions.ui
+++ b/kcontrol/kicker/advancedOptions.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>advancedKickerOptions</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -71,7 +71,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>101</width>
                             <height>20</height>
@@ -145,7 +145,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>21</width>
                             <height>20</height>
@@ -194,7 +194,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>21</height>
@@ -208,7 +208,7 @@
                     <property name="text">
                         <string>Min</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignLeft</set>
                     </property>
                     <property name="whatsThis" stdset="0">
@@ -225,7 +225,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>81</width>
                             <height>20</height>
@@ -250,7 +250,7 @@
                     <property name="text">
                         <string>Max</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="whatsThis" stdset="0">
@@ -312,8 +312,8 @@
     <include location="global" impldecl="in declaration">knuminput.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"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kcontrol/kicker/applettab.ui b/kcontrol/kicker/applettab.ui
index e5120f9a6..6ebfa2c88 100644
--- a/kcontrol/kicker/applettab.ui
+++ b/kcontrol/kicker/applettab.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>AppletTabBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -112,7 +112,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -123,7 +123,7 @@
                                     <property name="name">
                                         <cstring>pb_add</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>0</width>
                                             <height>0</height>
@@ -143,7 +143,7 @@
                                     <property name="sizeType">
                                         <enum>Minimum</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -162,7 +162,7 @@
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>0</width>
                                             <height>0</height>
@@ -182,7 +182,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -219,8 +219,8 @@
 <includes>
     <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"/>
 <includehints>
     <includehint>qwidget.h</includehint>
 </includehints>
diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp
index 534f2cbdb..a8b7cdb20 100644
--- a/kcontrol/kicker/applettab_impl.cpp
+++ b/kcontrol/kicker/applettab_impl.cpp
@@ -132,7 +132,7 @@ void AppletTab::load( bool useDefaults )
       TQStringList list = c.readListEntry("TrustedApplets");
       for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
         {
-          if(available.tqcontains(*it))
+          if(available.contains(*it))
             l_trusted << (*it);
         }
     }
@@ -142,7 +142,7 @@ void AppletTab::load( bool useDefaults )
 
   for ( TQStringList::Iterator it = available.begin(); it != available.end(); ++it )
     {
-      if(!l_trusted.tqcontains(*it))
+      if(!l_trusted.contains(*it))
         l_available << (*it);
     }
 
diff --git a/kcontrol/kicker/extensionInfo.cpp b/kcontrol/kicker/extensionInfo.cpp
index 89f000410..d1a0b2766 100644
--- a/kcontrol/kicker/extensionInfo.cpp
+++ b/kcontrol/kicker/extensionInfo.cpp
@@ -125,7 +125,7 @@ void ExtensionInfo::load()
     c.setGroup("General");
 
     _position       = c.readNumEntry ("Position",            _position);
-    _tqalignment      = c.readNumEntry ("Alignment",           _tqalignment);
+    _alignment      = c.readNumEntry ("Alignment",           _alignment);
     _xineramaScreen = c.readNumEntry ("XineramaScreen",      _xineramaScreen);
     _showLeftHB     = c.readBoolEntry("ShowLeftHideButton",  _showLeftHB);
     _showRightHB    = c.readBoolEntry("ShowRightHideButton", _showRightHB);
@@ -147,7 +147,7 @@ void ExtensionInfo::load()
     }
 
     _orig_position = _position;
-    _orig_tqalignment = _tqalignment;
+    _orig_alignment = _alignment;
     _orig_size = _size;
     _orig_customSize = _customSize;
 
@@ -170,10 +170,10 @@ void ExtensionInfo::configChanged()
         _orig_position = _position = position;
     }
 
-    int tqalignment = c.readNumEntry ("Alignment", TQApplication::reverseLayout() ? 2 : 0);
-    if (tqalignment != _tqalignment && tqalignment != _orig_tqalignment)
+    int alignment = c.readNumEntry ("Alignment", TQApplication::reverseLayout() ? 2 : 0);
+    if (alignment != _alignment && alignment != _orig_alignment)
     {
-        _orig_tqalignment = _tqalignment = tqalignment;
+        _orig_alignment = _alignment = alignment;
     }
 
     if (_resizeable)
@@ -197,7 +197,7 @@ void ExtensionInfo::setDefaults()
 {
     // defaults
     _position       = 3;
-    _tqalignment      = TQApplication::reverseLayout() ? 2 : 0;
+    _alignment      = TQApplication::reverseLayout() ? 2 : 0;
     _xineramaScreen = TQApplication::desktop()->primaryScreen();
     _size           = 2;
     _showLeftHB     = false;
@@ -225,7 +225,7 @@ void ExtensionInfo::save()
     c.setGroup("General");
 
     c.writeEntry("Position",            _position);
-    c.writeEntry("Alignment",           _tqalignment);
+    c.writeEntry("Alignment",           _alignment);
     c.writeEntry("XineramaScreen",      _xineramaScreen);
     c.writeEntry("ShowLeftHideButton",  _showLeftHB);
     c.writeEntry("ShowRightHideButton", _showRightHB);
@@ -251,7 +251,7 @@ void ExtensionInfo::save()
     }
 
     _orig_position = _position;
-    _orig_tqalignment = _tqalignment;
+    _orig_alignment = _alignment;
     _orig_size = _size;
     _orig_customSize = _customSize;
 
diff --git a/kcontrol/kicker/extensionInfo.h b/kcontrol/kicker/extensionInfo.h
index 5b890d324..169322aa4 100644
--- a/kcontrol/kicker/extensionInfo.h
+++ b/kcontrol/kicker/extensionInfo.h
@@ -47,7 +47,7 @@ class ExtensionInfo
         // Configuration settings
         TQString  _name;
         int      _position;
-        int      _tqalignment;
+        int      _alignment;
         int      _xineramaScreen;
         int      _size;
         int      _customSize;
@@ -67,7 +67,7 @@ class ExtensionInfo
         // Original settings to ensure that we can figure out
         // what has changed externally to the panel vs within the panel
         int      _orig_position;
-        int      _orig_tqalignment;
+        int      _orig_alignment;
         int      _orig_size;
         int      _orig_customSize;
 
diff --git a/kcontrol/kicker/hidingconfig.cpp b/kcontrol/kicker/hidingconfig.cpp
index 27e40a5fc..935fa5902 100644
--- a/kcontrol/kicker/hidingconfig.cpp
+++ b/kcontrol/kicker/hidingconfig.cpp
@@ -31,10 +31,10 @@
 HidingConfig::HidingConfig(TQWidget *parent, const char *name)
   : KCModule(parent, name)
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout *layout = new TQVBoxLayout(this);
     m_widget = new HidingTab(this);
-    tqlayout->addWidget(m_widget);
-    tqlayout->addStretch();
+    layout->addWidget(m_widget);
+    layout->addStretch();
 
     setQuickHelp(KickerConfig::the()->quickHelp());
     setAboutData(KickerConfig::the()->aboutData());
diff --git a/kcontrol/kicker/hidingtab.ui b/kcontrol/kicker/hidingtab.ui
index 6bc618591..8d7b0b254 100644
--- a/kcontrol/kicker/hidingtab.ui
+++ b/kcontrol/kicker/hidingtab.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>HidingTabBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -62,7 +62,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>342</width>
                             <height>20</height>
@@ -92,7 +92,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>20</height>
@@ -115,7 +115,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="2" column="1">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -179,7 +179,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -218,7 +218,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="6" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -299,7 +299,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -332,7 +332,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>50</width>
                             <height>10</height>
@@ -401,7 +401,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -439,7 +439,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -467,7 +467,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>20</height>
@@ -532,7 +532,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -557,7 +557,7 @@
                             <property name="text">
                                 <string>Fast</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="hAlign" stdset="0">
@@ -573,7 +573,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -598,7 +598,7 @@
                             <property name="text">
                                 <string>Medium</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignCenter</set>
                             </property>
                             <property name="hAlign" stdset="0">
@@ -637,7 +637,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -753,8 +753,8 @@
 <slots>
     <slot specifier="pure virtual">switchPanel(int)</slot>
 </slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/kcontrol/kicker/lookandfeelconfig.cpp b/kcontrol/kicker/lookandfeelconfig.cpp
index 2c490f6dc..7475ad7b0 100644
--- a/kcontrol/kicker/lookandfeelconfig.cpp
+++ b/kcontrol/kicker/lookandfeelconfig.cpp
@@ -31,10 +31,10 @@
 LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name)
   : KCModule(parent, name)
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout *layout = new TQVBoxLayout(this);
     m_widget = new LookAndFeelTab(this);
-    tqlayout->addWidget(m_widget);
-    tqlayout->addStretch();
+    layout->addWidget(m_widget);
+    layout->addStretch();
 
     setQuickHelp(KickerConfig::the()->quickHelp());
     setAboutData(KickerConfig::the()->aboutData());
diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui
index 8a802a369..87f87cfc7 100644
--- a/kcontrol/kicker/lookandfeeltab.ui
+++ b/kcontrol/kicker/lookandfeeltab.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>LookAndFeelTabBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -359,7 +359,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>66</width>
                             <height>130</height>
@@ -389,7 +389,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -428,13 +428,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>50</width>
                             <height>50</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>50</width>
                             <height>50</height>
@@ -449,7 +449,7 @@
                     <property name="scaledContents">
                         <bool>true</bool>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignCenter</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -500,7 +500,7 @@ This option is only active if 'Enable background image' is selected.</string>
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -527,7 +527,7 @@ This option is only active if 'Enable background image' is selected.</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>289</width>
                             <height>20</height>
@@ -546,7 +546,7 @@ This option is only active if 'Enable background image' is selected.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
@@ -626,8 +626,8 @@ This option is only active if 'Enable background image' is selected.</string>
     <slot access="protected" specifier="pure virtual">browseTheme(const QString&amp;)</slot>
     <slot access="protected" specifier="pure virtual">enableTransparency(bool)</slot>
 </slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/kcontrol/kicker/lookandfeeltab_kcm.cpp b/kcontrol/kicker/lookandfeeltab_kcm.cpp
index ac977b676..bfdb3a491 100644
--- a/kcontrol/kicker/lookandfeeltab_kcm.cpp
+++ b/kcontrol/kicker/lookandfeeltab_kcm.cpp
@@ -42,11 +42,11 @@ LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name)
     setAboutData( about );
 
     KickerConfig::initScreenNumber();
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+    TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
     lookandfeeltab = new LookAndFeelTab(this);
-    tqlayout->addWidget(lookandfeeltab);
-    tqlayout->addStretch();
+    layout->addWidget(lookandfeeltab);
+    layout->addStretch();
 
     connect(lookandfeeltab, TQT_SIGNAL(changed()), TQT_SLOT(configChanged()));
 
diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp
index 10fc45699..e60746db8 100644
--- a/kcontrol/kicker/main.cpp
+++ b/kcontrol/kicker/main.cpp
@@ -187,7 +187,7 @@ void KickerConfig::setupExtensionInfo(KConfig& config, bool checkExists, bool re
         TQString group(*it);
 
         // is there a config group for this extension?
-        if (!config.hasGroup(group) || group.tqcontains("Extension") < 1)
+        if (!config.hasGroup(group) || group.contains("Extension") < 1)
         {
             continue;
         }
diff --git a/kcontrol/kicker/menuconfig.cpp b/kcontrol/kicker/menuconfig.cpp
index 4b6c6c6ff..03ca57582 100644
--- a/kcontrol/kicker/menuconfig.cpp
+++ b/kcontrol/kicker/menuconfig.cpp
@@ -31,10 +31,10 @@
 MenuConfig::MenuConfig(TQWidget *parent, const char *name)
   : KCModule(parent, name)
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout *layout = new TQVBoxLayout(this);
     m_widget = new MenuTab(this);
-    tqlayout->addWidget(m_widget);
-    tqlayout->addStretch();
+    layout->addWidget(m_widget);
+    layout->addStretch();
 
     setQuickHelp(KickerConfig::the()->quickHelp());
     setAboutData(KickerConfig::the()->aboutData());
diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui
index ac2b8fe0f..7d3a3d460 100644
--- a/kcontrol/kicker/menutab.ui
+++ b/kcontrol/kicker/menutab.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>MenuTabBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -21,7 +21,7 @@
         </property>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -63,7 +63,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -85,7 +85,7 @@
                 </property>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout7</cstring>
+                        <cstring>layout7</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -197,7 +197,7 @@
                             <property name="sizeType">
                                 <enum>MinimumExpanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>0</height>
@@ -261,13 +261,13 @@
 							<verstretch>0</verstretch>
 						</sizepolicy>
 					</property>
-					<property name="tqminimumSize">
+					<property name="minimumSize">
 						<size>
 							<width>26</width>
 							<height>26</height>
 						</size>
 					</property>
-					<property name="tqmaximumSize">
+					<property name="maximumSize">
 						<size>
 							<width>26</width>
 							<height>26</height>
@@ -327,7 +327,7 @@
 					<property name="sizeType">
 						<enum>Expanding</enum>
 					</property>
-					<property name="tqsizeHint">
+					<property name="sizeHint">
 						<size>
 							<width>20</width>
 							<height>20</height>
@@ -345,7 +345,7 @@
 				<property name="sizeType">
 					<enum>MinimumExpanding</enum>
 				</property>
-				<property name="tqsizeHint">
+				<property name="sizeHint">
 					<size>
 						<width>20</width>
 						<height>0</height>
@@ -389,7 +389,7 @@
                             <verstretch>1</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -487,7 +487,7 @@
 				<property name="sizeType">
 					<enum>Expanding</enum>
 				</property>
-				<property name="tqsizeHint">
+				<property name="sizeHint">
 					<size>
 					<width>20</width>
 					<height>0</height>
@@ -558,7 +558,7 @@
 					<property name="sizeType">
 						<enum>Expanding</enum>
 					</property>
-					<property name="tqsizeHint">
+					<property name="sizeHint">
 						<size>
 							<width>20</width>
 							<height>0</height>
@@ -654,7 +654,7 @@
 				<property name="sizeType">
 					<enum>Expanding</enum>
 				</property>
-				<property name="tqsizeHint">
+				<property name="sizeHint">
 					<size>
 					<width>20</width>
 					<height>0</height>
@@ -698,7 +698,7 @@
 					<property name="sizeType">
 						<enum>Expanding</enum>
 					</property>
-					<property name="tqsizeHint">
+					<property name="sizeHint">
 						<size>
 							<width>20</width>
 							<height>0</height>
@@ -730,8 +730,8 @@
     <include location="global" impldecl="in implementation">knuminput.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index cd1d27fa9..970aa10a1 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -93,9 +93,9 @@ MenuTab::MenuTab( TQWidget *parent, const char* name )
     btnCustomKMenuIcon->setPixmap(kmenu_icon);
 
     KConfig *config;
-    config = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false);
-    config->setGroup(TQString::tqfromLatin1("RecentDocuments"));
-    maxrecentdocs->setValue(config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10));
+    config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false);
+    config->setGroup(TQString::fromLatin1("RecentDocuments"));
+    maxrecentdocs->setValue(config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10));
 
     m_browserGroupLayout->setColStretch( 1, 1 );
     m_pRecentOrderGroupLayout->setColStretch( 1, 1 );
@@ -148,7 +148,7 @@ void MenuTab::load( bool useDefaults )
                                         df.readName(),
                                         *it,
                                         SmallIcon(df.readIcon()),
-                                        tqFind(ext.begin(), ext.end(), *it) != ext.end());
+                                        qFind(ext.begin(), ext.end(), *it) != ext.end());
             connect(menuItem, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
         }
     }
@@ -247,8 +247,8 @@ void MenuTab::save()
 
     // Save recent documents
     KConfig *config;
-    config = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false);
-    config->setGroup(TQString::tqfromLatin1("RecentDocuments"));
+    config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false);
+    config->setGroup(TQString::fromLatin1("RecentDocuments"));
     config->writeEntry("MaxEntries", maxrecentdocs->value());
     config->sync();
 
diff --git a/kcontrol/kicker/positionconfig.cpp b/kcontrol/kicker/positionconfig.cpp
index 2367f2317..6e5dcdeb2 100644
--- a/kcontrol/kicker/positionconfig.cpp
+++ b/kcontrol/kicker/positionconfig.cpp
@@ -31,10 +31,10 @@
 PositionConfig::PositionConfig(TQWidget *parent, const char *name)
   : KCModule(parent, name)
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout *layout = new TQVBoxLayout(this);
     m_widget = new PositionTab(this);
-    tqlayout->addWidget(m_widget);
-    tqlayout->addStretch();
+    layout->addWidget(m_widget);
+    layout->addStretch();
 
     setQuickHelp(KickerConfig::the()->quickHelp());
     setAboutData(KickerConfig::the()->aboutData());
diff --git a/kcontrol/kicker/positiontab.ui b/kcontrol/kicker/positiontab.ui
index 90217d5e4..b0566f5dc 100644
--- a/kcontrol/kicker/positiontab.ui
+++ b/kcontrol/kicker/positiontab.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>PositionTabBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -66,7 +66,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>342</width>
                             <height>20</height>
@@ -104,7 +104,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>0</height>
@@ -123,7 +123,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>151</width>
                                     <height>115</height>
@@ -132,7 +132,7 @@
                             <property name="scaledContents">
                                 <bool>true</bool>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignCenter</set>
                             </property>
                             <property name="whatsThis" stdset="0">
@@ -149,7 +149,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>0</height>
@@ -176,7 +176,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>0</height>
@@ -235,7 +235,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>0</width>
                             <height>101</height>
@@ -357,7 +357,7 @@ how it is positioned on the screen and how much of the screen it should use.</st
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>16</width>
                     <height>16</height>
@@ -426,7 +426,7 @@ how it is positioned on the screen and how much of the screen it should use.</st
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>40</height>
@@ -538,7 +538,7 @@ how it is positioned on the screen and how much of the screen it should use.</st
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -555,7 +555,7 @@ how it is positioned on the screen and how much of the screen it should use.</st
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>21</width>
                             <height>0</height>
@@ -590,13 +590,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
@@ -624,13 +624,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
@@ -658,13 +658,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
@@ -702,13 +702,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
@@ -736,13 +736,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
@@ -770,13 +770,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
@@ -814,13 +814,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
@@ -848,13 +848,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
@@ -882,13 +882,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
@@ -926,13 +926,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
@@ -960,13 +960,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
@@ -994,13 +994,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
@@ -1118,8 +1118,8 @@ how it is positioned on the screen and how much of the screen it should use.</st
     <slot access="protected" specifier="pure virtual">panelDimensionsChanged()</slot>
     <slot specifier="pure virtual">switchPanel( int )</slot>
 </slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp
index b5c4c0ac7..d65498430 100644
--- a/kcontrol/kicker/positiontab_impl.cpp
+++ b/kcontrol/kicker/positiontab_impl.cpp
@@ -43,7 +43,7 @@
 #include "positiontab_impl.moc"
 
 
-// magic numbers for the preview widget tqlayout
+// magic numbers for the preview widget layout
 extern const int offsetX = 23;
 extern const int offsetY = 14;
 extern const int maxX = 150;
@@ -60,7 +60,7 @@ PositionTab::PositionTab(TQWidget *parent, const char* name)
 {
     TQPixmap monitor(locate("data", "kcontrol/pics/monitor.png"));
     m_monitorImage->setPixmap(monitor);
-    m_monitorImage->setFixedSize(m_monitorImage->tqsizeHint());
+    m_monitorImage->setFixedSize(m_monitorImage->sizeHint());
 
     m_pretendDesktop = new TQWidget(m_monitorImage, "pretendBG");
     m_pretendDesktop->setGeometry(offsetX, offsetY, maxX, maxY);
@@ -558,7 +558,7 @@ void PositionTab::switchPanel(int panelItem)
     m_customSpinbox->setValue(m_panelInfo->_customSize);
     m_sizeGroup->setEnabled(m_panelInfo->_resizeable);
     m_panelPos = m_panelInfo->_position;
-    m_panelAlign = m_panelInfo->_tqalignment;
+    m_panelAlign = m_panelInfo->_alignment;
     if(m_panelInfo->_xineramaScreen >= 0 && m_panelInfo->_xineramaScreen < TQApplication::desktop()->numScreens())
         m_xineramaScreenComboBox->setCurrentItem(m_panelInfo->_xineramaScreen);
     else if(m_panelInfo->_xineramaScreen == -2) /* the All Screens option: qt uses -1 for default, so -2 for all */
@@ -672,7 +672,7 @@ void PositionTab::storeInfo()
     }
 
     m_panelInfo->_position = m_panelPos;
-    m_panelInfo->_tqalignment = m_panelAlign;
+    m_panelInfo->_alignment = m_panelAlign;
     if(m_xineramaScreenComboBox->currentItem() == m_xineramaScreenComboBox->count()-1)
         m_panelInfo->_xineramaScreen = -2; /* all screens */
     else
@@ -696,14 +696,14 @@ void PositionTab::showIdentify()
         screenLabel->setFrameStyle(TQFrame::Panel);
         screenLabel->setFrameShadow(TQFrame::Plain);
 
-        screenLabel->tqsetAlignment(Qt::AlignCenter);
+        screenLabel->setAlignment(Qt::AlignCenter);
         screenLabel->setNum(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);