summaryrefslogtreecommitdiffstats
path: root/tdecore/kinstance.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:54 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:54 -0600
commited99a30644c19b0a3cf0d2147243532df4daa16b (patch)
tree7f3f2850e59824fdf100a642367a82b1e7f0204f /tdecore/kinstance.cpp
parente5f2d46e9caf6942f365f1b454087dda71a340f7 (diff)
downloadtdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz
tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kinstance.cpp')
-rw-r--r--tdecore/kinstance.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp
index cf0b35791..6760c95a0 100644
--- a/tdecore/kinstance.cpp
+++ b/tdecore/kinstance.cpp
@@ -21,7 +21,7 @@
#include <unistd.h>
#include "tdeconfig.h"
-#include "klocale.h"
+#include "tdelocale.h"
#include "kcharsets.h"
#include "kiconloader.h"
#include "tdehardwaredevices.h"
@@ -29,7 +29,7 @@
#include "tdeaboutdata.h"
#include "kstandarddirs.h"
#include "kdebug.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
#include "kmimesourcefactory.h"
#include <tqfont.h>