summaryrefslogtreecommitdiffstats
path: root/lib/kofficeui/KoTooluButton.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:48:17 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:48:17 -0600
commit63f984a752aa6a6a73e3af795b05a5a042833eff (patch)
tree89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /lib/kofficeui/KoTooluButton.cpp
parent3b6870c6e1177574772803b5b09416903ee40fc0 (diff)
downloadkoffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz
koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'lib/kofficeui/KoTooluButton.cpp')
-rw-r--r--lib/kofficeui/KoTooluButton.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index f44adfb9..1cd5e1c6 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -25,11 +25,11 @@
#include <tqstyle.h>
#include <tqpopupmenu.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdetoolbar.h>
#include <KoTooluButton.h>
#include <kcolordrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcolordialog.h>
#include <kdebug.h>