summaryrefslogtreecommitdiffstats
path: root/kexi/main/keximainwindowimpl.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 /kexi/main/keximainwindowimpl.cpp
parent3b6870c6e1177574772803b5b09416903ee40fc0 (diff)
downloadkoffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz
koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kexi/main/keximainwindowimpl.cpp')
-rw-r--r--kexi/main/keximainwindowimpl.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index dd629780..d6b2cc16 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -39,15 +39,15 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdestdaccel.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <kkeydialog.h>
#include <kedittoolbar.h>
#include <tdeversion.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdeparts/componentfactory.h>
#include <ktip.h>
#include <kstandarddirs.h>