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

This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.

2 files changed, 14 insertions, 14 deletions

diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index db40c12d6..206389b20 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -4,7 +4,7 @@
 #include <tqtimer.h>
 #include <tqpainter.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 
 #include <kdialogbase.h>
@@ -585,7 +585,7 @@ void KAccessApp::createDialogContents() {
       TQVBoxLayout * vlay = new TQVBoxLayout(lay);
 
       featuresLabel = new TQLabel( "", contents );
-      featuresLabel->setAlignment( WordBreak|AlignVCenter );
+      featuresLabel->tqsetAlignment( WordBreak|AlignVCenter );
       vlay->addWidget( featuresLabel );
       vlay->addStretch();
 
diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index ff36c7943..64c33682a 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -12,7 +12,7 @@
 #include <dcopref.h>
 
 #include <tqtabwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
@@ -248,7 +248,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  TQVBoxLayout *vvbox = new TQVBoxLayout(grp->layout(),
+  TQVBoxLayout *vvbox = new TQVBoxLayout(grp->tqlayout(),
       KDialogBase::spacingHint());
 
   systemBell = new TQCheckBox(i18n("Use &system bell"), grp);
@@ -291,7 +291,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
 
   visibleBell = new TQCheckBox(i18n("&Use visible bell"), grp);
   vvbox->addWidget(visibleBell);
@@ -311,7 +311,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   TQWhatsThis::add( flashScreen, i18n("The screen will turn to a custom color for the amount of time specified below.") );
   hbox->addSpacing(12);
   colorButton = new KColorButton(grp);
-  colorButton->setFixedWidth(colorButton->sizeHint().height()*2);
+  colorButton->setFixedWidth(colorButton->tqsizeHint().height()*2);
   hbox->addWidget(colorButton);
   hbox->addStretch();
   TQWhatsThis::add( colorButton, i18n("Click here to choose the color used for the \"flash screen\" visible bell.") );
@@ -353,7 +353,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
 
   stickyKeys = new TQCheckBox(i18n("Use &sticky keys"), grp);
   vvbox->addWidget(stickyKeys);
@@ -377,7 +377,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
 
   toggleKeysBeep = new TQCheckBox(i18n("Use system bell whenever a locking key gets activated or deactivated"), grp);
   vvbox->addWidget(toggleKeysBeep);
@@ -388,7 +388,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint());
   hbox->addStretch(1);
   kNotifyModifiersButton = new TQPushButton(i18n("Configure System Notification..."), grp);
-  kNotifyModifiersButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+  kNotifyModifiersButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
   hbox->addWidget(kNotifyModifiersButton);
 
   connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
@@ -415,7 +415,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
 
   slowKeys = new TQCheckBox(i18n("&Use slow keys"), grp);
   vvbox->addWidget(slowKeys);
@@ -447,7 +447,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
 
   bounceKeys = new TQCheckBox(i18n("Use bou&nce keys"), grp);
   vvbox->addWidget(bounceKeys);
@@ -491,7 +491,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
 
   gestures = new TQCheckBox(i18n("Use gestures for activating sticky keys and slow keys"), grp);
   vvbox->addWidget(gestures);
@@ -521,7 +521,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
 
   accessxBeep = new TQCheckBox(i18n("Use the system bell whenever a gesture is used to turn an accessibility feature on or off"), grp);
   vvbox->addWidget(accessxBeep);
@@ -536,7 +536,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint());
   hbox->addStretch(1);
   kNotifyAccessXButton = new TQPushButton(i18n("Configure System Notification..."), grp);
-  kNotifyAccessXButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+  kNotifyAccessXButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
   hbox->addWidget(kNotifyAccessXButton);
 
   connect(gestures, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));