1 files changed, 22 insertions, 22 deletions

diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp
index 5068a4e..7a8c06b 100644
--- a/klaptopdaemon/main.cpp
+++ b/klaptopdaemon/main.cpp
@@ -48,49 +48,49 @@ extern void wake_laptop_daemon();
 extern "C"
 {
 
-  KDE_EXPORT TDECModule *create_pcmcia(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_pcmcia(TQWidget *parent, const char *)
   {
     return new PcmciaConfig(parent, "kcmlaptop");
   }
 
-  KDE_EXPORT TDECModule *create_bwarning(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_bwarning(TQWidget *parent, const char *)
   {
     return new WarningConfig(0, parent, "kcmlaptop");
   }
-  KDE_EXPORT TDECModule *create_cwarning(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_cwarning(TQWidget *parent, const char *)
   {
     return new WarningConfig(1, parent, "kcmlaptop");
   }
-  KDE_EXPORT TDECModule *create_battery(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_battery(TQWidget *parent, const char *)
   {
     return new BatteryConfig(parent, "kcmlaptop");
   }
-  KDE_EXPORT TDECModule *create_power(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_power(TQWidget *parent, const char *)
   {
     return new PowerConfig(parent, "kcmlaptop");
   }
-  KDE_EXPORT TDECModule *create_acpi(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_acpi(TQWidget *parent, const char *)
   {
     return new AcpiConfig(parent, "kcmlaptop");
   }
-  KDE_EXPORT TDECModule *create_apm(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_apm(TQWidget *parent, const char *)
   {
     return new ApmConfig(parent, "kcmlaptop");
   }
-  KDE_EXPORT TDECModule *create_Profile(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_Profile(TQWidget *parent, const char *)
   {
     return new ProfileConfig(parent, "kcmlaptop");
   }
-  KDE_EXPORT TDECModule *create_sony(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_sony(TQWidget *parent, const char *)
   {
     return new SonyConfig(parent, "kcmlaptop");
   }
-  KDE_EXPORT TDECModule *create_buttons(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_buttons(TQWidget *parent, const char *)
   {
     return new ButtonsConfig(parent, "kcmlaptop");
   }
 
-  KDE_EXPORT void init_battery()
+  TDE_EXPORT void init_battery()
   {
     TDEConfig config("kcmlaptoprc", true /*readonly*/, false /*no globals*/);
     config.setGroup("BatteryDefault");
@@ -111,12 +111,12 @@ extern "C"
      wake_laptop_daemon();
   }
 
-  KDE_EXPORT TDECModule *create_laptop(TQWidget *parent, const char *)
+  TDE_EXPORT TDECModule *create_laptop(TQWidget *parent, const char *)
   {
 	return new LaptopModule(parent, "kcmlaptop");
   }
 
-  KDE_EXPORT void init_laptop()
+  TDE_EXPORT void init_laptop()
   {
 	init_battery();
   }
@@ -153,19 +153,19 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *)
 
   battery = new BatteryConfig(parent, "kcmlaptop");
   tab->addTab(battery, i18n("&Battery"));
-  connect(battery, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(battery, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   power = new PowerConfig(parent, "kcmlaptop");
   tab->addTab(power, i18n("&Power Control"));
-  connect(power, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(power, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   warning = new WarningConfig(0, parent, "kcmlaptop");
   tab->addTab(warning, i18n("Low Battery &Warning"));
-  connect(warning, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(warning, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
   critical = new WarningConfig(1, parent, "kcmlaptop");
   tab->addTab(critical, i18n("Low Battery &Critical"));
-  connect(critical, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  connect(critical, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 
     TQStringList profile_list;
     int current_profile;
@@ -177,28 +177,28 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *)
   if (laptop_portable::has_brightness() || has_profile || has_throttling) {
   	profile = new ProfileConfig(parent, "kcmlaptop");
   	tab->addTab(profile, i18n("Default Power Profiles"));
-  	connect(profile, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  	connect(profile, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
   } else {
 	profile = 0;
   }
   if (laptop_portable::has_button(laptop_portable::LidButton) || laptop_portable::has_button(laptop_portable::PowerButton)) {
   	buttons = new ButtonsConfig(parent, "kcmlaptop");
   	tab->addTab(buttons, i18n("Button Actions"));
-  	connect(buttons, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  	connect(buttons, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
   } else {
         buttons = 0;
   }
   if (laptop_portable::has_acpi()) {
   	acpi = new AcpiConfig(parent, "kcmlaptop");
   	tab->addTab(acpi, i18n("&ACPI Config"));
-  	connect(acpi, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  	connect(acpi, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
   } else {
         acpi = 0;
   }
   if (laptop_portable::has_apm()) {
   	apm = new ApmConfig(parent, "kcmlaptop");
   	tab->addTab(apm, i18n("&APM Config"));
-  	connect(apm, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  	connect(apm, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
   } else {
         apm = 0;
   }
@@ -215,7 +215,7 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *)
 	if (do_sony) {
   		sony = new SonyConfig(parent, "kcmlaptop");
   		tab->addTab(sony, i18n("&Sony Laptop Config"));
-  		connect(sony, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+  		connect(sony, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
 	} else {
 		sony = 0;
 	}