rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

33 files changed, 180 insertions, 180 deletions

diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp
index d0fd472..3fc436a 100644
--- a/klaptopdaemon/acpi.cpp
+++ b/klaptopdaemon/acpi.cpp
@@ -51,8 +51,8 @@
 #include <tqtooltip.h>
 extern void wake_laptop_daemon();
 
-AcpiConfig::AcpiConfig (TQWidget * tqparent, const char *name)
-  : KCModule(tqparent, name)
+AcpiConfig::AcpiConfig (TQWidget * parent, const char *name)
+  : KCModule(parent, name)
 {
     KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
 
@@ -185,7 +185,7 @@ void AcpiConfig::setupHelper()
 		KMessageBox::sorry(0, i18n("The ACPI helper cannot be enabled because kdesu cannot be found.  Please make sure that it is installed correctly."),
 				i18n("KLaptopDaemon"));
 	}
-	laptop_portable::acpi_set_tqmask(enablestandby, enablesuspend, enablehibernate, enableperformance, enablethrottle);
+	laptop_portable::acpi_set_mask(enablestandby, enablesuspend, enablehibernate, enableperformance, enablethrottle);
     	bool can_enable = laptop_portable::has_acpi(1);	// is helper ready
     	enableStandby->setEnabled(can_enable);
     	enableSuspend->setEnabled(can_enable);
@@ -206,7 +206,7 @@ void AcpiConfig::save()
         enablesoftwaresuspend = (enableSoftwareSuspendHibernate?enableSoftwareSuspendHibernate->isChecked():0);
         enableperformance = enablePerformance->isChecked();
         enablethrottle = enableThrottle->isChecked();
-	laptop_portable::acpi_set_tqmask(enablestandby, enablesuspend, enablehibernate, enableperformance, enablethrottle);
+	laptop_portable::acpi_set_mask(enablestandby, enablesuspend, enablehibernate, enableperformance, enablethrottle);
 
         config->setGroup("AcpiDefault");
 
diff --git a/klaptopdaemon/acpi.h b/klaptopdaemon/acpi.h
index e98934b..ffa2840 100644
--- a/klaptopdaemon/acpi.h
+++ b/klaptopdaemon/acpi.h
@@ -42,7 +42,7 @@ class AcpiConfig : public KCModule
   Q_OBJECT
   TQ_OBJECT
 public:
-  AcpiConfig( TQWidget *tqparent=0, const char* name=0);
+  AcpiConfig( TQWidget *parent=0, const char* name=0);
   ~AcpiConfig( );     
 
   void save( void );
diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp
index 228683f..e92dfc4 100644
--- a/klaptopdaemon/apm.cpp
+++ b/klaptopdaemon/apm.cpp
@@ -51,8 +51,8 @@
 #include <tqtooltip.h>
 extern void wake_laptop_daemon();
 
-ApmConfig::ApmConfig (TQWidget * tqparent, const char *name)
-  : KCModule(tqparent, name)
+ApmConfig::ApmConfig (TQWidget * parent, const char *name)
+  : KCModule(parent, name)
 {
     KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
 
@@ -173,7 +173,7 @@ void ApmConfig::setupHelper()
 		KMessageBox::sorry(0, i18n("%1 cannot be enabled because kdesu cannot be found.  Please make sure that it is installed correctly.").tqarg(TQString(apm_name)),
 				i18n("KLaptopDaemon"));
 	}
-	laptop_portable::apm_set_tqmask(enablestandby, enablesuspend);
+	laptop_portable::apm_set_mask(enablestandby, enablesuspend);
     	bool can_enable = laptop_portable::has_apm(1);	// is helper ready
     	enableStandby->setEnabled(can_enable);
     	enableSuspend->setEnabled(can_enable);
@@ -207,7 +207,7 @@ void ApmConfig::setupHelper2()	// we use the acpi helper to do software suspend
 		KMessageBox::sorry(0, i18n("The Software Suspend helper cannot be enabled because kdesu cannot be found.  Please make sure that it is installed correctly."),
 				i18n("KLaptopDaemon"));
 	}
-	laptop_portable::software_suspend_set_tqmask(enablesoftwaresuspend);
+	laptop_portable::software_suspend_set_mask(enablesoftwaresuspend);
     	bool can_enable = laptop_portable::has_software_suspend(2);	// is helper ready
     	enableSoftwareSuspendHibernate->setEnabled(can_enable);
 	wake_laptop_daemon();
@@ -218,9 +218,9 @@ void ApmConfig::save()
 {
         enablestandby = enableStandby->isChecked();
         enablesuspend = enableSuspend->isChecked();
-	laptop_portable::apm_set_tqmask(enablestandby, enablesuspend);
+	laptop_portable::apm_set_mask(enablestandby, enablesuspend);
 	enablesoftwaresuspend = (enableSoftwareSuspendHibernate ? enableSoftwareSuspendHibernate->isChecked():0);
-	laptop_portable::software_suspend_set_tqmask(enablesoftwaresuspend);
+	laptop_portable::software_suspend_set_mask(enablesoftwaresuspend);
 
         config->setGroup("ApmDefault");
 
diff --git a/klaptopdaemon/apm.h b/klaptopdaemon/apm.h
index f99e726..e57d77a 100644
--- a/klaptopdaemon/apm.h
+++ b/klaptopdaemon/apm.h
@@ -42,7 +42,7 @@ class ApmConfig : public KCModule
   Q_OBJECT
   TQ_OBJECT
 public:
-  ApmConfig( TQWidget *tqparent=0, const char* name=0);
+  ApmConfig( TQWidget *parent=0, const char* name=0);
   ~ApmConfig( );     
 
   void save( void );
diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp
index a80ecbf..bee367c 100644
--- a/klaptopdaemon/battery.cpp
+++ b/klaptopdaemon/battery.cpp
@@ -51,8 +51,8 @@
 extern void wake_laptop_daemon();
 
 
-BatteryConfig::BatteryConfig (TQWidget * tqparent, const char *name)
-  : KCModule(tqparent, name),
+BatteryConfig::BatteryConfig (TQWidget * parent, const char *name)
+  : KCModule(parent, name),
     editPoll(0),
     iconloader(0),
     buttonNoBattery(0),
diff --git a/klaptopdaemon/battery.h b/klaptopdaemon/battery.h
index 8500803..e76fba6 100644
--- a/klaptopdaemon/battery.h
+++ b/klaptopdaemon/battery.h
@@ -47,7 +47,7 @@ class BatteryConfig : public KCModule
   Q_OBJECT
   TQ_OBJECT
 public:
-  BatteryConfig( TQWidget *tqparent=0, const char* name=0);
+  BatteryConfig( TQWidget *parent=0, const char* name=0);
   ~BatteryConfig( );     
 
   void save( void );
diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp
index 4c4c65d..b00fbc4 100644
--- a/klaptopdaemon/buttons.cpp
+++ b/klaptopdaemon/buttons.cpp
@@ -44,8 +44,8 @@
 #include <tqtooltip.h>
 extern void wake_laptop_daemon();
 
-ButtonsConfig::ButtonsConfig (TQWidget * tqparent, const char *name)
-  : KCModule(tqparent, name),
+ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name)
+  : KCModule(parent, name),
     lidBox(0),
     lidStandby(0),
     lidSuspend(0),
diff --git a/klaptopdaemon/buttons.h b/klaptopdaemon/buttons.h
index 9263f5f..76910c7 100644
--- a/klaptopdaemon/buttons.h
+++ b/klaptopdaemon/buttons.h
@@ -42,7 +42,7 @@ class ButtonsConfig : public KCModule
   Q_OBJECT
   TQ_OBJECT
 public:
-  ButtonsConfig( TQWidget *tqparent=0, const char* name=0);
+  ButtonsConfig( TQWidget *parent=0, const char* name=0);
     ~ButtonsConfig();
   void save( void );
   void load();
diff --git a/klaptopdaemon/daemon_state.cpp b/klaptopdaemon/daemon_state.cpp
index 37db2ee..49d4ade 100644
--- a/klaptopdaemon/daemon_state.cpp
+++ b/klaptopdaemon/daemon_state.cpp
@@ -83,16 +83,16 @@ void daemon_state::load()
         bool enablehibernate = config->readBoolEntry("EnableHibernate", false);
         bool enableperformance = config->readBoolEntry("EnablePerformance", false);
         bool enablethrottle = config->readBoolEntry("EnableThrottle", false);
-	laptop_portable::acpi_set_tqmask(enablestandby, enablesuspend, enablehibernate, enableperformance, enablethrottle);
+	laptop_portable::acpi_set_mask(enablestandby, enablesuspend, enablehibernate, enableperformance, enablethrottle);
 
     	config->setGroup("ApmDefault");
     	enablestandby = config->readBoolEntry("EnableStandby", false);
     	enablesuspend = config->readBoolEntry("EnableSuspend", false);
-    	laptop_portable::apm_set_tqmask(enablestandby, enablesuspend);
+    	laptop_portable::apm_set_mask(enablestandby, enablesuspend);
 
     	config->setGroup("SoftwareSuspendDefault");
     	enablehibernate = config->readBoolEntry("EnableHibernate", false);
-    	laptop_portable::software_suspend_set_tqmask(enablehibernate);
+    	laptop_portable::software_suspend_set_mask(enablehibernate);
 
 	exists = laptop_portable::has_power_management();
 	has_brightness = laptop_portable::has_brightness();
diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp
index 1388b0a..c5c0a58 100644
--- a/klaptopdaemon/daemondock.cpp
+++ b/klaptopdaemon/daemondock.cpp
@@ -48,13 +48,13 @@
 #include <kiconeffect.h>
 extern void wake_laptop_daemon();
 
-laptop_dock::laptop_dock( laptop_daemon* tqparent )
+laptop_dock::laptop_dock( laptop_daemon* parent )
   : KSystemTray()
 {
     setCaption(i18n("KLaptop Daemon"));
     KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
     _pcmcia = NULL;
-    pdaemon = tqparent;
+    pdaemon = parent;
     current_code = -1;
     brightness_widget = 0;
     instance = new KInstance("klaptopdaemon");
@@ -568,10 +568,10 @@ void laptop_dock::displayPixmap()
 	// at this point, we have the file to display.  so display it
 
 	TQImage image = pm.convertToImage();
-	const TQBitmap *bmtqmask = pm.tqmask();
-	TQImage tqmask;
-	if (bmtqmask)
-		tqmask = bmtqmask->convertToImage();
+	const TQBitmap *bmmask = pm.mask();
+	TQImage mask;
+	if (bmmask)
+		mask = bmmask->convertToImage();
 
 	int w = image.width();
 	int h = image.height();
@@ -580,7 +580,7 @@ void laptop_dock::displayPixmap()
 	int x, y;
 	for (x = 0; x < w; x++)
 	for (y = 0; y < h; y++)
-	if (!bmtqmask || tqmask.pixelIndex(x, y) != 0){
+	if (!bmmask || mask.pixelIndex(x, y) != 0){
 		rgb = image.pixel(x, y);
 		if (tqRed(rgb) == 0xff &&
 		    tqGreen(rgb) == 0xff &&
@@ -609,7 +609,7 @@ void laptop_dock::displayPixmap()
 
 		for (y = h-1; y >= 0; y--)
 		for (x = 0; x < w; x++)
-		if (!bmtqmask || tqmask.pixelIndex(x, y) != 0){
+		if (!bmmask || mask.pixelIndex(x, y) != 0){
 			rgb = image.pixel(x, y);
 			if (tqRed(rgb) == 0xff &&
 		    	    tqGreen(rgb) == 0xff &&
@@ -743,8 +743,8 @@ quit:
         {
             TQPixmap q;
             q.convertFromImage(image);
-            if (bmtqmask)
-                    q.setMask(*bmtqmask);
+            if (bmmask)
+                    q.setMask(*bmmask);
             setPixmap(q);
         }
         adjustSize();
diff --git a/klaptopdaemon/daemondock.h b/klaptopdaemon/daemondock.h
index f16acaf..6fab64d 100644
--- a/klaptopdaemon/daemondock.h
+++ b/klaptopdaemon/daemondock.h
@@ -44,7 +44,7 @@ class laptop_dock : public KSystemTray {
   TQ_OBJECT
 
 public:
-  laptop_dock(laptop_daemon* tqparent);
+  laptop_dock(laptop_daemon* parent);
   ~laptop_dock();
   void displayPixmap();
 
diff --git a/klaptopdaemon/kpcmciainfo.cpp b/klaptopdaemon/kpcmciainfo.cpp
index 2b4c315..3a9b67a 100644
--- a/klaptopdaemon/kpcmciainfo.cpp
+++ b/klaptopdaemon/kpcmciainfo.cpp
@@ -36,8 +36,8 @@
 #include "kpcmciainfo.h"
 
 
-KPCMCIAInfo::KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *tqparent, const char *name)
-  : KDialog(tqparent, name, false), _pcmcia(pcmcia) {
+KPCMCIAInfo::KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent, const char *name)
+  : KDialog(parent, name, false), _pcmcia(pcmcia) {
 
   setMinimumSize(300,400);
 
@@ -149,8 +149,8 @@ void KPCMCIAInfo::prepareCards() {
 ///////////////////////////////////////////////////////////////////////////
 
 
-KPCMCIAInfoPage::KPCMCIAInfoPage(KPCMCIACard *card, TQWidget *tqparent, const char *name)
-  : TQFrame(tqparent, name), _card(card) {
+KPCMCIAInfoPage::KPCMCIAInfoPage(KPCMCIACard *card, TQWidget *parent, const char *name)
+  : TQFrame(parent, name), _card(card) {
   _mainGrid = new TQGridLayout(this, 10, 10);
   if (!_card) {
       // display an error
diff --git a/klaptopdaemon/kpcmciainfo.h b/klaptopdaemon/kpcmciainfo.h
index f8700a2..20bc16e 100644
--- a/klaptopdaemon/kpcmciainfo.h
+++ b/klaptopdaemon/kpcmciainfo.h
@@ -42,7 +42,7 @@ Q_OBJECT
   TQ_OBJECT
 public:
 
-  KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *tqparent = NULL, const char *name = 0);
+  KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent = NULL, const char *name = 0);
   virtual ~KPCMCIAInfo();
 
   void showTab(int num);
@@ -80,7 +80,7 @@ class KPCMCIAInfoPage : public TQFrame {
 Q_OBJECT
   TQ_OBJECT
 public:
-  KPCMCIAInfoPage(KPCMCIACard *card, TQWidget *tqparent = NULL, const char *name = 0);
+  KPCMCIAInfoPage(KPCMCIACard *card, TQWidget *parent = NULL, const char *name = 0);
   virtual ~KPCMCIAInfoPage();
 
 public slots:
diff --git a/klaptopdaemon/krichtextlabel.cpp b/klaptopdaemon/krichtextlabel.cpp
index a604b0d..3d9dfcd 100644
--- a/klaptopdaemon/krichtextlabel.cpp
+++ b/klaptopdaemon/krichtextlabel.cpp
@@ -38,15 +38,15 @@ static TQString qrichtextify( const TQString& text )
   return lines.join(TQString());
 }
 
-KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *tqparent, const char *name )
- : TQLabel ( tqparent, name ) {
+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 );
   setText(text);
 }
 
-KRichTextLabel::KRichTextLabel( TQWidget *tqparent, const char *name )
- : TQLabel ( tqparent, name ) {
+KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
+ : TQLabel ( parent, name ) {
   m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
   tqsetAlignment( TQt::WordBreak );
 }
diff --git a/klaptopdaemon/krichtextlabel.h b/klaptopdaemon/krichtextlabel.h
index 42e7a75..e9b59d4 100644
--- a/klaptopdaemon/krichtextlabel.h
+++ b/klaptopdaemon/krichtextlabel.h
@@ -40,8 +40,8 @@ public:
   /**
    * Default constructor.
    */
-  KRichTextLabel( TQWidget *tqparent, const char *name = 0 );
-  KRichTextLabel( const TQString &text, TQWidget *tqparent, const char *name = 0 );
+  KRichTextLabel( TQWidget *parent, const char *name = 0 );
+  KRichTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 );
 
   int defaultWidth() const { return m_defaultWidth; }
   void setDefaultWidth(int defaultWidth);
diff --git a/klaptopdaemon/linux/cistpl.h b/klaptopdaemon/linux/cistpl.h
index 6fab93a..ee27463 100644
--- a/klaptopdaemon/linux/cistpl.h
+++ b/klaptopdaemon/linux/cistpl.h
@@ -353,7 +353,7 @@ typedef struct cistpl_bar_t {
 typedef struct cistpl_config_t {
     u_char	last_idx;
     u_int	base;
-    u_int	rtqmask[4];
+    u_int	rmask[4];
     u_char	subtuples;
 } cistpl_config_t;
 
diff --git a/klaptopdaemon/linux/ss.h b/klaptopdaemon/linux/ss.h
index b9dbb39..f7030d0 100644
--- a/klaptopdaemon/linux/ss.h
+++ b/klaptopdaemon/linux/ss.h
@@ -44,7 +44,7 @@ typedef struct ss_callback_t {
 /* for InquireSocket */
 typedef struct socket_cap_t {
     u_int	features;
-    u_int	irq_tqmask;
+    u_int	irq_mask;
     u_int	map_size;
     u_char	pci_irq;
     u_char	cardbus;
@@ -56,7 +56,7 @@ typedef struct socket_cap_t {
 /* for GetSocket, SetSocket */
 typedef struct socket_state_t {
     u_int	flags;
-    u_int	csc_tqmask;
+    u_int	csc_mask;
     u_char	Vcc, Vpp;
     u_char	io_irq;
 } socket_state_t;
diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp
index c39f153..535e391 100644
--- a/klaptopdaemon/main.cpp
+++ b/klaptopdaemon/main.cpp
@@ -48,46 +48,46 @@ extern void wake_laptop_daemon();
 extern "C"
 {
 
-  KDE_EXPORT KCModule *create_pcmcia(TQWidget *tqparent, const char *)
+  KDE_EXPORT KCModule *create_pcmcia(TQWidget *parent, const char *)
   {
-    return new PcmciaConfig(tqparent, "kcmlaptop");
+    return new PcmciaConfig(parent, "kcmlaptop");
   }
 
-  KDE_EXPORT KCModule *create_bwarning(TQWidget *tqparent, const char *)
+  KDE_EXPORT KCModule *create_bwarning(TQWidget *parent, const char *)
   {
-    return new WarningConfig(0, tqparent, "kcmlaptop");
+    return new WarningConfig(0, parent, "kcmlaptop");
   }
-  KDE_EXPORT KCModule *create_cwarning(TQWidget *tqparent, const char *)
+  KDE_EXPORT KCModule *create_cwarning(TQWidget *parent, const char *)
   {
-    return new WarningConfig(1, tqparent, "kcmlaptop");
+    return new WarningConfig(1, parent, "kcmlaptop");
   }
-  KDE_EXPORT KCModule *create_battery(TQWidget *tqparent, const char *)
+  KDE_EXPORT KCModule *create_battery(TQWidget *parent, const char *)
   {
-    return new BatteryConfig(tqparent, "kcmlaptop");
+    return new BatteryConfig(parent, "kcmlaptop");
   }
-  KDE_EXPORT KCModule *create_power(TQWidget *tqparent, const char *)
+  KDE_EXPORT KCModule *create_power(TQWidget *parent, const char *)
   {
-    return new PowerConfig(tqparent, "kcmlaptop");
+    return new PowerConfig(parent, "kcmlaptop");
   }
-  KDE_EXPORT KCModule *create_acpi(TQWidget *tqparent, const char *)
+  KDE_EXPORT KCModule *create_acpi(TQWidget *parent, const char *)
   {
-    return new AcpiConfig(tqparent, "kcmlaptop");
+    return new AcpiConfig(parent, "kcmlaptop");
   }
-  KDE_EXPORT KCModule *create_apm(TQWidget *tqparent, const char *)
+  KDE_EXPORT KCModule *create_apm(TQWidget *parent, const char *)
   {
-    return new ApmConfig(tqparent, "kcmlaptop");
+    return new ApmConfig(parent, "kcmlaptop");
   }
-  KDE_EXPORT KCModule *create_Profile(TQWidget *tqparent, const char *)
+  KDE_EXPORT KCModule *create_Profile(TQWidget *parent, const char *)
   {
-    return new ProfileConfig(tqparent, "kcmlaptop");
+    return new ProfileConfig(parent, "kcmlaptop");
   }
-  KDE_EXPORT KCModule *create_sony(TQWidget *tqparent, const char *)
+  KDE_EXPORT KCModule *create_sony(TQWidget *parent, const char *)
   {
-    return new SonyConfig(tqparent, "kcmlaptop");
+    return new SonyConfig(parent, "kcmlaptop");
   }
-  KDE_EXPORT KCModule *create_buttons(TQWidget *tqparent, const char *)
+  KDE_EXPORT KCModule *create_buttons(TQWidget *parent, const char *)
   {
-    return new ButtonsConfig(tqparent, "kcmlaptop");
+    return new ButtonsConfig(parent, "kcmlaptop");
   }
 
   KDE_EXPORT void init_battery()
@@ -111,9 +111,9 @@ extern "C"
      wake_laptop_daemon();
   }
 
-  KDE_EXPORT KCModule *create_laptop(TQWidget *tqparent, const char *)
+  KDE_EXPORT KCModule *create_laptop(TQWidget *parent, const char *)
   {
-	return new LaptopModule(tqparent, "kcmlaptop");
+	return new LaptopModule(parent, "kcmlaptop");
   }
 
   KDE_EXPORT void init_laptop()
@@ -124,8 +124,8 @@ extern "C"
 
 
 
-LaptopModule::LaptopModule(TQWidget *tqparent, const char *)
-  : KCModule(tqparent, "kcmlaptop")
+LaptopModule::LaptopModule(TQWidget *parent, const char *)
+  : KCModule(parent, "kcmlaptop")
 {
   {	// export ACPI options
     KConfig config("kcmlaptoprc", true /*readonly*/, false /*no globals*/);
@@ -136,34 +136,34 @@ LaptopModule::LaptopModule(TQWidget *tqparent, const char *)
     bool enablehibernate = config.readBoolEntry("EnableHibernate", false);
     bool enableperformance = config.readBoolEntry("EnablePerformance", false);
     bool enablethrottle = config.readBoolEntry("EnableThrottle", false);
-    laptop_portable::acpi_set_tqmask(enablestandby, enablesuspend, enablehibernate, enableperformance, enablethrottle);
+    laptop_portable::acpi_set_mask(enablestandby, enablesuspend, enablehibernate, enableperformance, enablethrottle);
 
     config.setGroup("ApmDefault");
 
     enablestandby = config.readBoolEntry("EnableStandby", false);
     enablesuspend = config.readBoolEntry("EnableSuspend", false);
-    laptop_portable::apm_set_tqmask(enablestandby, enablesuspend);
+    laptop_portable::apm_set_mask(enablestandby, enablesuspend);
     config.setGroup("SoftwareSuspendDefault");
     enablehibernate = config.readBoolEntry("EnableHibernate", false);
-    laptop_portable::software_suspend_set_tqmask(enablehibernate);
+    laptop_portable::software_suspend_set_mask(enablehibernate);
   }
   TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
   tab = new TQTabWidget(this);
   tqlayout->addWidget(tab);
 
-  battery = new BatteryConfig(tqparent, "kcmlaptop");
+  battery = new BatteryConfig(parent, "kcmlaptop");
   tab->addTab(battery, i18n("&Battery"));
   connect(battery, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
 
-  power = new PowerConfig(tqparent, "kcmlaptop");
+  power = new PowerConfig(parent, "kcmlaptop");
   tab->addTab(power, i18n("&Power Control"));
   connect(power, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
 
-  warning = new WarningConfig(0, tqparent, "kcmlaptop");
+  warning = new WarningConfig(0, parent, "kcmlaptop");
   tab->addTab(warning, i18n("Low Battery &Warning"));
   connect(warning, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
 
-  critical = new WarningConfig(1, tqparent, "kcmlaptop");
+  critical = new WarningConfig(1, parent, "kcmlaptop");
   tab->addTab(critical, i18n("Low Battery &Critical"));
   connect(critical, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
 
@@ -175,28 +175,28 @@ LaptopModule::LaptopModule(TQWidget *tqparent, const char *)
     int current_throttle;
     bool has_throttling = laptop_portable::get_system_throttling(0, current_throttle, throttle_list, active_list);
   if (laptop_portable::has_brightness() || has_profile || has_throttling) {
-  	profile = new ProfileConfig(tqparent, "kcmlaptop");
+  	profile = new ProfileConfig(parent, "kcmlaptop");
   	tab->addTab(profile, i18n("Default Power Profiles"));
   	connect(profile, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
   } else {
 	profile = 0;
   }
   if (laptop_portable::has_button(laptop_portable::LidButton) || laptop_portable::has_button(laptop_portable::PowerButton)) {
-  	buttons = new ButtonsConfig(tqparent, "kcmlaptop");
+  	buttons = new ButtonsConfig(parent, "kcmlaptop");
   	tab->addTab(buttons, i18n("Button Actions"));
   	connect(buttons, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
   } else {
         buttons = 0;
   }
   if (laptop_portable::has_acpi()) {
-  	acpi = new AcpiConfig(tqparent, "kcmlaptop");
+  	acpi = new AcpiConfig(parent, "kcmlaptop");
   	tab->addTab(acpi, i18n("&ACPI Config"));
   	connect(acpi, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
   } else {
         acpi = 0;
   }
   if (laptop_portable::has_apm()) {
-  	apm = new ApmConfig(tqparent, "kcmlaptop");
+  	apm = new ApmConfig(parent, "kcmlaptop");
   	tab->addTab(apm, i18n("&APM Config"));
   	connect(apm, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
   } else {
@@ -213,7 +213,7 @@ LaptopModule::LaptopModule(TQWidget *tqparent, const char *)
 		}
 	}
 	if (do_sony) {
-  		sony = new SonyConfig(tqparent, "kcmlaptop");
+  		sony = new SonyConfig(parent, "kcmlaptop");
   		tab->addTab(sony, i18n("&Sony Laptop Config"));
   		connect(sony, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
 	} else {
diff --git a/klaptopdaemon/main.h b/klaptopdaemon/main.h
index ddefe22..973c2c8 100644
--- a/klaptopdaemon/main.h
+++ b/klaptopdaemon/main.h
@@ -48,7 +48,7 @@ class LaptopModule : public KCModule
 
 public:
 
-  LaptopModule(TQWidget *tqparent, const char *name);
+  LaptopModule(TQWidget *parent, const char *name);
 
   void load();
   void save();
diff --git a/klaptopdaemon/pcmcia.cpp b/klaptopdaemon/pcmcia.cpp
index 4bde3b3..a2f4ba8 100644
--- a/klaptopdaemon/pcmcia.cpp
+++ b/klaptopdaemon/pcmcia.cpp
@@ -37,8 +37,8 @@
 #include "portable.h"
 #include "version.h"
 
-PcmciaConfig::PcmciaConfig (TQWidget * tqparent, const char *name)
-  : KCModule(tqparent, name)
+PcmciaConfig::PcmciaConfig (TQWidget * parent, const char *name)
+  : KCModule(parent, name)
 {
        KAboutData *about =
        new KAboutData(I18N_NOOP("kcmlaptop"),
diff --git a/klaptopdaemon/pcmcia.h b/klaptopdaemon/pcmcia.h
index 18eec79..60fc24f 100644
--- a/klaptopdaemon/pcmcia.h
+++ b/klaptopdaemon/pcmcia.h
@@ -43,7 +43,7 @@ class PcmciaConfig : public KCModule
   Q_OBJECT
   TQ_OBJECT
 public:
-  PcmciaConfig( TQWidget *tqparent=0, const char* name=0);
+  PcmciaConfig( TQWidget *parent=0, const char* name=0);
 
   void save( void );
   void load();
diff --git a/klaptopdaemon/portable.cpp b/klaptopdaemon/portable.cpp
index 29c4d22..346a311 100644
--- a/klaptopdaemon/portable.cpp
+++ b/klaptopdaemon/portable.cpp
@@ -602,7 +602,7 @@ laptop_portable::has_software_suspend(int type)
 }
 
 void
-laptop_portable::software_suspend_set_tqmask(bool hibernate)
+laptop_portable::software_suspend_set_mask(bool hibernate)
 {
 	software_suspend_is_preferred = hibernate;
 }
@@ -677,17 +677,17 @@ has_acpi_power()
 	return(val);
 }
 
-static unsigned long acpi_sleep_enabled = 0x00;	// acpi sleep functions enabled tqmask
+static unsigned long acpi_sleep_enabled = 0x00;	// acpi sleep functions enabled mask
 
 
 static bool
 has_acpi_sleep(int state) 
 {
 	static int known=0;
-	static unsigned long tqmask=0;
+	static unsigned long mask=0;
 	if (known != last_seed) {
 		known = last_seed;
-		tqmask = 0;
+		mask = 0;
 
 		TQFile p("/sys/power/state");
 		TQFile f("/proc/acpi/sleep");
@@ -701,11 +701,11 @@ has_acpi_sleep(int state)
 				TQString s = *i;
 				
 				if (s.compare("standby")==0)
-				tqmask |= (1<<1);
+				mask |= (1<<1);
 				else if (s.compare("mem")==0)
-				tqmask |= (1<<3);
+				mask |= (1<<3);
 				else if (s.compare("disk")==0)
-				tqmask |= (1<<4);
+				mask |= (1<<4);
 			}
 			p.close();
 		}
@@ -719,19 +719,19 @@ has_acpi_sleep(int state)
 				if (s[0] == 'S') {
 					int c = s[1].digitValue();
 					if (c >= 0 && c <= 9)
-						tqmask |= 1<<c;
+						mask |= 1<<c;
 				}
 			}
 			f.close();
 		}
 	}
-	return((tqmask&acpi_sleep_enabled&(1<<state)) != 0);
+	return((mask&acpi_sleep_enabled&(1<<state)) != 0);
 }
 
 static bool acpi_performance_enabled = 0;
 static bool acpi_throttle_enabled = 0;
 void
-laptop_portable::acpi_set_tqmask(bool standby, bool suspend, bool hibernate, bool perf, bool throttle)
+laptop_portable::acpi_set_mask(bool standby, bool suspend, bool hibernate, bool perf, bool throttle)
 {
 	acpi_sleep_enabled = 
 			(standby ? (1<<1)|(1<<2) : 0) |
@@ -755,7 +755,7 @@ invoke_acpi_helper(const char *param, const char *param2, const char *param3)
 	proc.start(KProcess::Block);	// helper runs fast and we want to see the result
 }
 
-static unsigned long apm_sleep_enabled = 0x0c;	// apm sleep functions enabled tqmask
+static unsigned long apm_sleep_enabled = 0x0c;	// apm sleep functions enabled mask
 static bool
 has_apm_sleep(int state) 
 {
@@ -763,7 +763,7 @@ has_apm_sleep(int state)
 }
 
 void
-laptop_portable::apm_set_tqmask(bool standby, bool suspend)
+laptop_portable::apm_set_mask(bool standby, bool suspend)
 {
 	apm_sleep_enabled = 
 			(standby ? 1<<2 : 0) |
@@ -939,14 +939,14 @@ int laptop_portable::has_hibernation()
 //	to get any software they lack
 //
 
-KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *tqparent)
+KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *parent)
 {
 	if (access("/proc/acpi", F_OK) == 0) {	// probably has default kernel ACPI installed
-		KActiveLabel* explain = new KActiveLabel(i18n("Your computer seems to have a partial ACPI installation. ACPI was probably enabled, but some of the sub-options were not - you need to enable at least 'AC Adaptor' and 'Control Method Battery' and then rebuild your kernel."), tqparent);
+		KActiveLabel* explain = new KActiveLabel(i18n("Your computer seems to have a partial ACPI installation. ACPI was probably enabled, but some of the sub-options were not - you need to enable at least 'AC Adaptor' and 'Control Method Battery' and then rebuild your kernel."), parent);
 		return(explain);
 	}
 
-	KActiveLabel* explain = new KActiveLabel(i18n("Your computer doesn't have the Linux APM (Advanced Power Management) or ACPI software installed, or doesn't have the APM kernel drivers installed - check out the <a href=\"http://www.linuxdoc.org/HOWTO/Laptop-HOWTO.html\">Linux Laptop-HOWTO</a> document for information on how to install APM."), tqparent);
+	KActiveLabel* explain = new KActiveLabel(i18n("Your computer doesn't have the Linux APM (Advanced Power Management) or ACPI software installed, or doesn't have the APM kernel drivers installed - check out the <a href=\"http://www.linuxdoc.org/HOWTO/Laptop-HOWTO.html\">Linux Laptop-HOWTO</a> document for information on how to install APM."), parent);
  
 	return(explain);
 }
@@ -954,23 +954,23 @@ KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *tqparen
 //
 //	explain to the user what they need to do to get suspend/resume to work from user mode
 //
-TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *tqparent)
+TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *parent)
 {
 	if (::has_apm()) {
                 // TODO: remove linefeed from string, can't do it right now coz we have a string freeze
  		TQLabel* note = new KRichTextLabel(i18n("\nIf you make /usr/bin/apm setuid then you will also "
 						"be able to choose 'suspend' and 'standby' in the above "
 						"dialog - check out the help button below to find out "
-						"how to do this").replace("\n", TQString()), tqparent);
+						"how to do this").replace("\n", TQString()), parent);
 		return(note);
 	}
 	if (::has_acpi()) {
                 // TODO: remove linefeed from string, can't do it right now coz we have a string freeze
- 		TQLabel* note = new KRichTextLabel(i18n("\nYou may need to enable ACPI suspend/resume in the ACPI panel").replace("\n", TQString()), tqparent);
+ 		TQLabel* note = new KRichTextLabel(i18n("\nYou may need to enable ACPI suspend/resume in the ACPI panel").replace("\n", TQString()), parent);
 		return(note);
 	}
         // TODO: remove linefeed from string, can't do it right now coz we have a string freeze
- 	TQLabel* note = new KRichTextLabel(i18n("\nYour system does not support suspend/standby").replace("\n", TQString()), tqparent);
+ 	TQLabel* note = new KRichTextLabel(i18n("\nYour system does not support suspend/standby").replace("\n", TQString()), parent);
 	return(note);
 }
 
@@ -1040,20 +1040,20 @@ void get_pcmcia_info()
 //	pcmcia support - this will be replaced by better - pcmcia support being worked on by
 //	others
 //
-TQLabel *laptop_portable::pcmcia_info(int x, TQWidget *tqparent)
+TQLabel *laptop_portable::pcmcia_info(int x, TQWidget *parent)
 {
 	if (x == 0) 
 		get_pcmcia_info();
 	if (!present) {
 		if (x == 1)
-      			return(new TQLabel(i18n("No PCMCIA controller detected"), tqparent));
-      		return(new TQLabel(i18n(""), tqparent));
+      			return(new TQLabel(i18n("No PCMCIA controller detected"), parent));
+      		return(new TQLabel(i18n(""), parent));
 	} else {
 		switch (x) {
-        	case 0: return(new TQLabel(i18n("Card 0:"), tqparent));
-        	case 1: return(new TQLabel(tmp0, tqparent));
-		case 2: return(new TQLabel(i18n("Card 1:"), tqparent));
-        	default:return(new TQLabel(tmp1, tqparent));  
+        	case 0: return(new TQLabel(i18n("Card 0:"), parent));
+        	case 1: return(new TQLabel(tmp0, parent));
+		case 2: return(new TQLabel(i18n("Card 1:"), parent));
+        	default:return(new TQLabel(tmp1, parent));  
 		}
 	}
 }
@@ -2139,7 +2139,7 @@ int laptop_portable::has_hibernation()
 //	explain to the user what they need to do if has_power_management() returned 0
 //	to get any software they lack
 //
-KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *tqparent)
+KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *parent)
 {
   int fd;
   KActiveLabel *explain;
@@ -2148,22 +2148,22 @@ KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *tqparen
   if (fd == -1) {
     switch (errno) {
     case ENOENT:
-      explain = new KActiveLabel(i18n("There is no /dev/apm file on this system. Please review the FreeBSD handbook on how to create a device node for the APM device driver (man 4 apm)."), tqparent);
+      explain = new KActiveLabel(i18n("There is no /dev/apm file on this system. Please review the FreeBSD handbook on how to create a device node for the APM device driver (man 4 apm)."), parent);
       break;
     case EACCES:
-      explain = new KActiveLabel(i18n("Your system has the proper device node for APM support, however you cannot access it. If you are logged in as root right now, you have a problem, otherwise contact your local sysadmin and ask for read/write access to /dev/apm."), tqparent);
+      explain = new KActiveLabel(i18n("Your system has the proper device node for APM support, however you cannot access it. If you are logged in as root right now, you have a problem, otherwise contact your local sysadmin and ask for read/write access to /dev/apm."), parent);
       break;
     case ENXIO:
-      explain = new KActiveLabel(i18n("Your kernel lacks support for Advanced Power Management."), tqparent);
+      explain = new KActiveLabel(i18n("Your kernel lacks support for Advanced Power Management."), parent);
       break;
       break;
     default:
-      explain = new KActiveLabel(i18n("There was a generic error while opening /dev/apm."), tqparent);
+      explain = new KActiveLabel(i18n("There was a generic error while opening /dev/apm."), parent);
       break;
     }
   } else {
     close(fd);
-    explain = new KActiveLabel(i18n("APM has most likely been disabled."), tqparent);
+    explain = new KActiveLabel(i18n("APM has most likely been disabled."), parent);
   }
   
   return(explain);
@@ -2172,9 +2172,9 @@ KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *tqparen
 //
 //	explain to the user what they need to do to get suspend/resume to work from user mode
 //
-TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *tqparent)
+TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *parent)
 {
- 	TQLabel* note = new TQLabel(" ", tqparent);
+ 	TQLabel* note = new TQLabel(" ", parent);
 	return(note);
 }
 
@@ -2183,11 +2183,11 @@ TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *tqparent)
 //	pcmcia support - this will be replaced by better - pcmcia support being worked on by
 //	others
 //
-TQLabel *laptop_portable::pcmcia_info(int x, TQWidget *tqparent)
+TQLabel *laptop_portable::pcmcia_info(int x, TQWidget *parent)
 {
       	if (x == 0)
-		return(new TQLabel(i18n("No PCMCIA controller detected"), tqparent));
-      	return(new TQLabel(i18n(""), tqparent));
+		return(new TQLabel(i18n("No PCMCIA controller detected"), parent));
+      	return(new TQLabel(i18n(""), parent));
 }
 //
 //	puts us into standby mode
@@ -2239,7 +2239,7 @@ void laptop_portable::invoke_hibernation()
 //ACPI specific - chances are you don't need to implement this one
 //
 void
-laptop_portable::acpi_set_tqmask(bool, bool, bool, bool, bool )
+laptop_portable::acpi_set_mask(bool, bool, bool, bool, bool )
 {
 	// INSERT HERE
 }
@@ -2258,7 +2258,7 @@ int laptop_portable::has_apm(int type)
 }
 
 void
-laptop_portable::apm_set_tqmask(bool , bool )
+laptop_portable::apm_set_mask(bool , bool )
 {
 }
 
@@ -2267,7 +2267,7 @@ laptop_portable::apm_set_tqmask(bool , bool )
 //	adds extra widgets to the battery panel
 //
 void
-laptop_portable::extra_config(TQWidget * /*tqparent*/, KConfig * /*config*/, TQVBoxLayout * /*tqlayout*/)
+laptop_portable::extra_config(TQWidget * /*parent*/, KConfig * /*config*/, TQVBoxLayout * /*tqlayout*/)
 {
 	// INSERT HERE
 }
@@ -2423,7 +2423,7 @@ laptop_portable::has_software_suspend(int /*type*/)
 }
 
 void
-laptop_portable::software_suspend_set_tqmask(bool /*hibernate*/)
+laptop_portable::software_suspend_set_mask(bool /*hibernate*/)
 {
 	// software_suspend_is_preferred = hibernate;
 }
@@ -2544,7 +2544,7 @@ int laptop_portable::has_hibernation()
 //     explain to the user what they need to do if has_power_management() returned 0
 //     to get any software they lack
 //
-KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *tqparent)
+KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *parent)
 {
   int fd;
   KActiveLabel *explain;
@@ -2553,22 +2553,22 @@ KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *tqparen
   if (fd == -1) {
     switch (errno) {
     case ENOENT:
-      explain = new KActiveLabel(i18n("There is no /dev/apm file on this system. Please review the NetBSD documentation on how to create a device node for the APM device driver (man 4 apm)."), tqparent);
+      explain = new KActiveLabel(i18n("There is no /dev/apm file on this system. Please review the NetBSD documentation on how to create a device node for the APM device driver (man 4 apm)."), parent);
       break;
     case EACCES:
-      explain = new KActiveLabel(i18n("Your system has the proper device node for APM support, however you cannot access it. If you have APM compiled into the kernel this should not happen."), tqparent);
+      explain = new KActiveLabel(i18n("Your system has the proper device node for APM support, however you cannot access it. If you have APM compiled into the kernel this should not happen."), parent);
       break;
     case ENXIO:
-      explain = new KActiveLabel(i18n("Your kernel lacks support for Advanced Power Management."), tqparent);
+      explain = new KActiveLabel(i18n("Your kernel lacks support for Advanced Power Management."), parent);
       break;
       break;
     default:
-      explain = new KActiveLabel(i18n("There was a generic error while opening /dev/apm."), tqparent);
+      explain = new KActiveLabel(i18n("There was a generic error while opening /dev/apm."), parent);
       break;
     }
   } else {
     close(fd);
-    explain = new KActiveLabel(i18n("APM has most likely been disabled."), tqparent);
+    explain = new KActiveLabel(i18n("APM has most likely been disabled."), parent);
   }
   
   return(explain);
@@ -2577,10 +2577,10 @@ KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *tqparen
 //
 //     explain to the user what they need to do to get suspend/resume to work from user mode
 //
-TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *tqparent)
+TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *parent)
 {
 	// INSERT HERE
-       TQLabel* note = new TQLabel(" ", tqparent);
+       TQLabel* note = new TQLabel(" ", parent);
        return(note);
 }
 
@@ -2588,12 +2588,12 @@ TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *tqparent)
 //     pcmcia support - this will be replaced by better - pcmcia support being worked on by
 //     others
 //
-TQLabel *laptop_portable::pcmcia_info(int x, TQWidget *tqparent)
+TQLabel *laptop_portable::pcmcia_info(int x, TQWidget *parent)
 {
 	// INSERT HERE
        if (x == 0)
-               return(new TQLabel(i18n("No PCMCIA controller detected"), tqparent));
-       return(new TQLabel(i18n(""), tqparent));
+               return(new TQLabel(i18n("No PCMCIA controller detected"), parent));
+       return(new TQLabel(i18n(""), parent));
 }
 
 //
@@ -2636,7 +2636,7 @@ void laptop_portable::invoke_hibernation()
 //ACPI specific - chances are you don't need to implement this one
 //
 void
-laptop_portable::acpi_set_tqmask(bool, bool, bool, bool, bool )
+laptop_portable::acpi_set_mask(bool, bool, bool, bool, bool )
 {
 	// INSERT HERE
 }
@@ -2655,7 +2655,7 @@ int laptop_portable::has_apm(int type)
 }
 
 void
-laptop_portable::apm_set_tqmask(bool , bool )
+laptop_portable::apm_set_mask(bool , bool )
 {
 }
 
@@ -2861,9 +2861,9 @@ int laptop_portable::has_hibernation()
 //	explain to the user what they need to do if has_power_management() returned 0
 //	to get any software they lack
 //
-KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *tqparent)
+KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *parent)
 {
-	KActiveLabel* explain = new KActiveLabel(i18n("Your computer or operating system is not supported by the current version of the\nKDE laptop control panels. If you want help porting these panels to work with it\nplease contact paul@taniwha.com."), tqparent);
+	KActiveLabel* explain = new KActiveLabel(i18n("Your computer or operating system is not supported by the current version of the\nKDE laptop control panels. If you want help porting these panels to work with it\nplease contact paul@taniwha.com."), parent);
 	// INSERT HERE
 	return(explain);
 }
@@ -2871,9 +2871,9 @@ KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *tqparen
 //
 //	explain to the user what they need to do to get suspend/resume to work from user mode
 //
-TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *tqparent)
+TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *parent)
 {
- 	TQLabel* note = new TQLabel(" ", tqparent);
+ 	TQLabel* note = new TQLabel(" ", parent);
 	// INSERT HERE
 	return(note);
 }
@@ -2883,12 +2883,12 @@ TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *tqparent)
 //	pcmcia support - this will be replaced by better - pcmcia support being worked on by
 //	others
 //
-TQLabel *laptop_portable::pcmcia_info(int x, TQWidget *tqparent)
+TQLabel *laptop_portable::pcmcia_info(int x, TQWidget *parent)
 {
 	// INSERT HERE
       	if (x == 0)
-		return(new TQLabel(i18n("No PCMCIA controller detected"), tqparent));
-      	return(new TQLabel(i18n(""), tqparent));
+		return(new TQLabel(i18n("No PCMCIA controller detected"), parent));
+      	return(new TQLabel(i18n(""), parent));
 }
 //
 //	puts us into standby mode
@@ -2917,7 +2917,7 @@ void laptop_portable::invoke_hibernation()
 //ACPI specific - chances are you don't need to implement this one
 //
 void
-laptop_portable::acpi_set_tqmask(bool, bool, bool, bool, bool )
+laptop_portable::acpi_set_mask(bool, bool, bool, bool, bool )
 {
 	// INSERT HERE
 }
@@ -2929,7 +2929,7 @@ int laptop_portable::has_acpi(int)
 }
 
 void
-laptop_portable::apm_set_tqmask(bool, bool)
+laptop_portable::apm_set_mask(bool, bool)
 {
 	// 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 *tqparent, KConfig *config, TQVBoxLayout *tqlayout)
+laptop_portable::extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *tqlayout)
 {
 	// INSERT HERE
 }
@@ -3080,7 +3080,7 @@ laptop_portable::has_software_suspend(int type)
 }
 
 void
-laptop_portable::software_suspend_set_tqmask(bool hibernate)
+laptop_portable::software_suspend_set_mask(bool hibernate)
 {
 	// software_suspend_is_preferred = hibernate;
 }
diff --git a/klaptopdaemon/portable.h b/klaptopdaemon/portable.h
index d530fd4..b4843e1 100644
--- a/klaptopdaemon/portable.h
+++ b/klaptopdaemon/portable.h
@@ -72,9 +72,9 @@ public:
 	static void set_brightness(bool blank, int val);	// val = 0-255 255 brightest, 0 means dimmest (if !blank it must be still visible), 
 	static int get_brightness();		// returns 0-255 brightness, -1 if you can't
 	static TQString cpu_frequency();		// Returns the cpu freq.
-	static KActiveLabel *no_power_management_explanation(TQWidget *tqparent);
-	static TQLabel *how_to_do_suspend_resume(TQWidget *tqparent);
-	static TQLabel *pcmcia_info(int x, TQWidget *tqparent);
+	static KActiveLabel *no_power_management_explanation(TQWidget *parent);
+	static TQLabel *how_to_do_suspend_resume(TQWidget *parent);
+	static TQLabel *pcmcia_info(int x, TQWidget *parent);
 
 	/**
 	 * Put this computer into standby mode.
@@ -98,10 +98,10 @@ 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 *tqparent, KConfig *config, TQVBoxLayout *tqlayout);
-	static void acpi_set_tqmask(bool standby, bool suspend, bool hibernate, bool perf, bool throttle);	
-	static void apm_set_tqmask(bool standby, bool suspend);
-	static void software_suspend_set_tqmask(bool hibernate);
+	static void extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *tqlayout);
+	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);
 
 	/**
 	 * Get a list of available performance profiles.
diff --git a/klaptopdaemon/power.cpp b/klaptopdaemon/power.cpp
index e033148..fce096e 100644
--- a/klaptopdaemon/power.cpp
+++ b/klaptopdaemon/power.cpp
@@ -45,8 +45,8 @@
 #include <tqtooltip.h>
 extern void wake_laptop_daemon();
 
-PowerConfig::PowerConfig (TQWidget * tqparent, const char *name)
-  : KCModule(tqparent, name),
+PowerConfig::PowerConfig (TQWidget * parent, const char *name)
+  : KCModule(parent, name),
     nopowerBox(0),
     nopowerStandby(0),
     nopowerSuspend(0),
diff --git a/klaptopdaemon/power.h b/klaptopdaemon/power.h
index d856dcd..e27d901 100644
--- a/klaptopdaemon/power.h
+++ b/klaptopdaemon/power.h
@@ -43,7 +43,7 @@ class PowerConfig : public KCModule
   Q_OBJECT
   TQ_OBJECT
 public:
-  PowerConfig( TQWidget *tqparent=0, const char* name=0);
+  PowerConfig( TQWidget *parent=0, const char* name=0);
     ~PowerConfig();
   void save( void );
   void load();
diff --git a/klaptopdaemon/profile.cpp b/klaptopdaemon/profile.cpp
index d8f442f..b16ad1a 100644
--- a/klaptopdaemon/profile.cpp
+++ b/klaptopdaemon/profile.cpp
@@ -53,8 +53,8 @@
 
 extern void wake_laptop_daemon();
 
-ProfileConfig::ProfileConfig(TQWidget * tqparent, const char *name)
-  : KCModule(tqparent, name)
+ProfileConfig::ProfileConfig(TQWidget * parent, const char *name)
+  : KCModule(parent, name)
 {
     TQStringList performance_list;
     int current_performance;
diff --git a/klaptopdaemon/profile.h b/klaptopdaemon/profile.h
index 2d44e59..1abadef 100644
--- a/klaptopdaemon/profile.h
+++ b/klaptopdaemon/profile.h
@@ -44,7 +44,7 @@ class ProfileConfig : public KCModule
   Q_OBJECT
   TQ_OBJECT
 public:
-  ProfileConfig( TQWidget *tqparent=0, const char* name=0);
+  ProfileConfig( TQWidget *parent=0, const char* name=0);
   ~ProfileConfig( );     
 
   void save( void );
diff --git a/klaptopdaemon/sony.cpp b/klaptopdaemon/sony.cpp
index c922fd5..497a566 100644
--- a/klaptopdaemon/sony.cpp
+++ b/klaptopdaemon/sony.cpp
@@ -55,8 +55,8 @@
 
 extern void wake_laptop_daemon();
 
-SonyConfig::SonyConfig(TQWidget * tqparent, const char *name)
-  : KCModule(tqparent, name)
+SonyConfig::SonyConfig(TQWidget * parent, const char *name)
+  : KCModule(parent, name)
 {
     KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
 
diff --git a/klaptopdaemon/sony.h b/klaptopdaemon/sony.h
index 80648e2..1f80d3c 100644
--- a/klaptopdaemon/sony.h
+++ b/klaptopdaemon/sony.h
@@ -43,7 +43,7 @@ class SonyConfig : public KCModule
   Q_OBJECT
   TQ_OBJECT
 public:
-  SonyConfig( TQWidget *tqparent=0, const char* name=0);
+  SonyConfig( TQWidget *parent=0, const char* name=0);
   ~SonyConfig( );     
 
   void save( void );
diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp
index 826489a..84d8501 100644
--- a/klaptopdaemon/warning.cpp
+++ b/klaptopdaemon/warning.cpp
@@ -44,8 +44,8 @@
 
 extern void wake_laptop_daemon();
 
-WarningConfig::WarningConfig (int t, TQWidget * tqparent, const char *name)
-  : KCModule(tqparent, name),
+WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
+  : KCModule(parent, name),
     checkSuspend(0),
     checkStandby(0),
     checkHibernate(0)
diff --git a/klaptopdaemon/warning.h b/klaptopdaemon/warning.h
index 2c52348..fa0383b 100644
--- a/klaptopdaemon/warning.h
+++ b/klaptopdaemon/warning.h
@@ -43,7 +43,7 @@ class WarningConfig : public KCModule
   Q_OBJECT
   TQ_OBJECT
 public:
-  WarningConfig(int x, TQWidget *tqparent=0, const char* name=0);
+  WarningConfig(int x, TQWidget *parent=0, const char* name=0);
   ~WarningConfig();
   void save( void );
   void load();
diff --git a/klaptopdaemon/xautolock_diy.c b/klaptopdaemon/xautolock_diy.c
index 1aacf5e..c816ae9 100644
--- a/klaptopdaemon/xautolock_diy.c
+++ b/klaptopdaemon/xautolock_diy.c
@@ -95,7 +95,7 @@ static void
 selectEvents (Window window, Bool substructureOnly)
 {
   Window            root;              /* root window of the window */
-  Window            tqparent;            /* tqparent of the window      */
+  Window            parent;            /* parent of the window      */
   Window*           tqchildren;          /* tqchildren of the window    */
   unsigned          nofChildren = 0;   /* number of tqchildren        */
   unsigned          i;                 /* loop counter              */
@@ -104,9 +104,9 @@ selectEvents (Window window, Bool substructureOnly)
   if( xautolock_ignoreWindow( window ))
       return;
  /*
-  *  Start by querying the server about the root and tqparent windows.
+  *  Start by querying the server about the root and parent windows.
   */
-  if (!XQueryTree (queue.display, window, &root, &tqparent,
+  if (!XQueryTree (queue.display, window, &root, &parent,
                    &tqchildren, &nofChildren))
   {
     return;
@@ -132,7 +132,7 @@ selectEvents (Window window, Bool substructureOnly)
   }
   else
   {
-    if (tqparent == None) /* the *real* rootwindow */
+    if (parent == None) /* the *real* rootwindow */
     {
       attribs.all_event_masks = 
       attribs.do_not_propagate_mask = KeyPressMask;
@@ -178,7 +178,7 @@ selectEvents (Window window, Bool substructureOnly)
   *  XGrabServer(), but that'd be an impolite thing to do, and since it
   *  isn't required...
   */
-  if (!XQueryTree (queue.display, window, &root, &tqparent,
+  if (!XQueryTree (queue.display, window, &root, &parent,
                    &tqchildren, &nofChildren))
   {
     return;
diff --git a/klaptopdaemon/xautolock_engine.c b/klaptopdaemon/xautolock_engine.c
index c293d9e..bbce54e 100644
--- a/klaptopdaemon/xautolock_engine.c
+++ b/klaptopdaemon/xautolock_engine.c
@@ -74,7 +74,7 @@ xautolock_queryPointer (Display* d)
 {
   Window           dummyWin;         /* as it says                    */
   int              dummyInt;         /* as it says                    */
-  unsigned         tqmask;             /* modifier tqmask                 */
+  unsigned         mask;             /* modifier mask                 */
   int              rootX;            /* as it says                    */
   int              rootY;            /* as it says                    */
   int              corner;           /* corner index                  */
@@ -104,7 +104,7 @@ xautolock_queryPointer (Display* d)
   *  of pointer events.
   */
   if (!XQueryPointer (d, root, &root, &dummyWin, &rootX, &rootY,
-                      &dummyInt, &dummyInt, &tqmask))
+                      &dummyInt, &dummyInt, &mask))
   {
    /*
     *  Pointer has moved to another screen, so let's find out which one.
@@ -121,7 +121,7 @@ xautolock_queryPointer (Display* d)
 
   if (   rootX == prevRootX
       && rootY == prevRootY
-      && tqmask == prevMask)
+      && mask == prevMask)
   {
   xautolock_corner_t* corners = xautolock_corners;
    /*
@@ -186,7 +186,7 @@ xautolock_queryPointer (Display* d)
 #endif
     prevRootX = rootX;
     prevRootY = rootY;
-    prevMask = tqmask;
+    prevMask = mask;
 
     xautolock_resetTriggers ();
   }