diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/energy | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/energy')
| -rw-r--r-- | kcontrol/energy/energy.cpp | 12 | ||||
| -rw-r--r-- | kcontrol/energy/energy.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp index 40495aaa3..a6fb21887 100644 --- a/kcontrol/energy/energy.cpp +++ b/kcontrol/energy/energy.cpp @@ -85,13 +85,13 @@ static const int DFLT_OFF = 60; extern "C" { - KDE_EXPORT KCModule *create_energy(TQWidget *parent, char *) { + KDE_EXPORT TDECModule *create_energy(TQWidget *parent, char *) { return new KEnergy(parent, "kcmenergy"); } KDE_EXPORT void init_energy() { #ifdef HAVE_DPMS - KConfig *cfg = new KConfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/); + TDEConfig *cfg = new TDEConfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/); cfg->setGroup("DisplayEnergy"); Display *dpy = tqt_xdisplay(); @@ -132,7 +132,7 @@ extern "C" { /**** KEnergy ****/ KEnergy::KEnergy(TQWidget *parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { m_bChanged = false; m_bEnabled = false; @@ -221,11 +221,11 @@ connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(cons top->addStretch(); if (m_bDPMS) - setButtons( KCModule::Help | KCModule::Default | KCModule::Apply ); + setButtons( TDECModule::Help | TDECModule::Default | TDECModule::Apply ); else - setButtons( KCModule::Help ); + setButtons( TDECModule::Help ); - m_pConfig = new KConfig("kcmdisplayrc", false /*readwrite*/, false /*no globals*/); + m_pConfig = new TDEConfig("kcmdisplayrc", false /*readwrite*/, false /*no globals*/); m_pConfig->setGroup("DisplayEnergy"); load(); diff --git a/kcontrol/energy/energy.h b/kcontrol/energy/energy.h index c50d027ba..8faeaca1a 100644 --- a/kcontrol/energy/energy.h +++ b/kcontrol/energy/energy.h @@ -19,14 +19,14 @@ class TQCheckBox; class KIntNumInput; -class KConfig; +class TDEConfig; extern "C" void init_energy(); /** * The Desktop/Energy tab in kcontrol. */ -class KEnergy: public KCModule +class KEnergy: public TDECModule { Q_OBJECT @@ -62,7 +62,7 @@ private: KIntNumInput *m_pStandbySlider; KIntNumInput *m_pSuspendSlider; KIntNumInput *m_pOffSlider; - KConfig *m_pConfig; + TDEConfig *m_pConfig; }; #endif // __Energy_h_Included__ |