summaryrefslogtreecommitdiffstats
path: root/tdeutils
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 /tdeutils
parente5f2d46e9caf6942f365f1b454087dda71a340f7 (diff)
downloadtdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz
tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeutils')
-rw-r--r--tdeutils/kcmultidialog.cpp4
-rw-r--r--tdeutils/kcmultidialog.h2
-rw-r--r--tdeutils/kfind.cpp4
-rw-r--r--tdeutils/kfinddialog.cpp4
-rw-r--r--tdeutils/kplugininfo.cpp2
-rw-r--r--tdeutils/kpluginselector.cpp6
-rw-r--r--tdeutils/kreplace.cpp4
-rw-r--r--tdeutils/kreplacedialog.cpp4
-rw-r--r--tdeutils/ksettings/componentsdialog.cpp2
-rw-r--r--tdeutils/ksettings/dialog.cpp2
-rw-r--r--tdeutils/tdecmodulecontainer.cpp2
-rw-r--r--tdeutils/tdecmoduleinfo.cpp4
-rw-r--r--tdeutils/tdecmoduleloader.cpp4
-rw-r--r--tdeutils/tdecmoduleproxy.cpp2
14 files changed, 23 insertions, 23 deletions
diff --git a/tdeutils/kcmultidialog.cpp b/tdeutils/kcmultidialog.cpp
index 9bb067ca..6a074040 100644
--- a/tdeutils/kcmultidialog.cpp
+++ b/tdeutils/kcmultidialog.cpp
@@ -31,8 +31,8 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
#include <krun.h>
#include <kstdguiitem.h>
diff --git a/tdeutils/kcmultidialog.h b/tdeutils/kcmultidialog.h
index 46dde98f..ca6d2d6c 100644
--- a/tdeutils/kcmultidialog.h
+++ b/tdeutils/kcmultidialog.h
@@ -26,7 +26,7 @@
#include <tqptrdict.h>
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kservice.h>
class TDECModuleProxy;
diff --git a/tdeutils/kfind.cpp b/tdeutils/kfind.cpp
index 99ef317b..74fb46e9 100644
--- a/tdeutils/kfind.cpp
+++ b/tdeutils/kfind.cpp
@@ -22,8 +22,8 @@
#include "kfind.h"
#include "kfinddialog.h"
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqlabel.h>
#include <tqregexp.h>
#include <tqstylesheet.h>
diff --git a/tdeutils/kfinddialog.cpp b/tdeutils/kfinddialog.cpp
index d9a5284e..718fdca2 100644
--- a/tdeutils/kfinddialog.cpp
+++ b/tdeutils/kfinddialog.cpp
@@ -29,8 +29,8 @@
#include <tqregexp.h>
#include <kcombobox.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <assert.h>
#include <tqwhatsthis.h>
diff --git a/tdeutils/kplugininfo.cpp b/tdeutils/kplugininfo.cpp
index cb93b260..9ea0eb2b 100644
--- a/tdeutils/kplugininfo.cpp
+++ b/tdeutils/kplugininfo.cpp
@@ -22,7 +22,7 @@
#include <ktrader.h>
#include <kdebug.h>
#include <tdeconfigbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kdesktopfile.h>
#include <kservice.h>
diff --git a/tdeutils/kpluginselector.cpp b/tdeutils/kpluginselector.cpp
index 5747df7c..9fe08b02 100644
--- a/tdeutils/kpluginselector.cpp
+++ b/tdeutils/kpluginselector.cpp
@@ -35,12 +35,12 @@
#include <tqcstring.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdelistview.h>
#include <ksimpleconfig.h>
#include <kdialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kstandarddirs.h>
#include <ktabctl.h>
#include <tdecmoduleinfo.h>
diff --git a/tdeutils/kreplace.cpp b/tdeutils/kreplace.cpp
index 0aad733d..98e3ce93 100644
--- a/tdeutils/kreplace.cpp
+++ b/tdeutils/kreplace.cpp
@@ -22,8 +22,8 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "kreplace.h"
#include "kreplacedialog.h"
#include <tqregexp.h>
diff --git a/tdeutils/kreplacedialog.cpp b/tdeutils/kreplacedialog.cpp
index 88c006b4..d8e74af4 100644
--- a/tdeutils/kreplacedialog.cpp
+++ b/tdeutils/kreplacedialog.cpp
@@ -26,8 +26,8 @@
#include <tqlayout.h>
#include <tqregexp.h>
#include <kcombobox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
/**
diff --git a/tdeutils/ksettings/componentsdialog.cpp b/tdeutils/ksettings/componentsdialog.cpp
index 50ad97a0..f60613bc 100644
--- a/tdeutils/ksettings/componentsdialog.cpp
+++ b/tdeutils/ksettings/componentsdialog.cpp
@@ -18,7 +18,7 @@
*/
#include "ksettings/componentsdialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tdelistview.h>
#include <tqlabel.h>
diff --git a/tdeutils/ksettings/dialog.cpp b/tdeutils/ksettings/dialog.cpp
index 49918b5e..e74b9ac4 100644
--- a/tdeutils/ksettings/dialog.cpp
+++ b/tdeutils/ksettings/dialog.cpp
@@ -21,7 +21,7 @@
#include <kcmultidialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kservicegroup.h>
#include <kdebug.h>
#include <ktrader.h>
diff --git a/tdeutils/tdecmodulecontainer.cpp b/tdeutils/tdecmodulecontainer.cpp
index c379a985..004ceb78 100644
--- a/tdeutils/tdecmodulecontainer.cpp
+++ b/tdeutils/tdecmodulecontainer.cpp
@@ -30,7 +30,7 @@
#include <tdecmoduleproxy.h>
#include <kdebug.h>
#include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kpushbutton.h>
#include <kservice.h>
diff --git a/tdeutils/tdecmoduleinfo.cpp b/tdeutils/tdecmoduleinfo.cpp
index 3a7fdfd6..4869bb1e 100644
--- a/tdeutils/tdecmoduleinfo.cpp
+++ b/tdeutils/tdecmoduleinfo.cpp
@@ -25,9 +25,9 @@
#include <kdesktopfile.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "tdecmoduleinfo.h"
diff --git a/tdeutils/tdecmoduleloader.cpp b/tdeutils/tdecmoduleloader.cpp
index 73f92379..ced28ae7 100644
--- a/tdeutils/tdecmoduleloader.cpp
+++ b/tdeutils/tdecmoduleloader.cpp
@@ -27,8 +27,8 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeparts/componentfactory.h>
#include "tdecmoduleloader.h"
diff --git a/tdeutils/tdecmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp
index 2d315093..eeac43b0 100644
--- a/tdeutils/tdecmoduleproxy.cpp
+++ b/tdeutils/tdecmoduleproxy.cpp
@@ -42,7 +42,7 @@
#include <tdecmoduleloader.h>
#include <kdebug.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <kservice.h>
#include <kstandarddirs.h>