summaryrefslogtreecommitdiffstats
path: root/twin-styles/cde
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:15 -0600
commitce1660ccd810825d9e087d0e9bc27dd4aea3e08a (patch)
tree57df8fa20601c7b06117399bd921a485b7476e4a /twin-styles/cde
parent2a66a2cdb1c9c8017e821e34ec93732761b14d47 (diff)
downloadtdeartwork-ce1660ccd810825d9e087d0e9bc27dd4aea3e08a.tar.gz
tdeartwork-ce1660ccd810825d9e087d0e9bc27dd4aea3e08a.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'twin-styles/cde')
-rw-r--r--twin-styles/cde/cdeclient.cpp2
-rw-r--r--twin-styles/cde/config/config.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/twin-styles/cde/cdeclient.cpp b/twin-styles/cde/cdeclient.cpp
index 5768f1bc..a2071de5 100644
--- a/twin-styles/cde/cdeclient.cpp
+++ b/twin-styles/cde/cdeclient.cpp
@@ -27,7 +27,7 @@
#include <tqdrawutil.h>
#include <tqpainter.h>
#include <tqapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
extern "C" KDE_EXPORT KDecorationFactory* create_factory()
diff --git a/twin-styles/cde/config/config.cpp b/twin-styles/cde/config/config.cpp
index 3905a583..0a6ce4f0 100644
--- a/twin-styles/cde/config/config.cpp
+++ b/twin-styles/cde/config/config.cpp
@@ -1,10 +1,10 @@
// $Id$
#include "config.h"
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqwhatsthis.h>
#include <tqvbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
extern "C" KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent )
{