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

5 files changed, 71 insertions, 71 deletions

diff --git a/kwin/kcmkwin/kwinoptions/ChangeLog b/kwin/kcmkwin/kwinoptions/ChangeLog
index 612331796..0b923864c 100644
--- a/kwin/kcmkwin/kwinoptions/ChangeLog
+++ b/kwin/kcmkwin/kwinoptions/ChangeLog
@@ -23,7 +23,7 @@
 
 1998-11-06  Cristian Tibirna  <[email protected]>
 
-	* titlebar.[cpp,h] : added title tqalignment config
+	* titlebar.[cpp,h] : added title alignment config
 
 1998-10-23  Cristian Tibirna  <[email protected]>
 
@@ -37,12 +37,12 @@
 
 1998-10-21  Cristian Tibirna  <[email protected]>
 
-	* desktop.[cpp,h]: now with consistent tqlayout use
+	* desktop.[cpp,h]: now with consistent layout use
 		resizeEvent() deleted
 
 1998-10-19  Cristian Tibirna  <[email protected]>
 
-	* windows.[cpp,h]: now with consistent tqlayout use
+	* windows.[cpp,h]: now with consistent layout use
 		resizeEvent() deleted
 
 1998-10-18  Cristian Tibirna  <[email protected]>
diff --git a/kwin/kcmkwin/kwinoptions/main.cpp b/kwin/kcmkwin/kwinoptions/main.cpp
index dc8273f25..ac19a5d30 100644
--- a/kwin/kcmkwin/kwinoptions/main.cpp
+++ b/kwin/kcmkwin/kwinoptions/main.cpp
@@ -88,37 +88,37 @@ KWinOptions::KWinOptions(TQWidget *parent, const char *name)
 {
   mConfig = new KConfig("kwinrc", false, true);
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+  TQVBoxLayout *layout = new TQVBoxLayout(this);
   tab = new TQTabWidget(this);
-  tqlayout->addWidget(tab);
+  layout->addWidget(tab);
 
   mFocus = new KFocusConfig(false, mConfig, this, "KWin Focus Config");
-  mFocus->tqlayout()->setMargin( KDialog::marginHint() );
+  mFocus->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mFocus, i18n("&Focus"));
   connect(mFocus, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
 
   mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this, "KWin TitleBar Actions");
-  mTitleBarActions->tqlayout()->setMargin( KDialog::marginHint() );
+  mTitleBarActions->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mTitleBarActions, i18n("&Titlebar Actions"));
   connect(mTitleBarActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
 
   mWindowActions = new KWindowActionsConfig(false, mConfig, this, "KWin Window Actions");
-  mWindowActions->tqlayout()->setMargin( KDialog::marginHint() );
+  mWindowActions->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mWindowActions, i18n("Window Actio&ns"));
   connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
 
   mMoving = new KMovingConfig(false, mConfig, this, "KWin Moving");
-  mMoving->tqlayout()->setMargin( KDialog::marginHint() );
+  mMoving->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mMoving, i18n("&Moving"));
   connect(mMoving, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
 
   mAdvanced = new KAdvancedConfig(false, mConfig, this, "KWin Advanced");
-  mAdvanced->tqlayout()->setMargin( KDialog::marginHint() );
+  mAdvanced->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mAdvanced, i18n("Ad&vanced"));
   connect(mAdvanced, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
 
   mTranslucency = new KTranslucencyConfig(false, mConfig, this, "KWin Translucency");
-  mTranslucency->tqlayout()->setMargin( KDialog::marginHint() );
+  mTranslucency->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mTranslucency, i18n("&Translucency"));
   connect(mTranslucency, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
     
@@ -206,17 +206,17 @@ KActionsOptions::KActionsOptions(TQWidget *parent, const char *name)
 {
   mConfig = new KConfig("kwinrc", false, true);
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+  TQVBoxLayout *layout = new TQVBoxLayout(this);
   tab = new TQTabWidget(this);
-  tqlayout->addWidget(tab);
+  layout->addWidget(tab);
 
   mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this, "KWin TitleBar Actions");
-  mTitleBarActions->tqlayout()->setMargin( KDialog::marginHint() );
+  mTitleBarActions->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mTitleBarActions, i18n("&Titlebar Actions"));
   connect(mTitleBarActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
 
   mWindowActions = new KWindowActionsConfig(false, mConfig, this, "KWin Window Actions");
-  mWindowActions->tqlayout()->setMargin( KDialog::marginHint() );
+  mWindowActions->layout()->setMargin( KDialog::marginHint() );
   tab->addTab(mWindowActions, i18n("Window Actio&ns"));
   connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
 }
diff --git a/kwin/kcmkwin/kwinoptions/mouse.cpp b/kwin/kcmkwin/kwinoptions/mouse.cpp
index 07acd64cf..6adba1f89 100644
--- a/kwin/kcmkwin/kwinoptions/mouse.cpp
+++ b/kwin/kcmkwin/kwinoptions/mouse.cpp
@@ -136,7 +136,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
   : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
 {
   TQString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3;
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+  TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
   TQGrid *grid;
   TQGroupBox *box;
   TQLabel *label;
@@ -147,10 +147,10 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
 
 /** Titlebar doubleclick ************/
 
-  TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout);
+  TQHBoxLayout *hlayout = new TQHBoxLayout(layout);
 
   label = new TQLabel(i18n("&Titlebar double-click:"), this);
-  htqlayout->addWidget(label);
+  hlayout->addWidget(label);
   TQWhatsThis::add( label, i18n("Here you can customize mouse click behavior when double clicking on the"
     " titlebar of a window.") );
 
@@ -163,19 +163,19 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
   combo->insertItem(i18n("Lower"));
   combo->insertItem(i18n("On All Desktops"));
   combo->insertItem(i18n("Nothing"));
-  combo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
+  combo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
   connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
-  htqlayout->addWidget(combo);
+  hlayout->addWidget(combo);
   coTiDbl = combo;
   TQWhatsThis::add(combo, i18n("Behavior on <em>double</em> click into the titlebar."));
 
   label->setBuddy(combo);
 
 /** Mouse Wheel Events  **************/
-  TQHBoxLayout *htqlayoutW = new TQHBoxLayout(tqlayout);
+  TQHBoxLayout *hlayoutW = new TQHBoxLayout(layout);
   strMouseWheel = i18n("Titlebar wheel event:");
   label = new TQLabel(strMouseWheel, this);
-  htqlayoutW->addWidget(label);
+  hlayoutW->addWidget(label);
   txtButton4 = i18n("Handle mouse wheel events");
   TQWhatsThis::add( label, txtButton4);
   
@@ -188,9 +188,9 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
   comboW->insertItem(i18n("Move to Previous/Next Desktop"));  
   comboW->insertItem(i18n("Change Opacity"));  
   comboW->insertItem(i18n("Nothing"));  
-  comboW->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
+  comboW->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
   connect(comboW, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
-  htqlayoutW->addWidget(comboW);
+  hlayoutW->addWidget(comboW);
   coTiAct4 = comboW;
   TQWhatsThis::add(comboW, txtButton4);
   label->setBuddy(comboW);
@@ -198,9 +198,9 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
 /** Titlebar and frame  **************/
 
   box = new TQVGroupBox( i18n("Titlebar && Frame"), this, "Titlebar and Frame");
-  box->tqlayout()->setMargin(KDialog::marginHint());
-  box->tqlayout()->setSpacing(KDialog::spacingHint());
-  tqlayout->addWidget(box);
+  box->layout()->setMargin(KDialog::marginHint());
+  box->layout()->setSpacing(KDialog::spacingHint());
+  layout->addWidget(box);
   TQWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on the"
                              " titlebar or the frame of a window.") );
 
@@ -219,8 +219,8 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
 
   if ( leftHandedMouse )
   {
-     tqSwap(strMouseButton1, strMouseButton3);
-     tqSwap(txtButton1, txtButton3);
+     qSwap(strMouseButton1, strMouseButton3);
+     qSwap(txtButton1, txtButton3);
   }
 
   label = new TQLabel(strMouseButton1, grid);
@@ -235,7 +235,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
 
 
   label = new TQLabel(i18n("Active"), grid);
-  label->tqsetAlignment(AlignCenter);
+  label->setAlignment(AlignCenter);
   TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar"
                                " or the frame of an active window.") );
 
@@ -256,7 +256,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
      "<em>active</em> window.");
 
   // Be nice to left handed users
-  if ( leftHandedMouse ) tqSwap(txtButton1, txtButton3);
+  if ( leftHandedMouse ) qSwap(txtButton1, txtButton3);
 
   TQWhatsThis::add(combo, txtButton1);
 
@@ -289,10 +289,10 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
      "<em>inactive</em> window.");
 
   // Be nice to left handed users
-  if ( leftHandedMouse ) tqSwap(txtButton1, txtButton3);
+  if ( leftHandedMouse ) qSwap(txtButton1, txtButton3);
 
   label = new TQLabel(i18n("Inactive"), grid);
-  label->tqsetAlignment(AlignCenter);
+  label->setAlignment(AlignCenter);
   TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar"
                                " or the frame of an inactive window.") );
 
@@ -327,9 +327,9 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
 /**  Maximize Button ******************/
 
   box = new TQHGroupBox(i18n("Maximize Button"), this, "Maximize Button");
-  box->tqlayout()->setMargin(KDialog::marginHint());
-  box->tqlayout()->setSpacing(KDialog::spacingHint());
-  tqlayout->addWidget(box);
+  box->layout()->setMargin(KDialog::marginHint());
+  box->layout()->setSpacing(KDialog::spacingHint());
+  layout->addWidget(box);
   TQWhatsThis::add( box,
     i18n("Here you can customize behavior when clicking on the maximize button.") );
 
@@ -345,8 +345,8 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
 
   if ( leftHandedMouse ) // Be nice to lefties
   {
-     tqSwap(strMouseButton[0], strMouseButton[2]);
-     tqSwap(txtButton[0], txtButton[2]);
+     qSwap(strMouseButton[0], strMouseButton[2]);
+     qSwap(txtButton[0], txtButton[2]);
   }
 
   createMaxButtonPixmaps();
@@ -356,19 +356,19 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
 
     TQLabel * label = new TQLabel(strMouseButton[b], box);
     TQWhatsThis::add( label,    txtButton[b] );
-    label   ->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
+    label   ->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
 
     coMax[b] = new ToolTipComboBox(box, tbl_Max);
     for (int t = 0; t < 3; ++t) coMax[b]->insertItem(maxButtonPixmaps[t]);
     connect(coMax[b], TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
     connect(coMax[b], TQT_SIGNAL(activated(int)), coMax[b], TQT_SLOT(changed()));
     TQWhatsThis::add( coMax[b], txtButton[b] );
-    coMax[b]->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
+    coMax[b]->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
   }
 
   connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
 
-  tqlayout->addStretch();
+  layout->addStretch();
 
   load();
 }
@@ -588,7 +588,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
   : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
 {
   TQString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3, strAllW;
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+  TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
   TQGrid *grid;
   TQGroupBox *box;
   TQLabel *label;
@@ -600,9 +600,9 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
 /**  Inactive inner window ******************/
 
   box = new TQVGroupBox(i18n("Inactive Inner Window"), this, "Inactive Inner Window");
-  box->tqlayout()->setMargin(KDialog::marginHint());
-  box->tqlayout()->setSpacing(KDialog::spacingHint());
-  tqlayout->addWidget(box);
+  box->layout()->setMargin(KDialog::marginHint());
+  box->layout()->setSpacing(KDialog::spacingHint());
+  layout->addWidget(box);
   TQWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on an inactive"
                              " inner window ('inner' means: not titlebar, not frame).") );
 
@@ -618,8 +618,8 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
 
   if ( leftHandedMouse )
   {
-     tqSwap(strMouseButton1, strMouseButton3);
-     tqSwap(txtButton1, txtButton3);
+     qSwap(strMouseButton1, strMouseButton3);
+     qSwap(txtButton1, txtButton3);
   }
 
   strWin1 = i18n("In this row you can customize left click behavior when clicking into"
@@ -629,7 +629,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
      " an inactive inner window ('inner' means: not titlebar, not frame).");
 
   // Be nice to lefties
-  if ( leftHandedMouse ) tqSwap(strWin1, strWin3);
+  if ( leftHandedMouse ) qSwap(strWin1, strWin3);
 
   label = new TQLabel(strMouseButton1, grid);
   TQWhatsThis::add( label, strWin1 );
@@ -670,9 +670,9 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
 /** Inner window, titlebar and frame **************/
 
   box = new TQVGroupBox(i18n("Inner Window, Titlebar && Frame"), this, "Inner Window, Titlebar and Frame");
-  box->tqlayout()->setMargin(KDialog::marginHint());
-  box->tqlayout()->setSpacing(KDialog::spacingHint());
-  tqlayout->addWidget(box);
+  box->layout()->setMargin(KDialog::marginHint());
+  box->layout()->setSpacing(KDialog::spacingHint());
+  layout->addWidget(box);
   TQWhatsThis::add( box, i18n("Here you can customize KDE's behavior when clicking somewhere into"
                              " a window while pressing a modifier key."));
 
@@ -696,8 +696,8 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
 
   if ( leftHandedMouse )
   {
-     tqSwap(strMouseButton1, strMouseButton3);
-     tqSwap(strAll1, strAll3);
+     qSwap(strMouseButton1, strMouseButton3);
+     qSwap(strAll1, strAll3);
   }
 
   label = new TQLabel(strMouseButton1, grid);
@@ -764,7 +764,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
   coAllW =  combo;
   TQWhatsThis::add( combo, strAllW );
 
-  tqlayout->addStretch();
+  layout->addStretch();
 
   load();
 }
diff --git a/kwin/kcmkwin/kwinoptions/windows.cpp b/kwin/kcmkwin/kwinoptions/windows.cpp
index d7c3893c6..cc8643af9 100644
--- a/kwin/kcmkwin/kwinoptions/windows.cpp
+++ b/kwin/kcmkwin/kwinoptions/windows.cpp
@@ -110,7 +110,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren
     //iTLabel = new TQLabel(i18n("  Allowed overlap:\n"
     //                         "(% of desktop space)"),
     //             plcBox);
-    //iTLabel->tqsetAlignment(AlignTop|AlignHCenter);
+    //iTLabel->setAlignment(AlignTop|AlignHCenter);
     //pLay->addWidget(iTLabel,1,1);
 
     //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox);
@@ -124,7 +124,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren
     fcsBox = new TQButtonGroup(i18n("Focus"),this);
     fcsBox->setColumnLayout( 0, Qt::Horizontal );
 
-    TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->tqlayout(),
+    TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->layout(),
         KDialog::spacingHint());
 
     TQBoxLayout *cLay = new TQHBoxLayout(fLay);
@@ -192,8 +192,8 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren
     connect(clickRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clickRaiseOnTog(bool)));
     fLay->addWidget(clickRaiseOn);
 
-//     fLay->addColSpacing(0,QMAX(autoRaiseOn->tqsizeHint().width(),
-//                                clickRaiseOn->tqsizeHint().width()) + 15);
+//     fLay->addColSpacing(0,QMAX(autoRaiseOn->sizeHint().width(),
+//                                clickRaiseOn->sizeHint().width()) + 15);
 
     TQWhatsThis::add( autoRaiseOn, i18n("When this option is enabled, a window in the background will automatically"
                                        " come to the front when the mouse pointer has been over it for some time.") );
@@ -236,7 +236,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren
 
     kbdBox = new TQButtonGroup(i18n("Navigation"), this);
     kbdBox->setColumnLayout( 0, Qt::Horizontal );
-    TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->tqlayout(), KDialog::spacingHint());
+    TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->layout(), KDialog::spacingHint());
 
     altTabPopup = new TQCheckBox( i18n("Show window list while switching windows"), kbdBox );
     kLay->addWidget( altTabPopup );
@@ -573,7 +573,7 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, TQWidget *
     //iTLabel = new TQLabel(i18n("  Allowed overlap:\n"
     //                         "(% of desktop space)"),
     //             plcBox);
-    //iTLabel->tqsetAlignment(AlignTop|AlignHCenter);
+    //iTLabel->setAlignment(AlignTop|AlignHCenter);
     //pLay->addWidget(iTLabel,1,1);
 
     //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox);
@@ -831,7 +831,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare
     windowsBox = new TQButtonGroup(i18n("Windows"), this);
     windowsBox->setColumnLayout( 0, Qt::Horizontal );
 
-    TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->tqlayout(), KDialog::spacingHint());
+    TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->layout(), KDialog::spacingHint());
 
     TQBoxLayout *bLay = new TQVBoxLayout;
     wLay->addLayout(bLay);
@@ -848,9 +848,9 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare
                                           " while resizing it, instead of just showing a window 'skeleton'. The result may not be satisfying"
                                           " on slow machines.") );
 
-    tqgeometryTipOn = new TQCheckBox(i18n("Display window &tqgeometry when moving or resizing"), windowsBox);
-    bLay->addWidget(tqgeometryTipOn);
-    TQWhatsThis::add(tqgeometryTipOn, i18n("Enable this option if you want a window's tqgeometry to be displayed"
+    geometryTipOn = new TQCheckBox(i18n("Display window &geometry when moving or resizing"), windowsBox);
+    bLay->addWidget(geometryTipOn);
+    TQWhatsThis::add(geometryTipOn, i18n("Enable this option if you want a window's geometry to be displayed"
                                         " while it is being moved or resized. The window position relative"
                                         " to the top-left corner of the screen is displayed together with"
                                         " its size."));
@@ -877,11 +877,11 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare
     connect(minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMinimizeAnimSpeed(int)));
 
     minimizeAnimSlowLabel= new TQLabel(i18n("Slow"),windowsBox);
-    minimizeAnimSlowLabel->tqsetAlignment(Qt::AlignTop|Qt::AlignLeft);
+    minimizeAnimSlowLabel->setAlignment(Qt::AlignTop|Qt::AlignLeft);
     rLay->addWidget(minimizeAnimSlowLabel,1,1);
 
     minimizeAnimFastLabel= new TQLabel(i18n("Fast"),windowsBox);
-    minimizeAnimFastLabel->tqsetAlignment(Qt::AlignTop|Qt::AlignRight);
+    minimizeAnimFastLabel->setAlignment(Qt::AlignTop|Qt::AlignRight);
     rLay->addWidget(minimizeAnimFastLabel,1,2);
 
     wtstr = i18n("Here you can set the speed of the animation shown when windows are"
@@ -940,7 +940,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare
     //iTLabel = new TQLabel(i18n("  Allowed overlap:\n"
     //                         "(% of desktop space)"),
     //             plcBox);
-    //iTLabel->tqsetAlignment(AlignTop|AlignHCenter);
+    //iTLabel->setAlignment(AlignTop|AlignHCenter);
     //pLay->addWidget(iTLabel,1,1);
 
     //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox);
@@ -986,7 +986,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare
     // Any changes goes to slotChanged()
     connect( opaque, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
     connect( resizeOpaqueOn, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-    connect( tqgeometryTipOn, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
+    connect( geometryTipOn, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
     connect( minimizeAnimOn, TQT_SIGNAL(clicked() ), TQT_SLOT(changed()));
     connect( minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
     connect( moveResizeMaximized, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
@@ -1014,12 +1014,12 @@ void KMovingConfig::setMove(int trans)
 
 void KMovingConfig::setGeometryTip(bool showGeometryTip)
 {
-    tqgeometryTipOn->setChecked(showGeometryTip);
+    geometryTipOn->setChecked(showGeometryTip);
 }
 
 bool KMovingConfig::getGeometryTip()
 {
-    return tqgeometryTipOn->isChecked();
+    return geometryTipOn->isChecked();
 }
 
 // placement policy --- CT 31jan98 ---
diff --git a/kwin/kcmkwin/kwinoptions/windows.h b/kwin/kcmkwin/kwinoptions/windows.h
index 380a34809..83dc70b66 100644
--- a/kwin/kcmkwin/kwinoptions/windows.h
+++ b/kwin/kcmkwin/kwinoptions/windows.h
@@ -164,7 +164,7 @@ private:
   TQButtonGroup *windowsBox;
   TQCheckBox *opaque;
   TQCheckBox *resizeOpaqueOn;
-  TQCheckBox *tqgeometryTipOn;
+  TQCheckBox *geometryTipOn;
   TQCheckBox* minimizeAnimOn;
   TQSlider *minimizeAnimSlider;
   TQLabel *minimizeAnimSlowLabel, *minimizeAnimFastLabel;