summaryrefslogtreecommitdiffstats
path: root/kcontrol/energy/energy.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/energy/energy.h
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/energy/energy.h')
-rw-r--r--kcontrol/energy/energy.h6
1 files changed, 3 insertions, 3 deletions
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__