summaryrefslogtreecommitdiffstats
path: root/twin/lib/kdecoration_p.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 /twin/lib/kdecoration_p.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 'twin/lib/kdecoration_p.h')
-rw-r--r--twin/lib/kdecoration_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/twin/lib/kdecoration_p.h b/twin/lib/kdecoration_p.h
index 58f386c9b..2634ea140 100644
--- a/twin/lib/kdecoration_p.h
+++ b/twin/lib/kdecoration_p.h
@@ -33,7 +33,7 @@ DEALINGS IN THE SOFTWARE.
#include <tqwidget.h>
#include <tqvaluelist.h>
-class KConfig;
+class TDEConfig;
class KWIN_EXPORT KDecorationOptionsPrivate : public KDecorationDefines
{
@@ -41,7 +41,7 @@ class KWIN_EXPORT KDecorationOptionsPrivate : public KDecorationDefines
KDecorationOptionsPrivate();
virtual ~KDecorationOptionsPrivate();
void defaultKWinSettings(); // shared implementation
- unsigned long updateKWinSettings( KConfig* ); // shared implementation
+ unsigned long updateKWinSettings( TDEConfig* ); // shared implementation
BorderSize findPreferredBorderSize( BorderSize size, TQValueList< BorderSize > ) const; // shared implementation
TQColor colors[NUM_COLORS*2];