summaryrefslogtreecommitdiffstats
path: root/tdespell2
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:54 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:54 -0600
commited99a30644c19b0a3cf0d2147243532df4daa16b (patch)
tree7f3f2850e59824fdf100a642367a82b1e7f0204f /tdespell2
parente5f2d46e9caf6942f365f1b454087dda71a340f7 (diff)
downloadtdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz
tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdespell2')
-rw-r--r--tdespell2/settings.cpp4
-rw-r--r--tdespell2/ui/configdialog.cpp2
-rw-r--r--tdespell2/ui/configwidget.cpp2
-rw-r--r--tdespell2/ui/dialog.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/tdespell2/settings.cpp b/tdespell2/settings.cpp
index 57535b85c..a23fb062f 100644
--- a/tdespell2/settings.cpp
+++ b/tdespell2/settings.cpp
@@ -23,8 +23,8 @@
#include "broker.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/tdespell2/ui/configdialog.cpp b/tdespell2/ui/configdialog.cpp
index 56e39ca2b..288d62a29 100644
--- a/tdespell2/ui/configdialog.cpp
+++ b/tdespell2/ui/configdialog.cpp
@@ -21,7 +21,7 @@
#include "configdialog.h"
#include "configwidget.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqvbox.h>
diff --git a/tdespell2/ui/configwidget.cpp b/tdespell2/ui/configwidget.cpp
index 6d98955ae..2317f7307 100644
--- a/tdespell2/ui/configwidget.cpp
+++ b/tdespell2/ui/configwidget.cpp
@@ -26,7 +26,7 @@
#include <keditlistbox.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqcheckbox.h>
#include <tqlayout.h>
diff --git a/tdespell2/ui/dialog.cpp b/tdespell2/ui/dialog.cpp
index a0ff36c01..0c45f3cd1 100644
--- a/tdespell2/ui/dialog.cpp
+++ b/tdespell2/ui/dialog.cpp
@@ -28,7 +28,7 @@
#include "settings.h"
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqlistview.h>