summaryrefslogtreecommitdiffstats
path: root/libkscan
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
parentb2de6514213d205907e8de3dd17f8eb80d868a4f (diff)
downloadtdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.tar.gz
tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libkscan')
-rw-r--r--libkscan/devselector.cpp6
-rw-r--r--libkscan/gammadialog.cpp2
-rw-r--r--libkscan/img_canvas.cpp2
-rw-r--r--libkscan/imgscaledialog.cpp2
-rw-r--r--libkscan/imgscaninfo.cpp2
-rw-r--r--libkscan/kscandevice.cpp4
-rw-r--r--libkscan/kscanslider.cpp2
-rw-r--r--libkscan/massscandialog.cpp2
-rw-r--r--libkscan/previewer.cpp4
-rw-r--r--libkscan/scandialog.cpp6
-rw-r--r--libkscan/scanparams.cpp2
-rw-r--r--libkscan/scansourcedialog.cpp2
-rw-r--r--libkscan/sizeindicator.cpp2
13 files changed, 19 insertions, 19 deletions
diff --git a/libkscan/devselector.cpp b/libkscan/devselector.cpp
index 61094f1b..542b975b 100644
--- a/libkscan/devselector.cpp
+++ b/libkscan/devselector.cpp
@@ -33,9 +33,9 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <ksimpleconfig.h>
#include "devselector.h"
diff --git a/libkscan/gammadialog.cpp b/libkscan/gammadialog.cpp
index 548a545e..2c6c601a 100644
--- a/libkscan/gammadialog.cpp
+++ b/libkscan/gammadialog.cpp
@@ -24,7 +24,7 @@
#include <tqcombobox.h>
#include <kscanslider.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "gammadialog.h"
diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp
index 5bc13aeb..d673b284 100644
--- a/libkscan/img_canvas.cpp
+++ b/libkscan/img_canvas.cpp
@@ -28,7 +28,7 @@
#include <tqimage.h>
#include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdestyle.h>
#include <tdeapplication.h>
diff --git a/libkscan/imgscaledialog.cpp b/libkscan/imgscaledialog.cpp
index b0250ef8..d7841339 100644
--- a/libkscan/imgscaledialog.cpp
+++ b/libkscan/imgscaledialog.cpp
@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqbuttongroup.h>
#include <tqradiobutton.h>
diff --git a/libkscan/imgscaninfo.cpp b/libkscan/imgscaninfo.cpp
index eee481c6..02876292 100644
--- a/libkscan/imgscaninfo.cpp
+++ b/libkscan/imgscaninfo.cpp
@@ -19,7 +19,7 @@
#include "imgscaninfo.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
diff --git a/libkscan/kscandevice.cpp b/libkscan/kscandevice.cpp
index 41e05570..653ef998 100644
--- a/libkscan/kscandevice.cpp
+++ b/libkscan/kscandevice.cpp
@@ -32,8 +32,8 @@
#include <tqfileinfo.h>
#include <tqapplication.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
diff --git a/libkscan/kscanslider.cpp b/libkscan/kscanslider.cpp
index 5ad7ce91..001c5978 100644
--- a/libkscan/kscanslider.cpp
+++ b/libkscan/kscanslider.cpp
@@ -27,7 +27,7 @@
#include <tqlineedit.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kscanslider.h"
diff --git a/libkscan/massscandialog.cpp b/libkscan/massscandialog.cpp
index 9d4a5f91..fb686bab 100644
--- a/libkscan/massscandialog.cpp
+++ b/libkscan/massscandialog.cpp
@@ -23,7 +23,7 @@
#include <tqgroupbox.h>
#include <tqframe.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
diff --git a/libkscan/previewer.cpp b/libkscan/previewer.cpp
index a8d3f6be..2925d50f 100644
--- a/libkscan/previewer.cpp
+++ b/libkscan/previewer.cpp
@@ -31,7 +31,7 @@
#include <tqlayout.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcombobox.h>
#include <tdeaction.h>
#include <kstandarddirs.h>
@@ -46,7 +46,7 @@
#include <tdeconfig.h>
#include <tqbuttongroup.h>
#include <tqvbuttongroup.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqvaluevector.h>
#define ID_CUSTOM 0
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
diff --git a/libkscan/scanparams.cpp b/libkscan/scanparams.cpp
index 64bcde21..e8e7ad95 100644
--- a/libkscan/scanparams.cpp
+++ b/libkscan/scanparams.cpp
@@ -37,7 +37,7 @@
#include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kbuttonbox.h>
#include <kiconloader.h>
diff --git a/libkscan/scansourcedialog.cpp b/libkscan/scansourcedialog.cpp
index fcb3fc25..e0e7a0d4 100644
--- a/libkscan/scansourcedialog.cpp
+++ b/libkscan/scansourcedialog.cpp
@@ -20,7 +20,7 @@
#include "scansourcedialog.h"
#include "kscanslider.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqlabel.h>
diff --git a/libkscan/sizeindicator.cpp b/libkscan/sizeindicator.cpp
index bd259bd3..bd97285a 100644
--- a/libkscan/sizeindicator.cpp
+++ b/libkscan/sizeindicator.cpp
@@ -23,7 +23,7 @@
#include <tqimage.h>
#include <kimageeffect.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqpainter.h>