diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:38:13 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:38:13 -0600 |
commit | 4bb787f41f7cdefac2aac33ef59317b7157302c1 (patch) | |
tree | c9726401d4eeb6fff8e78c4e35facb644c417e77 /klaptopdaemon | |
parent | aef5eada7f51ee48f3d21448db290bd8f06953a8 (diff) | |
download | tdeutils-4bb787f41f7cdefac2aac33ef59317b7157302c1.tar.gz tdeutils-4bb787f41f7cdefac2aac33ef59317b7157302c1.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'klaptopdaemon')
-rw-r--r-- | klaptopdaemon/acpi.cpp | 4 | ||||
-rw-r--r-- | klaptopdaemon/acpi.h | 6 | ||||
-rw-r--r-- | klaptopdaemon/apm.cpp | 4 | ||||
-rw-r--r-- | klaptopdaemon/apm.h | 6 | ||||
-rw-r--r-- | klaptopdaemon/battery.cpp | 4 | ||||
-rw-r--r-- | klaptopdaemon/battery.h | 6 | ||||
-rw-r--r-- | klaptopdaemon/buttons.cpp | 4 | ||||
-rw-r--r-- | klaptopdaemon/buttons.h | 6 | ||||
-rw-r--r-- | klaptopdaemon/daemon_state.cpp | 2 | ||||
-rw-r--r-- | klaptopdaemon/daemondock.cpp | 6 | ||||
-rw-r--r-- | klaptopdaemon/laptop_daemon.cpp | 2 | ||||
-rw-r--r-- | klaptopdaemon/main.cpp | 28 | ||||
-rw-r--r-- | klaptopdaemon/main.h | 2 | ||||
-rw-r--r-- | klaptopdaemon/pcmcia.cpp | 4 | ||||
-rw-r--r-- | klaptopdaemon/pcmcia.h | 2 | ||||
-rw-r--r-- | klaptopdaemon/portable.cpp | 10 | ||||
-rw-r--r-- | klaptopdaemon/portable.h | 2 | ||||
-rw-r--r-- | klaptopdaemon/power.cpp | 4 | ||||
-rw-r--r-- | klaptopdaemon/power.h | 6 | ||||
-rw-r--r-- | klaptopdaemon/profile.cpp | 4 | ||||
-rw-r--r-- | klaptopdaemon/profile.h | 6 | ||||
-rw-r--r-- | klaptopdaemon/sony.cpp | 4 | ||||
-rw-r--r-- | klaptopdaemon/sony.h | 6 | ||||
-rw-r--r-- | klaptopdaemon/warning.cpp | 4 | ||||
-rw-r--r-- | klaptopdaemon/warning.h | 6 |
25 files changed, 69 insertions, 69 deletions
diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp index e66513b..48b3788 100644 --- a/klaptopdaemon/acpi.cpp +++ b/klaptopdaemon/acpi.cpp @@ -52,11 +52,11 @@ extern void wake_laptop_daemon(); AcpiConfig::AcpiConfig (TQWidget * parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages - config = new KConfig("kcmlaptoprc"); + config = new TDEConfig("kcmlaptoprc"); TQVBoxLayout *top_layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/klaptopdaemon/acpi.h b/klaptopdaemon/acpi.h index d077af6..ac40433 100644 --- a/klaptopdaemon/acpi.h +++ b/klaptopdaemon/acpi.h @@ -30,14 +30,14 @@ class TQWidget; class TQSpinBox; -class KConfig; +class TDEConfig; class TQCheckBox; class KIconLoader; class KIconButton; class TQPushButton; -class AcpiConfig : public KCModule +class AcpiConfig : public TDECModule { Q_OBJECT @@ -58,7 +58,7 @@ private slots: void setupHelper(); private: - KConfig *config; + TDEConfig *config; TQCheckBox *enableHibernate; TQCheckBox *enableSuspend; diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp index 107cff0..80e61b4 100644 --- a/klaptopdaemon/apm.cpp +++ b/klaptopdaemon/apm.cpp @@ -52,11 +52,11 @@ extern void wake_laptop_daemon(); ApmConfig::ApmConfig (TQWidget * parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages - config = new KConfig("kcmlaptoprc"); + config = new TDEConfig("kcmlaptoprc"); TQVBoxLayout *top_layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/klaptopdaemon/apm.h b/klaptopdaemon/apm.h index 5a212f5..fe2585a 100644 --- a/klaptopdaemon/apm.h +++ b/klaptopdaemon/apm.h @@ -30,14 +30,14 @@ class TQWidget; class TQSpinBox; -class KConfig; +class TDEConfig; class TQCheckBox; class KIconLoader; class KIconButton; class TQPushButton; -class ApmConfig : public KCModule +class ApmConfig : public TDECModule { Q_OBJECT @@ -59,7 +59,7 @@ private slots: void setupHelper2(); private: - KConfig *config; + TDEConfig *config; TQCheckBox *enableSuspend; TQCheckBox *enableStandby; diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp index e4ba202..4523b4c 100644 --- a/klaptopdaemon/battery.cpp +++ b/klaptopdaemon/battery.cpp @@ -52,7 +52,7 @@ extern void wake_laptop_daemon(); BatteryConfig::BatteryConfig (TQWidget * parent, const char *name) - : KCModule(parent, name), + : TDECModule(parent, name), editPoll(0), iconloader(0), buttonNoBattery(0), @@ -62,7 +62,7 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name) TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages apm = laptop_portable::has_power_management(); - config = new KConfig("kcmlaptoprc"); + config = new TDEConfig("kcmlaptoprc"); instance = new TDEInstance("klaptopdaemon"); TQVBoxLayout *top_layout = new TQVBoxLayout( this, KDialog::marginHint(), diff --git a/klaptopdaemon/battery.h b/klaptopdaemon/battery.h index 66fb555..a9ccc8d 100644 --- a/klaptopdaemon/battery.h +++ b/klaptopdaemon/battery.h @@ -34,7 +34,7 @@ class TQWidget; class TQSpinBox; -class KConfig; +class TDEConfig; class TQCheckBox; class KIconLoader; class KIconButton; @@ -42,7 +42,7 @@ class TQPushButton; class TQLabel; -class BatteryConfig : public KCModule +class BatteryConfig : public TDECModule { Q_OBJECT @@ -68,7 +68,7 @@ private slots: private: void timerEvent(TQTimerEvent *); void ConvertIcon(int percent, TQPixmap &pm, TQPixmap &result); - KConfig *config; + TDEConfig *config; TQSpinBox* editPoll; TQCheckBox* runMonitor; diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp index eb3a6bf..2ab0396 100644 --- a/klaptopdaemon/buttons.cpp +++ b/klaptopdaemon/buttons.cpp @@ -45,7 +45,7 @@ extern void wake_laptop_daemon(); ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) - : KCModule(parent, name), + : TDECModule(parent, name), lidBox(0), lidStandby(0), lidSuspend(0), @@ -80,7 +80,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages apm = laptop_portable::has_power_management(); - config = new KConfig("kcmlaptoprc"); + config = new TDEConfig("kcmlaptoprc"); int can_brightness = laptop_portable::has_brightness(); TQStringList throttle_list; int current_throttle; diff --git a/klaptopdaemon/buttons.h b/klaptopdaemon/buttons.h index b18c041..8a4be63 100644 --- a/klaptopdaemon/buttons.h +++ b/klaptopdaemon/buttons.h @@ -33,11 +33,11 @@ class TQSlider; class TQButtonGroup; class TQRadioButton; class TQSpinBox; -class KConfig; +class TDEConfig; class TQCheckBox; class KComboBox; -class ButtonsConfig : public KCModule +class ButtonsConfig : public TDECModule { Q_OBJECT @@ -85,7 +85,7 @@ private: bool lid_performance_enabled, power_performance_enabled; TQString lid_performance_val, power_performance_val; - KConfig *config; + TDEConfig *config; int power, lid, apm; }; diff --git a/klaptopdaemon/daemon_state.cpp b/klaptopdaemon/daemon_state.cpp index 49d4ade..6d1fe7d 100644 --- a/klaptopdaemon/daemon_state.cpp +++ b/klaptopdaemon/daemon_state.cpp @@ -68,7 +68,7 @@ daemon_state::~daemon_state() void daemon_state::load() { - KConfig *config = new KConfig("kcmlaptoprc"); + TDEConfig *config = new TDEConfig("kcmlaptoprc"); if (config == 0) { ::fprintf(stderr, "laptop_daemon: can't open kcmlaptop config files\n"); diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp index 88b89e6..7c03af8 100644 --- a/klaptopdaemon/daemondock.cpp +++ b/klaptopdaemon/daemondock.cpp @@ -274,7 +274,7 @@ void laptop_dock::slotHide() { return; // just tell ourselves to hide the battery - KConfig *config = new KConfig("kcmlaptoprc"); + TDEConfig *config = new TDEConfig("kcmlaptoprc"); if (config) { config->setGroup("BatteryDefault"); config->writeEntry("Enable", false); @@ -295,7 +295,7 @@ void laptop_dock::slotQuit() { if (confirm == KMessageBox::Yes) { // just tell ourselves to hide the battery - KConfig *config = new KConfig("kcmlaptoprc"); + TDEConfig *config = new TDEConfig("kcmlaptoprc"); if (config) { config->setGroup("BatteryDefault"); config->writeEntry("Enable", false); @@ -673,7 +673,7 @@ quit: // prepare icon for systemtray - KConfig* config = new KConfig("kcmlaptoprc"); + TDEConfig* config = new TDEConfig("kcmlaptoprc"); bool showlevel = false; if (config) diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp index 6868545..8e9c042 100644 --- a/klaptopdaemon/laptop_daemon.cpp +++ b/klaptopdaemon/laptop_daemon.cpp @@ -729,7 +729,7 @@ void laptop_daemon::displayPixmap() { if (s.have_time == 2 && s.exists && !powered) { // in some circumstances s.have_time = (val < 0 ? 0 : 1); // the battery is not charging - KConfig *config = new KConfig("kcmlaptoprc"); + TDEConfig *config = new TDEConfig("kcmlaptoprc"); if (config) { config->setGroup("BatteryLow"); // we can;t figure this out 'till config->writeEntry("HaveTime", s.have_time); diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp index 9d0f648..1687437 100644 --- a/klaptopdaemon/main.cpp +++ b/klaptopdaemon/main.cpp @@ -48,51 +48,51 @@ extern void wake_laptop_daemon(); extern "C" { - KDE_EXPORT KCModule *create_pcmcia(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_pcmcia(TQWidget *parent, const char *) { return new PcmciaConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_bwarning(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_bwarning(TQWidget *parent, const char *) { return new WarningConfig(0, parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_cwarning(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_cwarning(TQWidget *parent, const char *) { return new WarningConfig(1, parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_battery(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_battery(TQWidget *parent, const char *) { return new BatteryConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_power(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_power(TQWidget *parent, const char *) { return new PowerConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_acpi(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_acpi(TQWidget *parent, const char *) { return new AcpiConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_apm(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_apm(TQWidget *parent, const char *) { return new ApmConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_Profile(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_Profile(TQWidget *parent, const char *) { return new ProfileConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_sony(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_sony(TQWidget *parent, const char *) { return new SonyConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_buttons(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_buttons(TQWidget *parent, const char *) { return new ButtonsConfig(parent, "kcmlaptop"); } KDE_EXPORT void init_battery() { - KConfig config("kcmlaptoprc", true /*readonly*/, false /*no globals*/); + TDEConfig config("kcmlaptoprc", true /*readonly*/, false /*no globals*/); config.setGroup("BatteryDefault"); bool enable = false; if (!config.hasKey("Enable")) { // if they have APM or PCMCIA, Enable=true @@ -111,7 +111,7 @@ extern "C" wake_laptop_daemon(); } - KDE_EXPORT KCModule *create_laptop(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_laptop(TQWidget *parent, const char *) { return new LaptopModule(parent, "kcmlaptop"); } @@ -125,10 +125,10 @@ extern "C" LaptopModule::LaptopModule(TQWidget *parent, const char *) - : KCModule(parent, "kcmlaptop") + : TDECModule(parent, "kcmlaptop") { { // export ACPI options - KConfig config("kcmlaptoprc", true /*readonly*/, false /*no globals*/); + TDEConfig config("kcmlaptoprc", true /*readonly*/, false /*no globals*/); config.setGroup("AcpiDefault"); bool enablestandby = config.readBoolEntry("EnableStandby", false); diff --git a/klaptopdaemon/main.h b/klaptopdaemon/main.h index 448d3c6..7dc725e 100644 --- a/klaptopdaemon/main.h +++ b/klaptopdaemon/main.h @@ -41,7 +41,7 @@ class SonyConfig; class ProfileConfig; class ButtonsConfig; -class LaptopModule : public KCModule +class LaptopModule : public TDECModule { Q_OBJECT diff --git a/klaptopdaemon/pcmcia.cpp b/klaptopdaemon/pcmcia.cpp index 4554686..88ee06d 100644 --- a/klaptopdaemon/pcmcia.cpp +++ b/klaptopdaemon/pcmcia.cpp @@ -38,7 +38,7 @@ #include "version.h" PcmciaConfig::PcmciaConfig (TQWidget * parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmlaptop"), @@ -109,7 +109,7 @@ void PcmciaConfig::defaults() void PcmciaConfig::changed() { - emit KCModule::changed(true); + emit TDECModule::changed(true); } diff --git a/klaptopdaemon/pcmcia.h b/klaptopdaemon/pcmcia.h index 9d4949c..66f0434 100644 --- a/klaptopdaemon/pcmcia.h +++ b/klaptopdaemon/pcmcia.h @@ -38,7 +38,7 @@ #include <kcmodule.h> #include <kaboutdata.h> -class PcmciaConfig : public KCModule +class PcmciaConfig : public TDECModule { Q_OBJECT diff --git a/klaptopdaemon/portable.cpp b/klaptopdaemon/portable.cpp index ed4801f..d1af1a5 100644 --- a/klaptopdaemon/portable.cpp +++ b/klaptopdaemon/portable.cpp @@ -354,7 +354,7 @@ static void acpi_read_batteries() { delete f; } if (bat.cap <= 0) { - KConfig* config = new KConfig("kcmlaptoprc", true /*readonly*/, false /*useKDEGlobals*/); + TDEConfig* config = new TDEConfig("kcmlaptoprc", true /*readonly*/, false /*useKDEGlobals*/); config->setGroup("AcpiBattery"); bat.cap = config->readNumEntry(bat.name,0); delete config; @@ -393,7 +393,7 @@ static void acpi_read_batteries() { if (bat.present) { if (bat.remaining > bat.cap) { // happens e.g. if the system doesn't provide a capacity value bat.cap = bat.remaining; - KConfig* config = new KConfig("kcmlaptoprc", false /*readonly*/, false /*useKDEGlobals*/); + TDEConfig* config = new TDEConfig("kcmlaptoprc", false /*readonly*/, false /*useKDEGlobals*/); config->setGroup("AcpiBattery"); config->writeEntry(bat.name, bat.cap); config->sync(); @@ -1162,7 +1162,7 @@ void laptop_portable::invoke_hibernation() } void -laptop_portable::extra_config(TQWidget *wp, KConfig *, TQVBoxLayout *top_layout) +laptop_portable::extra_config(TQWidget *wp, TDEConfig *, TQVBoxLayout *top_layout) { if (laptop_portable::has_apm(1) || laptop_portable::has_acpi(1)) return; @@ -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 * /*layout*/) +laptop_portable::extra_config(TQWidget * /*parent*/, TDEConfig * /*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 *layout) +laptop_portable::extra_config(TQWidget *parent, TDEConfig *config, TQVBoxLayout *layout) { // INSERT HERE } diff --git a/klaptopdaemon/portable.h b/klaptopdaemon/portable.h index a9fa703..d2d2ef3 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 *layout); + static void extra_config(TQWidget *parent, TDEConfig *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 28e558e..b7e387a 100644 --- a/klaptopdaemon/power.cpp +++ b/klaptopdaemon/power.cpp @@ -46,7 +46,7 @@ extern void wake_laptop_daemon(); PowerConfig::PowerConfig (TQWidget * parent, const char *name) - : KCModule(parent, name), + : TDECModule(parent, name), nopowerBox(0), nopowerStandby(0), nopowerSuspend(0), @@ -82,7 +82,7 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages apm = laptop_portable::has_power_management(); - config = new KConfig("kcmlaptoprc"); + config = new TDEConfig("kcmlaptoprc"); int can_brightness = laptop_portable::has_brightness(); TQStringList throttle_list; int current_throttle; diff --git a/klaptopdaemon/power.h b/klaptopdaemon/power.h index aa140b4..43917e6 100644 --- a/klaptopdaemon/power.h +++ b/klaptopdaemon/power.h @@ -33,12 +33,12 @@ class TQSlider; class TQButtonGroup; class TQRadioButton; class TQSpinBox; -class KConfig; +class TDEConfig; class TQCheckBox; class KComboBox; class KDoubleSpinBox; -class PowerConfig : public KCModule +class PowerConfig : public TDECModule { Q_OBJECT @@ -91,7 +91,7 @@ private: float edit_lav, noedit_lav; TQString nopower_performance_val, power_performance_val; - KConfig *config; + TDEConfig *config; int power, nopower, apm; }; diff --git a/klaptopdaemon/profile.cpp b/klaptopdaemon/profile.cpp index c61e884..f60630b 100644 --- a/klaptopdaemon/profile.cpp +++ b/klaptopdaemon/profile.cpp @@ -54,7 +54,7 @@ extern void wake_laptop_daemon(); ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { TQStringList performance_list; int current_performance; @@ -66,7 +66,7 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages - config = new KConfig("kcmlaptoprc"); + config = new TDEConfig("kcmlaptoprc"); TQVBoxLayout *top_layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/klaptopdaemon/profile.h b/klaptopdaemon/profile.h index 4eb0851..e3090ce 100644 --- a/klaptopdaemon/profile.h +++ b/klaptopdaemon/profile.h @@ -30,7 +30,7 @@ class TQWidget; class TQSpinBox; -class KConfig; +class TDEConfig; class TQCheckBox; class TQSlider; class KIconLoader; @@ -39,7 +39,7 @@ class TQPushButton; class KComboBox; -class ProfileConfig : public KCModule +class ProfileConfig : public TDECModule { Q_OBJECT @@ -67,7 +67,7 @@ private slots: private: - KConfig *config; + TDEConfig *config; TQCheckBox *pon, *performance_on, *throttle_on; TQSlider *son; diff --git a/klaptopdaemon/sony.cpp b/klaptopdaemon/sony.cpp index a318153..ad2bda2 100644 --- a/klaptopdaemon/sony.cpp +++ b/klaptopdaemon/sony.cpp @@ -56,11 +56,11 @@ extern void wake_laptop_daemon(); SonyConfig::SonyConfig(TQWidget * parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages - config = new KConfig("kcmlaptoprc"); + config = new TDEConfig("kcmlaptoprc"); TQVBoxLayout *top_layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/klaptopdaemon/sony.h b/klaptopdaemon/sony.h index 52de84d..cb354a3 100644 --- a/klaptopdaemon/sony.h +++ b/klaptopdaemon/sony.h @@ -30,7 +30,7 @@ class TQWidget; class TQSpinBox; -class KConfig; +class TDEConfig; class TQCheckBox; class TQSlider; class KIconLoader; @@ -38,7 +38,7 @@ class KIconButton; class TQPushButton; -class SonyConfig : public KCModule +class SonyConfig : public TDECModule { Q_OBJECT @@ -60,7 +60,7 @@ private slots: void setupHelper(); private: - KConfig *config; + TDEConfig *config; TQCheckBox *enableScrollBar; bool enablescrollbar; diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp index 14fb14b..f7f3b85 100644 --- a/klaptopdaemon/warning.cpp +++ b/klaptopdaemon/warning.cpp @@ -45,7 +45,7 @@ extern void wake_laptop_daemon(); WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) - : KCModule(parent, name), + : TDECModule(parent, name), checkSuspend(0), checkStandby(0), checkHibernate(0) @@ -54,7 +54,7 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) type = t; apm = laptop_portable::has_power_management(); - config = new KConfig("kcmlaptoprc"); + config = new TDEConfig("kcmlaptoprc"); my_load(0); diff --git a/klaptopdaemon/warning.h b/klaptopdaemon/warning.h index 67244ca..c7f4f9d 100644 --- a/klaptopdaemon/warning.h +++ b/klaptopdaemon/warning.h @@ -30,7 +30,7 @@ #include <tqstring.h> class TQWidget; -class KConfig; +class TDEConfig; class KURLRequester; class TQCheckBox; class TQRadioButton; @@ -38,7 +38,7 @@ class TQSpinBox; class TQSlider; class KComboBox; -class WarningConfig : public KCModule +class WarningConfig : public TDECModule { Q_OBJECT @@ -65,7 +65,7 @@ private slots: private: void my_load(int x, bool useDefaults=false ); - KConfig *config; + TDEConfig *config; KURLRequester* editRunCommand; KURLRequester* editPlaySound; |