8 files changed, 13 insertions, 13 deletions
diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp
index 5e2c279..e082d55 100644
--- a/klaptopdaemon/battery.cpp
+++ b/klaptopdaemon/battery.cpp
@@ -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 cec7c60..51c9ce7 100644
--- a/klaptopdaemon/buttons.cpp
+++ b/klaptopdaemon/buttons.cpp
@@ -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 );
 
diff --git a/klaptopdaemon/krichtextlabel.h b/klaptopdaemon/krichtextlabel.h
index 9e7cd8a..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>
  */
diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp
index 535e391..6d30933 100644
--- a/klaptopdaemon/main.cpp
+++ b/klaptopdaemon/main.cpp
@@ -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/portable.cpp b/klaptopdaemon/portable.cpp
index 0ac3568..7c5d227 100644
--- a/klaptopdaemon/portable.cpp
+++ b/klaptopdaemon/portable.cpp
@@ -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 56ba373..446e900 100644
--- a/klaptopdaemon/power.cpp
+++ b/klaptopdaemon/power.cpp
@@ -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 );
 
diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp
index 935e47d..4845fdc 100644
--- a/klaptopdaemon/warning.cpp
+++ b/klaptopdaemon/warning.cpp
@@ -236,7 +236,7 @@ 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" ) );