summaryrefslogtreecommitdiffstats
path: root/libkscan/scandialog.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:18 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:18 -0600
commit958d14ea303abe33fce2c259c1000f18171e4229 (patch)
tree61bc8236ab3aa4bc27ca205740322f8df50baff1 /libkscan/scandialog.cpp
parentb2de6514213d205907e8de3dd17f8eb80d868a4f (diff)
downloadtdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.tar.gz
tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libkscan/scandialog.cpp')
-rw-r--r--libkscan/scandialog.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libkscan/scandialog.cpp b/libkscan/scandialog.cpp
index 9a0d2bf0..bd38caa1 100644
--- a/libkscan/scandialog.cpp
+++ b/libkscan/scandialog.cpp
@@ -27,13 +27,13 @@
#include <tqapplication.h>
#include <tqcheckbox.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kled.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kscandevice.h>
// libkscan stuff