summaryrefslogtreecommitdiffstats
path: root/kview/kviewcanvas
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-15 21:57:18 -0600
committerTimothy Pearson <[email protected]>2013-02-15 21:57:18 -0600
commit958d14ea303abe33fce2c259c1000f18171e4229 (patch)
tree61bc8236ab3aa4bc27ca205740322f8df50baff1 /kview/kviewcanvas
parentb2de6514213d205907e8de3dd17f8eb80d868a4f (diff)
downloadtdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.tar.gz
tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kview/kviewcanvas')
-rw-r--r--kview/kviewcanvas/config/confmodules.cpp2
-rw-r--r--kview/kviewcanvas/config/defaults.h2
-rw-r--r--kview/kviewcanvas/test/main.cpp2
-rw-r--r--kview/kviewcanvas/test/test.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/kview/kviewcanvas/config/confmodules.cpp b/kview/kviewcanvas/config/confmodules.cpp
index 04b3cf3a..55efba65 100644
--- a/kview/kviewcanvas/config/confmodules.cpp
+++ b/kview/kviewcanvas/config/confmodules.cpp
@@ -24,7 +24,7 @@
#include <tqcheckbox.h>
#include <tqframe.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kcolorbutton.h>
#include <tdelistview.h>
diff --git a/kview/kviewcanvas/config/defaults.h b/kview/kviewcanvas/config/defaults.h
index 166b3b02..4d309585 100644
--- a/kview/kviewcanvas/config/defaults.h
+++ b/kview/kviewcanvas/config/defaults.h
@@ -19,7 +19,7 @@
#ifndef DEFAULTS_H
#define DEFAULTS_H
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqsize.h>
#include <tqcolor.h>
diff --git a/kview/kviewcanvas/test/main.cpp b/kview/kviewcanvas/test/main.cpp
index 0f7af338..8fc0b532 100644
--- a/kview/kviewcanvas/test/main.cpp
+++ b/kview/kviewcanvas/test/main.cpp
@@ -2,7 +2,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char description[] =
I18N_NOOP("A TDE KPart Application");
diff --git a/kview/kviewcanvas/test/test.cpp b/kview/kviewcanvas/test/test.cpp
index 01ac6e43..de1694f8 100644
--- a/kview/kviewcanvas/test/test.cpp
+++ b/kview/kviewcanvas/test/test.cpp
@@ -8,7 +8,7 @@
#include <kurl.h>
#include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeparts/componentfactory.h>
#include <tqimage.h>