summaryrefslogtreecommitdiffstats
path: root/kcontrol/background/bgrender.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/bgrender.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/bgrender.h')
-rw-r--r--kcontrol/background/bgrender.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/background/bgrender.h b/kcontrol/background/bgrender.h
index ee798894e..b10f4033c 100644
--- a/kcontrol/background/bgrender.h
+++ b/kcontrol/background/bgrender.h
@@ -23,7 +23,7 @@ class TQRect;
class TQString;
class TQTimer;
-class KConfig;
+class TDEConfig;
class TDEProcess;
class KTempFile;
class KShellProcess;
@@ -42,7 +42,7 @@ class KBackgroundRenderer:
Q_OBJECT
public:
- KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config=0);
+ KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config=0);
~KBackgroundRenderer();
void load(int desk, int screen, bool drawBackgroundPerScreen, bool reparseConfig=true);
@@ -124,7 +124,7 @@ class KVirtualBGRenderer : public QObject
{
Q_OBJECT
public:
- KVirtualBGRenderer(int desk, KConfig *config=0l);
+ KVirtualBGRenderer(int desk, TDEConfig *config=0l);
~KVirtualBGRenderer();
KBackgroundRenderer * renderer(unsigned screen);
@@ -162,7 +162,7 @@ private:
TQSize renderSize(int screen); // the size the renderer should be
void initRenderers();
- KConfig *m_pConfig;
+ TDEConfig *m_pConfig;
float m_scaleX;
float m_scaleY;
int m_desk;