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

22 files changed, 132 insertions, 132 deletions

diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp
index 44c1822..be1c18a 100644
--- a/klaptopdaemon/acpi.cpp
+++ b/klaptopdaemon/acpi.cpp
@@ -40,7 +40,7 @@
 #include <kprocess.h>
 
 // other TQt headers:
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqhbox.h>
@@ -63,7 +63,7 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name)
 
     TQLabel *tmp_label = new TQLabel( i18n("This panel provides information about your system's ACPI implementation "
 					 "and lets you have access to some of the extra features provided by ACPI"), this );
-    tmp_label->tqsetAlignment( TQt::WordBreak );
+    tmp_label->setAlignment( TQt::WordBreak );
     top_layout->addWidget( tmp_label );
 
     tmp_label = new TQLabel( i18n("NOTE: the Linux ACPI implementation is still a 'work in progress'. "
@@ -73,12 +73,12 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name)
 				"You should test these features very gingerly - save all your work, check them "
 				"on and try a suspend/standby/hibernate from the popup menu on the battery icon "
 				"in the panel if it fails to come back successfully uncheck the box again."), this );
-    tmp_label->tqsetAlignment( TQt::WordBreak );
+    tmp_label->setAlignment( TQt::WordBreak );
     top_layout->addWidget( tmp_label );
 
     tmp_label = new TQLabel( i18n("Some changes made on this page may require you to quit the laptop panel "
 				"and start it again to take effect"), this );
-    tmp_label->tqsetAlignment( TQt::WordBreak );
+    tmp_label->setAlignment( TQt::WordBreak );
     top_layout->addWidget( tmp_label );
 
     bool can_enable = laptop_portable::has_acpi(1);	// is helper ready
@@ -132,7 +132,7 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name)
 				"/proc/acpi/sleep writeable by anyone every time your system boots "
 				"or use the button below to make the KDE ACPI helper application "
 				"set-uid root"), this );
-    tmp_label->tqsetAlignment( TQt::WordBreak );
+    tmp_label->setAlignment( TQt::WordBreak );
     top_layout->addWidget( tmp_label );
     ll = new TQHBoxLayout();
     TQPushButton *setupButton = new TQPushButton(i18n("Setup Helper Application"), this);
@@ -145,7 +145,7 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name)
 
 
     top_layout->addStretch(1);
-    top_layout->addWidget( new TQLabel( i18n("Version: %1").tqarg(LAPTOP_VERSION), this), 0, TQt::AlignRight );
+    top_layout->addWidget( new TQLabel( i18n("Version: %1").arg(LAPTOP_VERSION), this), 0, TQt::AlignRight );
 
 
     load();      
diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp
index 3869457..742f88a 100644
--- a/klaptopdaemon/apm.cpp
+++ b/klaptopdaemon/apm.cpp
@@ -41,7 +41,7 @@
 #include <kprocess.h>
 
 // other TQt headers:
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqhbox.h>
@@ -63,7 +63,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name)
 
     TQLabel *tmp_label = new TQLabel( i18n("This panel lets you configure your APM system and lets "
 					"you have access to some of the extra features provided by it"), this );
-    tmp_label->tqsetAlignment( TQt::WordBreak );
+    tmp_label->setAlignment( TQt::WordBreak );
     top_layout->addWidget( tmp_label );
     
     tmp_label = new TQLabel( i18n("NOTE: some APM implementations have buggy suspend/standby "
@@ -71,12 +71,12 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name)
 				"all your work, check them on and try a suspend/standby from "
 				"the popup menu on the battery icon in the panel if it fails to come "
 				"back successfully uncheck the box again."), this );
-    tmp_label->tqsetAlignment( TQt::WordBreak );
+    tmp_label->setAlignment( TQt::WordBreak );
     top_layout->addWidget( tmp_label );
 
     tmp_label = new TQLabel( i18n("Some changes made on this page may require you to quit the laptop panel "
 				"and start it again to take effect"), this );
-    tmp_label->tqsetAlignment( TQt::WordBreak );
+    tmp_label->setAlignment( TQt::WordBreak );
     top_layout->addWidget( tmp_label );
 
     bool can_enable = laptop_portable::has_apm(1);	// is helper ready
@@ -100,8 +100,8 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name)
 				"ways you can enable this application, either make the file "
 				"/proc/apm writeable by anyone every time your system boots "
 				"or use the button below to make the %1 application "
-				"set-uid root").tqarg(apm_name), this );
-    tmp_label->tqsetAlignment( TQt::WordBreak );
+				"set-uid root").arg(apm_name), this );
+    tmp_label->setAlignment( TQt::WordBreak );
     top_layout->addWidget( tmp_label );
     TQHBoxLayout *ll = new TQHBoxLayout(top_layout);
     TQPushButton *setupButton = new TQPushButton(i18n("Setup Helper Application"), this);
@@ -114,7 +114,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name)
 	tmp_label = new TQLabel( i18n("Your system seems to have 'Software Suspend' installed, this can "
 				"be used to hibernate or 'suspend to disk' your system if you want "
 				"to use this for hibernation check the box below"), this );
-	tmp_label->tqsetAlignment( TQt::WordBreak );
+	tmp_label->setAlignment( TQt::WordBreak );
 	top_layout->addWidget( tmp_label );
      	enableSoftwareSuspendHibernate = new TQCheckBox( i18n("Enable software suspend for hibernate"), this );
     	top_layout->addWidget( enableSoftwareSuspendHibernate );
@@ -126,7 +126,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name)
 				"Suspend utility - KDE provides a utility to do this, if you "
 				"wish to use it you must make it set-uid root, the button "
 				"below will do this for you"), this );
-	tmp_label->tqsetAlignment( TQt::WordBreak );
+	tmp_label->setAlignment( TQt::WordBreak );
 	top_layout->addWidget( tmp_label );
         ll = new TQHBoxLayout(this);
         TQPushButton *setupSSButton = new TQPushButton(i18n("Setup SS Helper Application"), this);
@@ -141,7 +141,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name)
 
 
     top_layout->addStretch(1);
-    top_layout->addWidget( new TQLabel( i18n("Version: %1").tqarg(LAPTOP_VERSION), this), 0, TQt::AlignRight );
+    top_layout->addWidget( new TQLabel( i18n("Version: %1").arg(LAPTOP_VERSION), this), 0, TQt::AlignRight );
 
 
     load();      
@@ -158,7 +158,7 @@ void ApmConfig::setupHelper()
 	if (!tdesu.isEmpty()) {
 		int rc = KMessageBox::warningContinueCancel(0,
 				i18n("You will need to supply a root password "
-					"to allow the privileges of the %1 application to change.").tqarg(apm_name),
+					"to allow the privileges of the %1 application to change.").arg(apm_name),
 				"KLaptopDaemon", KStdGuiItem::cont(),
 				"");
 		if (rc == KMessageBox::Continue) {
@@ -170,7 +170,7 @@ void ApmConfig::setupHelper()
 			proc.start(KProcess::Block);	// run it sync so has_apm below sees the results
 		}
 	} else {
-		KMessageBox::sorry(0, i18n("%1 cannot be enabled because tdesu cannot be found.  Please make sure that it is installed correctly.").tqarg(TQString(apm_name)),
+		KMessageBox::sorry(0, i18n("%1 cannot be enabled because tdesu cannot be found.  Please make sure that it is installed correctly.").arg(TQString(apm_name)),
 				i18n("KLaptopDaemon"));
 	}
 	laptop_portable::apm_set_mask(enablestandby, enablesuspend);
diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp
index 5e2c279..2d62ca7 100644
--- a/klaptopdaemon/battery.cpp
+++ b/klaptopdaemon/battery.cpp
@@ -39,7 +39,7 @@
 #include <krichtextlabel.h>
 
 // other TQt headers:
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqhbox.h>
@@ -112,10 +112,10 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name)
 
       // group box to hold the icons together
       TQVGroupBox* icons_groupbox = new TQVGroupBox( i18n("Select Battery Icons"), this );
-      icons_groupbox->tqlayout()->setSpacing( KDialog::spacingHint() );
+      icons_groupbox->layout()->setSpacing( KDialog::spacingHint() );
       top_layout->addWidget( icons_groupbox, 0, TQt::AlignLeft );
 
-      // tqlayout to hold the icons inside the groupbox
+      // layout to hold the icons inside the groupbox
       TQGrid *icon_grid = new TQGrid( 3 /*cols*/, icons_groupbox );
       icon_grid->setSpacing( KDialog::spacingHint() );
 
diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp
index b00fbc4..898e480 100644
--- a/klaptopdaemon/buttons.cpp
+++ b/klaptopdaemon/buttons.cpp
@@ -34,7 +34,7 @@
 #include <kapplication.h>
 #include <kcombobox.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbuttongroup.h>
 #include <tqspinbox.h>
 #include <tqradiobutton.h>
@@ -120,7 +120,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name)
 
       if (laptop_portable::has_button(laptop_portable::LidButton)) {
       	lidBox = new TQVButtonGroup(i18n("Lid Switch Closed"), this);
-      	lidBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+      	lidBox->layout()->setSpacing( KDialog::spacingHint() );
         TQToolTip::add( lidBox, i18n( "Select which actions will occur when the laptop's lid is closed" ) );
       	hlay->addWidget( lidBox );
 
@@ -196,7 +196,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name)
       if (laptop_portable::has_button(laptop_portable::PowerButton)) {
 
       	powerBox = new TQVButtonGroup(i18n("Power Switch Pressed"), this);
-      	powerBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+      	powerBox->layout()->setSpacing( KDialog::spacingHint() );
         TQToolTip::add( powerBox, i18n( "Select which actions will occur when the laptop's power button is pressed" ) );
       	hlay->addWidget( powerBox );
 
@@ -273,12 +273,12 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name)
 			    	        "or power switch on your laptop is pressed. Some laptops may already "
 					"automatically do things like this, if you cannot disable them in your BIOS "
 					"you probably should not enable anything in this panel."), this);
-      explain->tqsetAlignment( TQt::WordBreak );
+      explain->setAlignment( TQt::WordBreak );
       top_layout->addWidget(explain);
 
       top_layout->addStretch(1);
 
-      top_layout->addWidget( new TQLabel( i18n("Version: %1").tqarg(LAPTOP_VERSION), this ), 0, TQt::AlignRight );
+      top_layout->addWidget( new TQLabel( i18n("Version: %1").arg(LAPTOP_VERSION), this ), 0, TQt::AlignRight );
     }
   }
 
diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp
index 7c948b7..d907ef2 100644
--- a/klaptopdaemon/daemondock.cpp
+++ b/klaptopdaemon/daemondock.cpp
@@ -202,7 +202,7 @@ laptop_dock::invokeBrightness()
 		brightness_slider->setMinimumHeight(40);
 		brightness_slider->setMinimumWidth(15);
 		connect(brightness_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(invokeBrightnessSlider(int)));
-		brightness_widget->resize(brightness_widget->tqsizeHint());
+		brightness_widget->resize(brightness_widget->sizeHint());
 	} else {
 		brightness_slider->setValue(255-brightness);
 	}
@@ -215,7 +215,7 @@ laptop_dock::invokeBrightness()
 		TQPoint pos = TQCursor::pos();
 		int x = pos.x();
 		int y = pos.y();
-		y -= brightness_widget->tqgeometry().height();
+		y -= brightness_widget->geometry().height();
 		int w = brightness_widget->width();
 		int h = brightness_widget->height();
 		if (x+w > sw)
@@ -375,10 +375,10 @@ void laptop_dock::mousePressEvent( TQMouseEvent *event )
 					TQString num3;
 					num3.setNum(pdaemon->left%60);
 					num3 = num3.rightJustify(2, '0');
-					tmp = i18n("%1:%2 hours left").tqarg(pdaemon->left/60).tqarg(num3);
+					tmp = i18n("%1:%2 hours left").arg(pdaemon->left/60).arg(num3);
 				} else {
 					// no remaining time available
-					tmp = i18n("%1% charged").tqarg(pdaemon->val);
+					tmp = i18n("%1% charged").arg(pdaemon->val);
 				}
 			} else {
 				tmp = i18n("No Battery");
@@ -402,7 +402,7 @@ void laptop_dock::mousePressEvent( TQMouseEvent *event )
 			TQString speed = laptop_portable::cpu_frequency();
 			if (!speed.isEmpty()) {
 				popup->insertSeparator();
-				popup->insertItem(i18n("CPU: %1").tqarg(speed));
+				popup->insertItem(i18n("CPU: %1").arg(speed));
 			}
 		}
 
@@ -449,7 +449,7 @@ void laptop_dock::mousePressEvent( TQMouseEvent *event )
 
                          // add a few bits of information
                          thisSub->insertSeparator();
-                         thisSub->insertItem(slotname.tqarg(thiscard->num()+1));
+                         thisSub->insertItem(slotname.arg(thiscard->num()+1));
                          if (thiscard->status() & CARD_STATUS_READY)
                             thisSub->insertItem(i18n("Ready"));
                          if (thiscard->status() & CARD_STATUS_BUSY)
@@ -641,10 +641,10 @@ quit:
 				num3.setNum(pdaemon->left%60);
 				num3 = num3.rightJustify(2, '0');
 				tmp = i18n("Plugged in - %1% charged (%2:%3 hours left)")
-					.tqarg(pdaemon->val).tqarg(pdaemon->left/60).tqarg(num3);
+					.arg(pdaemon->val).arg(pdaemon->left/60).arg(num3);
 			} else {
 				// no remaining time available
-				tmp = i18n("Plugged in - %1% charged").tqarg(pdaemon->val);
+				tmp = i18n("Plugged in - %1% charged").arg(pdaemon->val);
 			}
 		} else {
 			tmp = i18n("Plugged in - no battery");
@@ -658,9 +658,9 @@ quit:
 				num3.setNum(pdaemon->left%60);
 				num3 = num3.rightJustify(2, '0');
 				tmp = i18n("Running on batteries - %1% charged (%2:%3 hours left)")
-						.tqarg(pdaemon->val).tqarg(pdaemon->left/60).tqarg(num3);
+						.arg(pdaemon->val).arg(pdaemon->left/60).arg(num3);
 			} else {
-				tmp = i18n("Running on batteries - %1% charged").tqarg(pdaemon->val);
+				tmp = i18n("Running on batteries - %1% charged").arg(pdaemon->val);
 			}
 		} else {
 			// running without any power source...
diff --git a/klaptopdaemon/kpcmcia.cpp b/klaptopdaemon/kpcmcia.cpp
index 83e4971..50d7b4c 100644
--- a/klaptopdaemon/kpcmcia.cpp
+++ b/klaptopdaemon/kpcmcia.cpp
@@ -175,7 +175,7 @@ tv.tv_sec = 0;  tv.tv_usec = 0;
           TQTextStream ts(&f);
           bool foundit = false;
           TQString _thisreg = "^Socket %1: ";
-          TQRegExp thisreg ( _thisreg.tqarg(_num) );
+          TQRegExp thisreg ( _thisreg.arg(_num) );
 
           if (flock(f.handle(), LOCK_SH)) return updated;
 
@@ -500,7 +500,7 @@ TQFile df("/proc/devices");
 TQString thisreg;
 
    thisreg = "^[0-9]+ %1$";
-   thisreg = thisreg.tqarg(x);
+   thisreg = thisreg.arg(x);
 
    if (df.open(IO_ReadOnly)) {
       TQTextStream t(&df);
@@ -523,7 +523,7 @@ static int openDevice(dev_t dev) {
 TQString tmp_path = locateLocal("tmp", KGlobal::instance()->instanceName());
 TQString ext = "_socket%1";
 
-  tmp_path += ext.tqarg((int)dev);
+  tmp_path += ext.arg((int)dev);
 
   int rc = mknod(tmp_path.latin1(), (S_IFCHR | S_IREAD), dev);
   if (rc < 0) return -1;
diff --git a/klaptopdaemon/kpcmciainfo.cpp b/klaptopdaemon/kpcmciainfo.cpp
index 3a9b67a..dd80801 100644
--- a/klaptopdaemon/kpcmciainfo.cpp
+++ b/klaptopdaemon/kpcmciainfo.cpp
@@ -22,7 +22,7 @@
 
 
 #include <tqtabwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 #include <kstatusbar.h>
 #include <klocale.h>
@@ -57,14 +57,14 @@ KPCMCIAInfo::KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent, const char *name)
 
   prepareCards();
 
-  _mainTab->resize(KDialog::tqsizeHint());
-  resize(KDialog::tqsizeHint());
+  _mainTab->resize(KDialog::sizeHint());
+  resize(KDialog::sizeHint());
 
   connect(_pcmcia, TQT_SIGNAL(cardUpdated(int)), this, TQT_SLOT(updateCard(int)));
 
   _sb = new KStatusBar(this);
   _sb->insertItem(i18n("Ready."), 0, 1, true);
-  _sb->resize(KDialog::tqsizeHint());
+  _sb->resize(KDialog::sizeHint());
   _mainGrid->addMultiCellWidget(_sb, 8, 8, 0, 4);
   _mainGrid->setRowStretch(8, 0);
 
@@ -91,7 +91,7 @@ void KPCMCIAInfo::showTab(int num) {
 }
 
 
-void KPCMCIAInfo::slotResettqStatus() {
+void KPCMCIAInfo::slotResetStatus() {
   _sb->changeItem(i18n("Ready."), 0);
 }
 
@@ -99,12 +99,12 @@ void KPCMCIAInfo::slotResettqStatus() {
 void KPCMCIAInfo::statusNotice(const TQString& text, int life) {
    _sb->changeItem(text, 0);
    if (life > 0)
-      TQTimer::singleShot(life, this, TQT_SLOT(slotResettqStatus()));
+      TQTimer::singleShot(life, this, TQT_SLOT(slotResetStatus()));
 }
 
 
 
-void KPCMCIAInfo::slotTabSettqStatus(const TQString& text) {
+void KPCMCIAInfo::slotTabSetStatus(const TQString& text) {
    statusNotice(text);
 }
 
@@ -134,9 +134,9 @@ void KPCMCIAInfo::prepareCards() {
      TQString tabname = i18n("Card Slot %1");
      KPCMCIAInfoPage *tp = new KPCMCIAInfoPage(_pcmcia->getCard(i), _mainTab);
      connect(this, TQT_SIGNAL(updateNow()), tp, TQT_SLOT(update()));
-     connect(tp, TQT_SIGNAL(setStatusBar(const TQString&)), this, TQT_SLOT(slotTabSettqStatus(const TQString&)));
-     tp->resize(_mainTab->tqsizeHint());
-     _mainTab->addTab(tp, tabname.tqarg(i+1));
+     connect(tp, TQT_SIGNAL(setStatusBar(const TQString&)), this, TQT_SLOT(slotTabSetStatus(const TQString&)));
+     tp->resize(_mainTab->sizeHint());
+     _mainTab->addTab(tp, tabname.arg(i+1));
      _pages.insert(i, tp);
   }
 }
@@ -233,13 +233,13 @@ void KPCMCIAInfoPage::update() {
    if (_card) {
       TQString tmp;
       _card_name->setText(_card->name());
-      _card_name->resize(_card_name->tqsizeHint());
+      _card_name->resize(_card_name->sizeHint());
       tmp = i18n("Card type: %1 ");
-      _card_type->setText(tmp.tqarg(_card->type()));
-      _card_type->resize(_card_type->tqsizeHint());
+      _card_type->setText(tmp.arg(_card->type()));
+      _card_type->resize(_card_type->sizeHint());
       tmp = i18n("Driver: %1");
-      _card_driver->setText(tmp.tqarg(_card->driver()));
-      _card_driver->resize(_card_driver->tqsizeHint());
+      _card_driver->setText(tmp.arg(_card->driver()));
+      _card_driver->resize(_card_driver->sizeHint());
       tmp = i18n("IRQ: %1%2");
       TQString tmp2;
       switch (_card->intType()) {
@@ -256,33 +256,33 @@ void KPCMCIAInfoPage::update() {
        tmp2 = "";
       };
       if (_card->irq() <= 0)
-         _card_irq->setText(tmp.tqarg(i18n("none")).tqarg(""));
-      else _card_irq->setText(tmp.tqarg(_card->irq()).tqarg(tmp2));
-      _card_irq->resize(_card_irq->tqsizeHint());
+         _card_irq->setText(tmp.arg(i18n("none")).arg(""));
+      else _card_irq->setText(tmp.arg(_card->irq()).arg(tmp2));
+      _card_irq->resize(_card_irq->sizeHint());
       tmp = i18n("I/O port(s): %1");
       if (_card->ports().isEmpty())
-         _card_io->setText(tmp.tqarg(i18n("none")));
-      else _card_io->setText(tmp.tqarg(_card->ports()));
-      _card_io->resize(_card_io->tqsizeHint());
+         _card_io->setText(tmp.arg(i18n("none")));
+      else _card_io->setText(tmp.arg(_card->ports()));
+      _card_io->resize(_card_io->sizeHint());
       tmp = i18n("Bus: %1 bit %2");
       if (_card->busWidth() == 0)
          _card_bus->setText(i18n("Bus: unknown"));
-      else _card_bus->setText(tmp.tqarg(_card->busWidth()).tqarg(_card->busWidth() == 16 ? i18n("PC Card") : i18n("Cardbus")));
-      _card_bus->resize(_card_bus->tqsizeHint());
+      else _card_bus->setText(tmp.arg(_card->busWidth()).arg(_card->busWidth() == 16 ? i18n("PC Card") : i18n("Cardbus")));
+      _card_bus->resize(_card_bus->sizeHint());
       tmp = i18n("Device: %1");
-      _card_dev->setText(tmp.tqarg(_card->device()));
-      _card_dev->resize(_card_dev->tqsizeHint());
+      _card_dev->setText(tmp.arg(_card->device()));
+      _card_dev->resize(_card_dev->sizeHint());
       tmp = i18n("Power: +%1V");
-      _card_vcc->setText(tmp.tqarg(_card->vcc()/10));
-      _card_vcc->resize(_card_vcc->tqsizeHint());
+      _card_vcc->setText(tmp.arg(_card->vcc()/10));
+      _card_vcc->resize(_card_vcc->sizeHint());
       tmp = i18n("Programming power: +%1V, +%2V");
-      _card_vpp->setText(tmp.tqarg(_card->vpp()/10).tqarg(_card->vpp2()/10));
-      _card_vpp->resize(_card_vpp->tqsizeHint());
+      _card_vpp->setText(tmp.arg(_card->vpp()/10).arg(_card->vpp2()/10));
+      _card_vpp->resize(_card_vpp->sizeHint());
       tmp = i18n("Configuration base: 0x%1");
       if (_card->configBase() == 0)
          _card_cfgbase->setText(i18n("Configuration base: none"));
-      else _card_cfgbase->setText(tmp.tqarg(_card->configBase(), -1, 16));
-      _card_cfgbase->resize(_card_cfgbase->tqsizeHint());
+      else _card_cfgbase->setText(tmp.arg(_card->configBase(), -1, 16));
+      _card_cfgbase->resize(_card_cfgbase->sizeHint());
 
       if (!(_card->status() & (CARD_STATUS_READY|CARD_STATUS_SUSPEND))) {
          _card_ej_ins->setText(i18n("&Insert"));
diff --git a/klaptopdaemon/kpcmciainfo.h b/klaptopdaemon/kpcmciainfo.h
index 20bc16e..458219b 100644
--- a/klaptopdaemon/kpcmciainfo.h
+++ b/klaptopdaemon/kpcmciainfo.h
@@ -52,8 +52,8 @@ public slots:
   void slotClose();
   void update();
   void updateCard(int num);
-  void slotResettqStatus();
-  void slotTabSettqStatus(const TQString& text);
+  void slotResetStatus();
+  void slotTabSetStatus(const TQString& text);
 
 signals:
   void updateNow();
diff --git a/klaptopdaemon/krichtextlabel.cpp b/klaptopdaemon/krichtextlabel.cpp
index 3d9dfcd..dd9268b 100644
--- a/klaptopdaemon/krichtextlabel.cpp
+++ b/klaptopdaemon/krichtextlabel.cpp
@@ -19,7 +19,7 @@
 #include "krichtextlabel.h"
 
 #include <tqtooltip.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqsimplerichtext.h>
 
 #include <kglobalsettings.h>
@@ -41,14 +41,14 @@ static TQString qrichtextify( const TQString& text )
 KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
   m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
-  tqsetAlignment( TQt::WordBreak );
+  setAlignment( TQt::WordBreak );
   setText(text);
 }
 
 KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
   m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
-  tqsetAlignment( TQt::WordBreak );
+  setAlignment( TQt::WordBreak );
 }
 
 void KRichTextLabel::setDefaultWidth(int defaultWidth)
@@ -62,7 +62,7 @@ TQSizePolicy KRichTextLabel::sizePolicy() const
   return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false);
 }
 
-TQSize KRichTextLabel::tqminimumSizeHint() const
+TQSize KRichTextLabel::minimumSizeHint() const
 {
   TQString qt_text = qrichtextify( text() );
   int pref_width = 0;
@@ -97,9 +97,9 @@ TQSize KRichTextLabel::tqminimumSizeHint() const
   return TQSize(pref_width, rt.height());
 }
 
-TQSize KRichTextLabel::tqsizeHint() const
+TQSize KRichTextLabel::sizeHint() const
 {
-  return tqminimumSizeHint();
+  return minimumSizeHint();
 }
 
 void KRichTextLabel::setText( const TQString &text ) {
diff --git a/klaptopdaemon/krichtextlabel.h b/klaptopdaemon/krichtextlabel.h
index 53a60ce..513e128 100644
--- a/klaptopdaemon/krichtextlabel.h
+++ b/klaptopdaemon/krichtextlabel.h
@@ -24,7 +24,7 @@
 #include <tdelibs_export.h>
 
 /**
- * @short A replacement for TQLabel that supports richtext and proper tqlayout management
+ * @short A replacement for TQLabel that supports richtext and proper layout management
  *
  * @author Waldo Bastian <bastian@kde.org>
  */
@@ -46,8 +46,8 @@ public:
   int defaultWidth() const { return m_defaultWidth; }
   void setDefaultWidth(int defaultWidth);
 
-  virtual TQSize tqminimumSizeHint() const;
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize minimumSizeHint() const;
+  virtual TQSize sizeHint() const;
   TQSizePolicy sizePolicy() const;
 
 public slots:
diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp
index 36faefa..5b710c5 100644
--- a/klaptopdaemon/laptop_daemon.cpp
+++ b/klaptopdaemon/laptop_daemon.cpp
@@ -102,7 +102,7 @@ laptop_daemon::laptop_daemon(const TQCString& obj): KDEDModule(obj)
 	sony_disp = 0;
         connect(this, TQT_SIGNAL(signal_checkBattery()), TQT_SLOT(checkBatteryNow()));
 
-	//hasAudio = (audioServer.servertqStatus() == 0) ? true : false;
+	//hasAudio = (audioServer.serverStatus() == 0) ? true : false;
 
         // FIXME: make these configurable.  Some system definitely don't
         //        use /var/run/stab
@@ -537,13 +537,13 @@ void laptop_daemon::haveBatteryLow(int t, const int num, const int type)
             if (type) {
                 if (s.time_based_action_critical) {
                     KPassivePopup::message(i18n("Battery power is running out."),
-                                           i18n("%1 % charge left.").tqarg(num),
+                                           i18n("%1 % charge left.").arg(num),
                                            BarIcon("laptop_battery"), dock_widget,
                                            0, 20000);
                 } else {
                     // Will this ever be reached?
                     KPassivePopup::message(i18n("Battery power is running out."),
-                                           i18n("%1 % charge left.").tqarg(num),
+                                           i18n("%1 % charge left.").arg(num),
                                            BarIcon("laptop_battery"), dock_widget,
                                            0, 20000);
                 }
diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp
index 535e391..4bea263 100644
--- a/klaptopdaemon/main.cpp
+++ b/klaptopdaemon/main.cpp
@@ -26,7 +26,7 @@
 #include <kprocess.h>
 #include <kconfig.h>
 #include <kglobal.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <unistd.h>
 #include <fcntl.h>
 
@@ -147,9 +147,9 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *)
     enablehibernate = config.readBoolEntry("EnableHibernate", false);
     laptop_portable::software_suspend_set_mask(enablehibernate);
   }
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+  TQVBoxLayout *layout = new TQVBoxLayout(this);
   tab = new TQTabWidget(this);
-  tqlayout->addWidget(tab);
+  layout->addWidget(tab);
 
   battery = new BatteryConfig(parent, "kcmlaptop");
   tab->addTab(battery, i18n("&Battery"));
diff --git a/klaptopdaemon/pcmcia.cpp b/klaptopdaemon/pcmcia.cpp
index a2f4ba8..b6768b4 100644
--- a/klaptopdaemon/pcmcia.cpp
+++ b/klaptopdaemon/pcmcia.cpp
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 
 #include <tqfileinfo.h> 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kglobal.h>
 #include <klocale.h>
@@ -84,7 +84,7 @@ PcmciaConfig::PcmciaConfig (TQWidget * parent, const char *name)
         TQString s1 = LAPTOP_VERSION;
         TQString s2 = i18n("Version: ")+s1;
         TQLabel* vers = new TQLabel(s2, this);
-        vers->setMinimumSize(vers->tqsizeHint());
+        vers->setMinimumSize(vers->sizeHint());
         v1->addWidget(vers, 0);
 
         top_layout->activate();          
diff --git a/klaptopdaemon/portable.cpp b/klaptopdaemon/portable.cpp
index dbcb57c..18c64fc 100644
--- a/klaptopdaemon/portable.cpp
+++ b/klaptopdaemon/portable.cpp
@@ -87,7 +87,7 @@
 #include <tqobject.h>
 #include <tqregexp.h>
 #include <tqiodevice.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvgroupbox.h>
 #include <tqvaluevector.h>
 
@@ -199,7 +199,7 @@ pmu_read(apm_info *ap)
 	int timerem = 0;
 	int maxcharge = 0;
 	for (int i = 0; i < bcnt; i++) {
-		TQFile bf(TQString("/proc/pmu/battery_%1").tqarg(i));
+		TQFile bf(TQString("/proc/pmu/battery_%1").arg(i));
 		if (!bf.exists() || !bf.open(IO_ReadOnly))
 			continue;
 
@@ -1226,7 +1226,7 @@ laptop_portable::get_battery_status(int &num_batteries, TQStringList &names, TQS
 		for(unsigned int i = 0; i < acpi_batteries.count(); ++i) {
 			acpi_battery_info& bat = acpi_batteries[i];
 			names.append(bat.name);
-			values.append(TQString("%1").tqarg(bat.percentage));
+			values.append(TQString("%1").arg(bat.percentage));
 			state.append(bat.present ? "yes" : "no");
 		}
 		return;
@@ -1330,11 +1330,11 @@ TQString laptop_portable::cpu_frequency() {
 					continue;
 				if (ll.first().stripWhiteSpace() 
 						== "cpu MHz") {
-					rc = i18n("%1 MHz (%2)").tqarg(ll.last().stripWhiteSpace()).tqarg(rc);
+					rc = i18n("%1 MHz (%2)").arg(ll.last().stripWhiteSpace()).arg(rc);
 					break;
 				} else if (ll.first().stripWhiteSpace()
 						== "clock") {
-					rc = TQString("%1 (%2)").tqarg(ll.last().stripWhiteSpace()).tqarg(rc);
+					rc = TQString("%1 (%2)").arg(ll.last().stripWhiteSpace()).arg(rc);
 					break;
 				}
 			}
@@ -1581,7 +1581,7 @@ get_acpi_list(char p, int *map, const char *dev, TQStringList &list, int &index,
 							TQString l;
 							f.readLine(l, 500);
 							if (l.contains("active limit", false)) {
-								TQRegExp rx(TQString("%1(\\d+)").tqarg(p));
+								TQRegExp rx(TQString("%1(\\d+)").arg(p));
 								if (rx.search(l) >= 0) {
 									bool ok;
 									int min = rx.cap(1).toInt(&ok);
@@ -1706,7 +1706,7 @@ static int get_cpufreq_24_state(TQStringList &states, int &current, const TQStri
 		f.close();
 		cpufreq_minmax_frequency[i] = buffer;
 		unsigned int val = buffer.toUInt() / 1000;
-		states.append(i18n("%1 MHz").tqarg(val));
+		states.append(i18n("%1 MHz").arg(val));
 		if(buffer.stripWhiteSpace() == cur)
 			current = i;
 	}
@@ -2267,7 +2267,7 @@ laptop_portable::apm_set_mask(bool , bool )
 //	adds extra widgets to the battery panel
 //
 void
-laptop_portable::extra_config(TQWidget * /*parent*/, KConfig * /*config*/, TQVBoxLayout * /*tqlayout*/)
+laptop_portable::extra_config(TQWidget * /*parent*/, KConfig * /*config*/, TQVBoxLayout * /*layout*/)
 {
 	// INSERT HERE
 }
@@ -2945,7 +2945,7 @@ int laptop_portable::has_apm(int)
 //	adds extra widgets to the battery panel
 //
 void
-laptop_portable::extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *tqlayout)
+laptop_portable::extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *layout)
 {
 	// INSERT HERE
 }
diff --git a/klaptopdaemon/portable.h b/klaptopdaemon/portable.h
index b4843e1..a9fa703 100644
--- a/klaptopdaemon/portable.h
+++ b/klaptopdaemon/portable.h
@@ -98,7 +98,7 @@ public:
 	static void get_battery_status(int &num_batteries, TQStringList &names, TQStringList &state, TQStringList &values); // get multiple battery status
 	static bool has_lav();			// true if the following returns a valid value
 	static float get_load_average();	// current short term load average
-	static void extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *tqlayout);
+	static void extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *layout);
 	static void acpi_set_mask(bool standby, bool suspend, bool hibernate, bool perf, bool throttle);	
 	static void apm_set_mask(bool standby, bool suspend);
 	static void software_suspend_set_mask(bool hibernate);
diff --git a/klaptopdaemon/power.cpp b/klaptopdaemon/power.cpp
index fce096e..a437156 100644
--- a/klaptopdaemon/power.cpp
+++ b/klaptopdaemon/power.cpp
@@ -35,7 +35,7 @@
 #include <kcombobox.h>
 #include <knuminput.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbuttongroup.h>
 #include <tqspinbox.h>
 #include <tqradiobutton.h>
@@ -122,7 +122,7 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name)
 
       nopowerBox = new TQVButtonGroup(i18n("Not Powered"), this);
       TQToolTip::add( nopowerBox, i18n( "Options in this box apply when the laptop is unplugged from the wall and has been idle for a while" ) );
-      nopowerBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+      nopowerBox->layout()->setSpacing( KDialog::spacingHint() );
       hlay->addWidget( nopowerBox );
 
       if (can_standby) {
@@ -214,7 +214,7 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name)
 
 
       powerBox = new TQVButtonGroup(i18n("Powered"), this);
-      powerBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+      powerBox->layout()->setSpacing( KDialog::spacingHint() );
       TQToolTip::add( powerBox, i18n( "Options in this box apply when the laptop is plugged into the wall and has been idle for a while" ) );
       hlay->addWidget( powerBox );
 
@@ -305,19 +305,19 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name)
 					"it works as a sort of extreme screen saver. You can configure different "
 					"timeouts and types of behavior depending on whether or not your laptop is "
 					"plugged in to the mains supply."), this );
-      explain->tqsetAlignment( TQt::WordBreak );
+      explain->setAlignment( TQt::WordBreak );
       top_layout->addWidget(explain);
 
       if (can_standby) {
 	TQLabel* explain3 = new TQLabel(i18n("Different laptops may respond to 'standby' in different ways - in many "
 					"it is only a temporary state and may not be useful for you."), this);
-	explain3->tqsetAlignment( TQt::WordBreak );
+	explain3->setAlignment( TQt::WordBreak );
 	top_layout->addWidget(explain3, 0, TQt::AlignLeft);
       }
 
       top_layout->addStretch(1);
 
-      top_layout->addWidget( new TQLabel( i18n("Version: %1").tqarg(LAPTOP_VERSION), this ), 0, TQt::AlignRight );
+      top_layout->addWidget( new TQLabel( i18n("Version: %1").arg(LAPTOP_VERSION), this ), 0, TQt::AlignRight );
     }
   }
 
diff --git a/klaptopdaemon/profile.cpp b/klaptopdaemon/profile.cpp
index b16ad1a..ef6fa8e 100644
--- a/klaptopdaemon/profile.cpp
+++ b/klaptopdaemon/profile.cpp
@@ -41,7 +41,7 @@
 #include <kcombobox.h>
 
 // other TQt headers:
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqhbox.h>
@@ -205,15 +205,15 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name)
     TQLabel *tmp_label = new TQLabel(i18n("This panel allows you to set default values for system attributes "
 					"so that they change when the laptop is plugged in to the wall or "
 					"running on batteries."), this );
-    tmp_label->tqsetAlignment( TQt::WordBreak );
+    tmp_label->setAlignment( TQt::WordBreak );
     top_layout->addWidget( tmp_label );
 
     tmp_label = new TQLabel(i18n("You can also set options for these values that will be set by low battery "
 				"conditions, or system inactivity in the other panels"), this );
-    tmp_label->tqsetAlignment( TQt::WordBreak );
+    tmp_label->setAlignment( TQt::WordBreak );
     top_layout->addWidget( tmp_label );
     top_layout->addStretch(1);
-    top_layout->addWidget( new TQLabel( i18n("Version: %1").tqarg(LAPTOP_VERSION), this), 0, TQt::AlignRight );
+    top_layout->addWidget( new TQLabel( i18n("Version: %1").arg(LAPTOP_VERSION), this), 0, TQt::AlignRight );
 
 
     load();      
diff --git a/klaptopdaemon/sony.cpp b/klaptopdaemon/sony.cpp
index 689b9d0..fdf288c 100644
--- a/klaptopdaemon/sony.cpp
+++ b/klaptopdaemon/sony.cpp
@@ -43,7 +43,7 @@
 #include <krichtextlabel.h>
 
 // other TQt headers:
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqhbox.h>
@@ -99,7 +99,7 @@ SonyConfig::SonyConfig(TQWidget * parent, const char *name)
     
 
     top_layout->addStretch(1);
-    top_layout->addWidget( new TQLabel( i18n("Version: %1").tqarg(LAPTOP_VERSION), this), 0, TQt::AlignRight );
+    top_layout->addWidget( new TQLabel( i18n("Version: %1").arg(LAPTOP_VERSION), this), 0, TQt::AlignRight );
 
 
     load();      
diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp
index 84d8501..2121337 100644
--- a/klaptopdaemon/warning.cpp
+++ b/klaptopdaemon/warning.cpp
@@ -33,7 +33,7 @@
 #include <kapplication.h>
 #include <kcombobox.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
 #include <tqslider.h>
@@ -164,7 +164,7 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
 
     if (can_brightness) {
       checkBrightness = new TQCheckBox(i18n("Panel b&rightness"), this);
-      checkBrightness->setMinimumSize(checkBrightness->tqsizeHint());
+      checkBrightness->setMinimumSize(checkBrightness->sizeHint());
       TQToolTip::add( checkBrightness, i18n( "If enabled the back panel brightness will change" ) );
       grid->addWidget(checkBrightness, curRow, 0);
       connect(checkBrightness, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(brightness_changed(bool)));
@@ -236,23 +236,23 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
 
     TQVButtonGroup *b = new TQVButtonGroup(i18n("System State Change"), this);
     TQToolTip::add( b, i18n( "You may choose one of the following to occur when the battery gets low" ) );
-    b->tqlayout()->setSpacing( KDialog::spacingHint() );
+    b->layout()->setSpacing( KDialog::spacingHint() );
     if (can_standby) {
       checkStandby = new TQRadioButton(i18n("Standb&y"), b);
       TQToolTip::add( checkStandby, i18n( "Move the system into the standby state - a temporary lower power state" ) );
-      checkStandby->setMinimumSize(checkStandby->tqsizeHint());
+      checkStandby->setMinimumSize(checkStandby->sizeHint());
       connect(checkStandby, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
     }
     if (can_suspend) {
       checkSuspend = new TQRadioButton(i18n("&Suspend"), b);
       TQToolTip::add( checkSuspend, i18n( "Move the system into the suspend state - also known as 'save-to-ram'" ) );
-      checkSuspend->setMinimumSize(checkSuspend->tqsizeHint());
+      checkSuspend->setMinimumSize(checkSuspend->sizeHint());
       connect(checkSuspend, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
     }
     if (can_hibernate) {
       checkHibernate = new TQRadioButton(i18n("H&ibernate"), b);
       TQToolTip::add( checkHibernate, i18n( "Move the system into the hibernate state - also known as 'save-to-disk'" ) );
-      checkHibernate->setMinimumSize(checkHibernate->tqsizeHint());
+      checkHibernate->setMinimumSize(checkHibernate->sizeHint());
       connect(checkHibernate, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
     }
     // setup the logout option
@@ -276,7 +276,7 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
     } else {
       explain = new TQLabel(i18n("This panel controls how and when you receive warnings that your battery power is about to run out"), this);
     }
-    explain->tqsetAlignment( TQt::WordBreak );
+    explain->setAlignment( TQt::WordBreak );
     grid->addMultiCellWidget(explain, curRow, curRow, 0, 1);
     ++curRow;
 
@@ -288,7 +288,7 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
     }
     grid->setRowStretch(curRow++, 1);
 
-    grid->addWidget(new TQLabel( i18n("Version: %1").tqarg(LAPTOP_VERSION), this),
+    grid->addWidget(new TQLabel( i18n("Version: %1").arg(LAPTOP_VERSION), this),
 		    curRow, 1, TQt::AlignRight);
 
   }
diff --git a/klaptopdaemon/xautolock.cc b/klaptopdaemon/xautolock.cc
index 25b2242..630b175 100644
--- a/klaptopdaemon/xautolock.cc
+++ b/klaptopdaemon/xautolock.cc
@@ -32,7 +32,7 @@ extern "C" {
 #include <X11/extensions/dpms.h>
 
 #ifndef HAVE_DPMSINFO_PROTO
-tqStatus DPMSInfo ( Display *, CARD16 *, BOOL * );
+Status DPMSInfo ( Display *, CARD16 *, BOOL * );
 #endif
 }
 #endif
diff --git a/klaptopdaemon/xautolock_diy.c b/klaptopdaemon/xautolock_diy.c
index c816ae9..b9df2f8 100644
--- a/klaptopdaemon/xautolock_diy.c
+++ b/klaptopdaemon/xautolock_diy.c
@@ -96,8 +96,8 @@ selectEvents (Window window, Bool substructureOnly)
 {
   Window            root;              /* root window of the window */
   Window            parent;            /* parent of the window      */
-  Window*           tqchildren;          /* tqchildren of the window    */
-  unsigned          nofChildren = 0;   /* number of tqchildren        */
+  Window*           children;          /* children of the window    */
+  unsigned          nofChildren = 0;   /* number of children        */
   unsigned          i;                 /* loop counter              */
   XWindowAttributes attribs;           /* attributes of the window  */
 
@@ -107,12 +107,12 @@ selectEvents (Window window, Bool substructureOnly)
   *  Start by querying the server about the root and parent windows.
   */
   if (!XQueryTree (queue.display, window, &root, &parent,
-                   &tqchildren, &nofChildren))
+                   &children, &nofChildren))
   {
     return;
   }
 
-  if (nofChildren) (void) XFree ((char*) tqchildren);
+  if (nofChildren) (void) XFree ((char*) children);
 
  /*
   *  Build the appropriate event mask. The basic idea is that we don't
@@ -168,7 +168,7 @@ selectEvents (Window window, Bool substructureOnly)
   }
 
  /*
-  *  Now ask for the list of tqchildren again, since it might have changed
+  *  Now ask for the list of children again, since it might have changed
   *  in between the last time and us selecting SubstructureNotifyMask.
   *
   *  There is a (very small) chance that we might process a subtree twice:
@@ -179,20 +179,20 @@ selectEvents (Window window, Bool substructureOnly)
   *  isn't required...
   */
   if (!XQueryTree (queue.display, window, &root, &parent,
-                   &tqchildren, &nofChildren))
+                   &children, &nofChildren))
   {
     return;
   }
 
  /*
-  *  Now do the same thing for all tqchildren.
+  *  Now do the same thing for all children.
   */
   for (i = 0; i < nofChildren; ++i)
   {
-    selectEvents (tqchildren[i], substructureOnly);
+    selectEvents (children[i], substructureOnly);
   }
 
-  if (nofChildren) (void) XFree ((char*) tqchildren);
+  if (nofChildren) (void) XFree ((char*) children);
 }
 
 #if 0
diff --git a/klaptopdaemon/xautolock_engine.c b/klaptopdaemon/xautolock_engine.c
index bbce54e..62f968a 100644
--- a/klaptopdaemon/xautolock_engine.c
+++ b/klaptopdaemon/xautolock_engine.c
@@ -224,7 +224,7 @@ evaluateTriggers (Display* d)
   *  when we are finally re-enabled.
   */
 #ifdef VMS
-  if (vmstqStatus == 0)  
+  if (vmsStatus == 0)  
   {
 #else /* VMS */
   if (lockerPid)
@@ -336,7 +336,7 @@ evaluateTriggers (Display* d)
       || now >= lockTrigger)
   {
 #ifdef VMS
-    if (vmstqStatus != 0)
+    if (vmsStatus != 0)
 #else /* VMS */
     if (!lockerPid)
 #endif /* VMS */
@@ -350,9 +350,9 @@ evaluateTriggers (Display* d)
         case 0:
           (void) close (ConnectionNumber (d));
 #ifdef VMS
-          vmstqStatus = 0;
+          vmsStatus = 0;
           lockerPid = lib$spawn ((lockNow ? &nowLockerDescr : &lockerDescr),
-	                         0, 0, &1, 0, 0, &vmstqStatus);
+	                         0, 0, &1, 0, 0, &vmsStatus);
 
 	  if (!(lockerPid & 1)) exit (lockerPid);