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

diff --git a/kwin/kcmkwin/kwinrules/detectwidget.cpp b/kwin/kcmkwin/kwinrules/detectwidget.cpp
index 918951b35..1a497c8bc 100644
--- a/kwin/kcmkwin/kwinrules/detectwidget.cpp
+++ b/kwin/kcmkwin/kwinrules/detectwidget.cpp
@@ -189,7 +189,7 @@ WId DetectDialog::findWindow()
     {
     Window root;
     Window child;
-    uint tqmask;
+    uint mask;
     int rootX, rootY, x, y;
     Window parent = qt_xrootwin();
     Atom wm_state = XInternAtom( qt_xdisplay(), "WM_STATE", False );
@@ -198,7 +198,7 @@ WId DetectDialog::findWindow()
          ++i )
         {
         XQueryPointer( qt_xdisplay(), parent, &root, &child,
-            &rootX, &rootY, &x, &y, &tqmask );
+            &rootX, &rootY, &x, &y, &mask );
         if( child == None )
             return 0;
         Atom type;
diff --git a/kwin/kcmkwin/kwinrules/detectwidgetbase.ui b/kwin/kcmkwin/kwinrules/detectwidgetbase.ui
index 789594e97..31cae3ef3 100644
--- a/kwin/kcmkwin/kwinrules/detectwidgetbase.ui
+++ b/kwin/kcmkwin/kwinrules/detectwidgetbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Form3</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
@@ -213,6 +213,6 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kwin/kcmkwin/kwinrules/editshortcutbase.ui b/kwin/kcmkwin/kwinrules/editshortcutbase.ui
index c3a0d7ec6..3813ae589 100644
--- a/kwin/kcmkwin/kwinrules/editshortcutbase.ui
+++ b/kwin/kcmkwin/kwinrules/editshortcutbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>EditShortcutBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -50,7 +50,7 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -66,7 +66,7 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -91,7 +91,7 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -116,7 +116,7 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -159,6 +159,6 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
     <slot access="protected" specifier="pure virtual">editShortcut()</slot>
     <slot access="protected" specifier="pure virtual">clearShortcut()</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"/>
 </UI>
diff --git a/kwin/kcmkwin/kwinrules/kcm.cpp b/kwin/kcmkwin/kwinrules/kcm.cpp
index 90c7a0cb8..19b714311 100644
--- a/kwin/kcmkwin/kwinrules/kcm.cpp
+++ b/kwin/kcmkwin/kwinrules/kcm.cpp
@@ -42,9 +42,9 @@ KCMRules::KCMRules( TQWidget *parent, const char *name )
 : KCModule( parent, name )
 , config( "kwinrulesrc" )
     {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+    TQVBoxLayout *layout = new TQVBoxLayout( this );
     widget = new KCMRulesList( this );
-    tqlayout->addWidget( widget );
+    layout->addWidget( widget );
     connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool )));
     KAboutData *about = new KAboutData(I18N_NOOP( "kcmkwinrules" ),
         I18N_NOOP( "Window-Specific Settings Configuration Module" ),
diff --git a/kwin/kcmkwin/kwinrules/kwinrules.desktop b/kwin/kcmkwin/kwinrules/kwinrules.desktop
index 3bd0e0c67..245994a8a 100644
--- a/kwin/kcmkwin/kwinrules/kwinrules.desktop
+++ b/kwin/kcmkwin/kwinrules/kwinrules.desktop
@@ -154,7 +154,7 @@ Keywords[cs]=velikost,pozice,umístění,stav,chování oken,pravidla
 Keywords[csb]=miara,pòłożenié,stón,ùchòwanié òknół,òkna,spamiãtanié nastôwów,zapamiãtanié nastôwów,regle
 Keywords[cy]=maint,lleoliad,cyflwr,ffenestr,ymddygiad,ffenestri,penodol,ffyrdd osgoi,cofio,rheolau
 Keywords[da]=størrelse,position,tilstand,vinduesopførsel,vinduer,specifik, omgåelse,husk,regler
-Keywords[de]=Größe,Position,tqStatus,Fensterverhalten,Fenster,Regeln
+Keywords[de]=Größe,Position,Status,Fensterverhalten,Fenster,Regeln
 Keywords[el]=μέγεθος,θέση,κατάσταση,συμπεριφορά παραθύρου,παράθυρα,ειδικές,λύσεις,αποθήκευση,κανόνων
 Keywords[en_GB]=size,position,state,window behaviour,windows,specific,workarounds,remember,rules
 Keywords[eo]=grandeco,pozicio,stato,fenestra konduto,fenestroj,reguloj
@@ -180,7 +180,7 @@ Keywords[lv]=izmērs,novietojums,statuss,loga izturēšanās,logi,specifisks,apj
 Keywords[mk]=size,position,state,window behavior,windows,specific,workarounds,remember,rules,големина,позиција,состојба,однесување на прозорец,специфично,заобиколни
 Keywords[mt]=size,position,state,window behavior,windows,specific,workarounds,remember,rules,daqs
 Keywords[nb]=størrelse,posisjon,status,vindusoppførsel,vinduer,spesifikk,jukseløsninger,husk,regler
-Keywords[nds]=Grött,Positschoon,tqStatus,Finsterbedregen,Finstern,enkel,enkelte,Regeln,behollen,workaround
+Keywords[nds]=Grött,Positschoon,Status,Finsterbedregen,Finstern,enkel,enkelte,Regeln,behollen,workaround
 Keywords[ne]=साइज, स्थिति, अवस्था, सञ्झ्याल व्यवहार, सञ्झ्यालहरू, निर्दिष्ट, कार्यक्षेत्र, याद गर्नुहोस्, नियम
 Keywords[nl]=grootte,positie,venstergedrag,vensters,specifiek,alternatieven,onthouden,regels
 Keywords[nn]=storleik,plassering,tilstand,vindaugsåtferd,vindauge,spesifikk,jukseløysingar,hugs,reglar
diff --git a/kwin/kcmkwin/kwinrules/main.cpp b/kwin/kcmkwin/kwinrules/main.cpp
index af25412f8..b58c96239 100644
--- a/kwin/kcmkwin/kwinrules/main.cpp
+++ b/kwin/kcmkwin/kwinrules/main.cpp
@@ -179,7 +179,7 @@ static Rules* findRule( const TQValueList< Rules* >& rules, Window wid, bool who
     if( type == NET::Unknown )
         ret->types = NET::NormalMask;
     else
-        ret->types = 1 << type; // convert type to its tqmask
+        ret->types = 1 << type; // convert type to its mask
     ret->title = title; // set, but make unimportant
     ret->titlematch = Rules::UnimportantMatch;
     ret->clientmachine = machine; // set, but make unimportant
diff --git a/kwin/kcmkwin/kwinrules/ruleslistbase.ui b/kwin/kcmkwin/kwinrules/ruleslistbase.ui
index b36a1987f..c2abdaa9d 100644
--- a/kwin/kcmkwin/kwinrules/ruleslistbase.ui
+++ b/kwin/kcmkwin/kwinrules/ruleslistbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Form1</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -77,7 +77,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>294</height>
@@ -86,6 +86,6 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.cpp b/kwin/kcmkwin/kwinrules/ruleswidget.cpp
index ea426e7f1..2525644d9 100644
--- a/kwin/kcmkwin/kwinrules/ruleswidget.cpp
+++ b/kwin/kcmkwin/kwinrules/ruleswidget.cpp
@@ -78,7 +78,7 @@ RulesWidget::RulesWidget( TQWidget* parent, const char* name )
               " until it is hidden (this action will be deleted after the window is hidden).</li>"
               "</ul>" );
     // window tabs have enable signals done in designer
-    // tqgeometry tab
+    // geometry tab
     SETUP( position, set );
     SETUP( size, set );
     SETUP( desktop, set );
@@ -106,7 +106,7 @@ RulesWidget::RulesWidget( TQWidget* parent, const char* name )
     SETUP( ignoreposition, force );
     SETUP( minsize, force );
     SETUP( maxsize, force );
-    SETUP( stricttqgeometry, force );
+    SETUP( strictgeometry, force );
     SETUP( disableglobalshortcuts, force );
     KWinModule module;
     int i;
@@ -126,7 +126,7 @@ void RulesWidget::updateEnable##var() \
     var->setEnabled( enable_##var->isChecked() && rule_##var->currentItem() != 0 ); \
     }
 
-// tqgeometry tab
+// geometry tab
 UPDATE_ENABLE_SLOT( position )
 UPDATE_ENABLE_SLOT( size )
 UPDATE_ENABLE_SLOT( desktop )
@@ -158,7 +158,7 @@ UPDATE_ENABLE_SLOT( type )
 UPDATE_ENABLE_SLOT( ignoreposition )
 UPDATE_ENABLE_SLOT( minsize )
 UPDATE_ENABLE_SLOT( maxsize )
-UPDATE_ENABLE_SLOT( stricttqgeometry )
+UPDATE_ENABLE_SLOT( strictgeometry )
 UPDATE_ENABLE_SLOT( disableglobalshortcuts )
 
 #undef UPDATE_ENABLE_SLOT
@@ -428,7 +428,7 @@ void RulesWidget::setRules( Rules* rules )
     CHECKBOX_FORCE_RULE( ignoreposition, );
     LINEEDIT_FORCE_RULE( minsize, sizeToStr );
     LINEEDIT_FORCE_RULE( maxsize, sizeToStr );
-    CHECKBOX_FORCE_RULE( stricttqgeometry, );
+    CHECKBOX_FORCE_RULE( strictgeometry, );
     CHECKBOX_FORCE_RULE( disableglobalshortcuts, );
     }
 
@@ -518,7 +518,7 @@ Rules* RulesWidget::rules() const
     CHECKBOX_FORCE_RULE( ignoreposition, );
     LINEEDIT_FORCE_RULE( minsize, strToSize );
     LINEEDIT_FORCE_RULE( maxsize, strToSize );
-    CHECKBOX_FORCE_RULE( stricttqgeometry, );
+    CHECKBOX_FORCE_RULE( strictgeometry, );
     CHECKBOX_FORCE_RULE( disableglobalshortcuts, );
     return rules;
     }
@@ -621,7 +621,7 @@ void RulesWidget::prefillUnusedValues( const KWin::WindowInfo& info )
     CHECKBOX_PREFILL( above,, info.state() & NET::KeepAbove );
     CHECKBOX_PREFILL( below,, info.state() & NET::KeepBelow );
     // noborder is only internal KWin information, so let's guess
-    CHECKBOX_PREFILL( noborder,, info.frameGeometry() == info.tqgeometry() );
+    CHECKBOX_PREFILL( noborder,, info.frameGeometry() == info.geometry() );
     CHECKBOX_PREFILL( skiptaskbar,, info.state() & NET::SkipTaskbar );
     CHECKBOX_PREFILL( skippager,, info.state() & NET::SkipPager );
     //CHECKBOX_PREFILL( acceptfocus, );
@@ -635,7 +635,7 @@ void RulesWidget::prefillUnusedValues( const KWin::WindowInfo& info )
     //CHECKBOX_PREFILL( ignoreposition, );
     LINEEDIT_PREFILL( minsize, sizeToStr, info.frameGeometry().size() );
     LINEEDIT_PREFILL( maxsize, sizeToStr, info.frameGeometry().size() );
-    //CHECKBOX_PREFILL( stricttqgeometry, );
+    //CHECKBOX_PREFILL( strictgeometry, );
     //CHECKBOX_PREFILL( disableglobalshortcuts, );
     }
 
@@ -661,7 +661,7 @@ bool RulesWidget::finalCheck()
             all_types = false;
     if( wmclass_match->currentItem() == Rules::UnimportantMatch && all_types )
         {
-        if( KMessageBox::warningContinueCancel( tqtopLevelWidget(),
+        if( KMessageBox::warningContinueCancel( topLevelWidget(),
             i18n( "You have specified the window class as unimportant.\n"
                   "This means the settings will possibly apply to windows from all applications. "
                   "If you really want to create a generic setting, it is recommended you at least "
@@ -673,14 +673,14 @@ bool RulesWidget::finalCheck()
 
 void RulesWidget::prepareWindowSpecific( WId window )
     {
-    tabs->setCurrentPage( 2 ); // tqgeometry tab, skip tabs for window identification
+    tabs->setCurrentPage( 2 ); // geometry tab, skip tabs for window identification
     KWin::WindowInfo info( window, -1U, -1U ); // read everything
     prefillUnusedValues( info );
     }
 
 void RulesWidget::shortcutEditClicked()
     {
-    EditShortcutDialog dlg( tqtopLevelWidget());
+    EditShortcutDialog dlg( topLevelWidget());
     dlg.setShortcut( shortcut->text());
     if( dlg.exec() == TQDialog::Accepted )
         shortcut->setText( dlg.shortcut());
@@ -735,7 +735,7 @@ EditShortcut::EditShortcut( TQWidget* parent, const char* name )
 
 void EditShortcut::editShortcut()
     {
-    ShortcutDialog dlg( KShortcut( shortcut->text()), tqtopLevelWidget());
+    ShortcutDialog dlg( KShortcut( shortcut->text()), topLevelWidget());
     if( dlg.exec() == TQDialog::Accepted )
         shortcut->setText( dlg.shortcut().toString());
     }
diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.h b/kwin/kcmkwin/kwinrules/ruleswidget.h
index ec38818ff..b47ad88ab 100644
--- a/kwin/kcmkwin/kwinrules/ruleswidget.h
+++ b/kwin/kcmkwin/kwinrules/ruleswidget.h
@@ -54,7 +54,7 @@ class RulesWidget
         virtual void machineMatchChanged();
         virtual void shortcutEditClicked();
     private slots:
-        // tqgeometry tab
+        // geometry tab
         void updateEnableposition();
         void updateEnablesize();
         void updateEnabledesktop();
@@ -81,7 +81,7 @@ class RulesWidget
         void updateEnableignoreposition();
         void updateEnableminsize();
         void updateEnablemaxsize();
-        void updateEnablestricttqgeometry();
+        void updateEnablestrictgeometry();
         void updateEnableshortcut();
         void updateEnabledisableglobalshortcuts();
         // internal
diff --git a/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui b/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui
index 0b23f2ed2..01c1b9918 100644
--- a/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui
+++ b/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Form2</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -87,7 +87,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -129,7 +129,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>212</width>
                                 <height>20</height>
@@ -157,7 +157,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>211</width>
                                 <height>20</height>
@@ -199,7 +199,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>212</width>
                                 <height>20</height>
@@ -230,7 +230,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>211</width>
                                 <height>20</height>
@@ -271,7 +271,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>270</width>
                                         <height>20</height>
@@ -296,7 +296,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>269</width>
                                         <height>20</height>
@@ -470,7 +470,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>199</width>
                                 <height>20</height>
@@ -501,7 +501,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>199</width>
                                 <height>20</height>
@@ -543,7 +543,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>199</width>
                                 <height>20</height>
@@ -574,7 +574,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>199</width>
                                 <height>20</height>
@@ -616,7 +616,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>199</width>
                                 <height>20</height>
@@ -647,7 +647,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>199</width>
                                 <height>20</height>
@@ -1181,7 +1181,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
@@ -1347,7 +1347,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>171</width>
                                 <height>20</height>
@@ -1364,7 +1364,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>290</width>
                                 <height>20</height>
@@ -1381,7 +1381,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>290</width>
                                 <height>20</height>
@@ -1398,7 +1398,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>290</width>
                                 <height>20</height>
@@ -1415,7 +1415,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>290</width>
                                 <height>20</height>
@@ -1432,7 +1432,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>290</width>
                                 <height>20</height>
@@ -1449,7 +1449,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>290</width>
                                 <height>20</height>
@@ -1466,7 +1466,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>290</width>
                                 <height>20</height>
@@ -1796,7 +1796,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>80</height>
@@ -1847,7 +1847,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>181</width>
                                 <height>20</height>
@@ -2231,7 +2231,7 @@
                             <cstring>enable_ignoreposition</cstring>
                         </property>
                         <property name="text">
-                            <string>Ignore requested &amp;tqgeometry</string>
+                            <string>Ignore requested &amp;geometry</string>
                         </property>
                     </widget>
                     <widget class="KComboBox" row="3" column="1">
@@ -2278,7 +2278,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>160</height>
@@ -2287,10 +2287,10 @@
                     </spacer>
                     <widget class="QCheckBox" row="6" column="0">
                         <property name="name">
-                            <cstring>enable_stricttqgeometry</cstring>
+                            <cstring>enable_strictgeometry</cstring>
                         </property>
                         <property name="text">
-                            <string>Strictly obey tqgeometry</string>
+                            <string>Strictly obey geometry</string>
                         </property>
                         <property name="accel">
                             <string></string>
@@ -2313,7 +2313,7 @@
                             </property>
                         </item>
                         <property name="name">
-                            <cstring>rule_stricttqgeometry</cstring>
+                            <cstring>rule_strictgeometry</cstring>
                         </property>
                         <property name="enabled">
                             <bool>false</bool>
@@ -2321,7 +2321,7 @@
                     </widget>
                     <widget class="QCheckBox" row="6" column="3">
                         <property name="name">
-                            <cstring>stricttqgeometry</cstring>
+                            <cstring>strictgeometry</cstring>
                         </property>
                         <property name="enabled">
                             <bool>false</bool>
@@ -2523,9 +2523,9 @@
     <tabstop>enable_maxsize</tabstop>
     <tabstop>rule_maxsize</tabstop>
     <tabstop>maxsize</tabstop>
-    <tabstop>enable_stricttqgeometry</tabstop>
-    <tabstop>rule_stricttqgeometry</tabstop>
-    <tabstop>stricttqgeometry</tabstop>
+    <tabstop>enable_strictgeometry</tabstop>
+    <tabstop>rule_strictgeometry</tabstop>
+    <tabstop>strictgeometry</tabstop>
     <tabstop>enable_disableglobalshortcuts</tabstop>
     <tabstop>rule_disableglobalshortcuts</tabstop>
     <tabstop>disableglobalshortcuts</tabstop>
@@ -2539,8 +2539,8 @@
     <slot access="protected" specifier="pure virtual">machineMatchChanged()</slot>
     <slot access="protected" specifier="pure virtual">shortcutEditClicked()</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>kpushbutton.h</includehint>