summaryrefslogtreecommitdiffstats
path: root/lib/kotext/KoTextFormat.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-15 21:48:17 -0600
committerTimothy Pearson <[email protected]>2013-02-15 21:48:17 -0600
commit63f984a752aa6a6a73e3af795b05a5a042833eff (patch)
tree89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /lib/kotext/KoTextFormat.cpp
parent3b6870c6e1177574772803b5b09416903ee40fc0 (diff)
downloadkoffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz
koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'lib/kotext/KoTextFormat.cpp')
-rw-r--r--lib/kotext/KoTextFormat.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp
index 0f3d48d2..4648898d 100644
--- a/lib/kotext/KoTextFormat.cpp
+++ b/lib/kotext/KoTextFormat.cpp
@@ -25,9 +25,9 @@
#include <KoGenStyles.h>
#include <KoXmlNS.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqapplication.h>
#include <tqregexp.h>