summaryrefslogtreecommitdiffstats
path: root/kcontrol/background/bgsettings.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/background/bgsettings.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/background/bgsettings.h')
-rw-r--r--kcontrol/background/bgsettings.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/kcontrol/background/bgsettings.h b/kcontrol/background/bgsettings.h
index 03aa171e7..d007f5753 100644
--- a/kcontrol/background/bgsettings.h
+++ b/kcontrol/background/bgsettings.h
@@ -19,7 +19,7 @@
template <class TQString, class T> class TQMap;
class KStandardDirs;
class KSimpleConfig;
-class KConfig;
+class TDEConfig;
class TQString;
class TQImage;
@@ -156,7 +156,7 @@ public:
* mode) will be treated as one big display, and the "screen" paramater
* will be ignored.
*/
- KBackgroundSettings(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config);
+ KBackgroundSettings(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config);
~KBackgroundSettings();
void copyConfig(const KBackgroundSettings*);
@@ -282,7 +282,7 @@ private:
int m_CurrentWallpaper;
TQString m_CurrentWallpaperName;
- KConfig *m_pConfig;
+ TDEConfig *m_pConfig;
KStandardDirs *m_pDirs;
bool m_bDeleteConfig;
bool m_bEnabled;
@@ -305,7 +305,7 @@ public:
class TDEGlobalBackgroundSettings
{
public:
- TDEGlobalBackgroundSettings(KConfig *config);
+ TDEGlobalBackgroundSettings(TDEConfig *config);
TQString deskName(int desk);
//void setDeskName(int desk, TQString name);
@@ -347,7 +347,7 @@ public:
void readSettings();
void writeSettings();
- KConfig* getConfig() { return m_pConfig; }
+ TDEConfig* getConfig() { return m_pConfig; }
private:
bool dirty;
@@ -363,7 +363,7 @@ private:
bool m_shadowEnabled;
int m_textLines;
int m_textWidth;
- KConfig *m_pConfig;
+ TDEConfig *m_pConfig;
bool m_bDeleteConfig;
TQValueVector<bool> m_bDrawBackgroundPerScreen; // m_bDrawBackgroundPerScreen[desk]
};