summaryrefslogtreecommitdiffstats
path: root/tdeioslave
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-15 21:57:54 -0600
committerTimothy Pearson <[email protected]>2013-02-15 21:57:54 -0600
commited99a30644c19b0a3cf0d2147243532df4daa16b (patch)
tree7f3f2850e59824fdf100a642367a82b1e7f0204f /tdeioslave
parente5f2d46e9caf6942f365f1b454087dda71a340f7 (diff)
downloadtdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz
tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeioslave')
-rw-r--r--tdeioslave/file/file.cc6
-rw-r--r--tdeioslave/ftp/ftp.cc2
-rw-r--r--tdeioslave/http/http.cc2
-rw-r--r--tdeioslave/http/http_cache_cleaner.cpp6
-rw-r--r--tdeioslave/http/kcookiejar/kcookiewin.cpp4
-rw-r--r--tdeioslave/http/kcookiejar/main.cpp2
-rw-r--r--tdeioslave/metainfo/metainfo.cpp2
7 files changed, 12 insertions, 12 deletions
diff --git a/tdeioslave/file/file.cc b/tdeioslave/file/file.cc
index 477db8754..1caeaef3e 100644
--- a/tdeioslave/file/file.cc
+++ b/tdeioslave/file/file.cc
@@ -75,8 +75,8 @@
#include <kurl.h>
#include <kinstance.h>
#include <ksimpleconfig.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
#include <tqfile.h>
#include <tqstrlist.h>
#include "file.h"
@@ -93,7 +93,7 @@
#include <kstandarddirs.h>
#include <tdeio/ioslave_defaults.h>
#include <klargefile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kmimetype.h>
using namespace TDEIO;
diff --git a/tdeioslave/ftp/ftp.cc b/tdeioslave/ftp/ftp.cc
index 5b582d376..cf358ce39 100644
--- a/tdeioslave/ftp/ftp.cc
+++ b/tdeioslave/ftp/ftp.cc
@@ -53,7 +53,7 @@
#include <tqdir.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinstance.h>
#include <kmimemagic.h>
#include <kmimetype.h>
diff --git a/tdeioslave/http/http.cc b/tdeioslave/http/http.cc
index 539cc4dc5..a492221d5 100644
--- a/tdeioslave/http/http.cc
+++ b/tdeioslave/http/http.cc
@@ -51,7 +51,7 @@
#include <kidna.h>
#include <ksocks.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kextsock.h>
#include <kservice.h>
diff --git a/tdeioslave/http/http_cache_cleaner.cpp b/tdeioslave/http/http_cache_cleaner.cpp
index af9ede123..aaf94d25a 100644
--- a/tdeioslave/http/http_cache_cleaner.cpp
+++ b/tdeioslave/http/http_cache_cleaner.cpp
@@ -33,12 +33,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqptrlist.h>
#include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <dcopclient.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
#include <unistd.h>
diff --git a/tdeioslave/http/kcookiejar/kcookiewin.cpp b/tdeioslave/http/kcookiejar/kcookiewin.cpp
index 3b845a104..faa9cdc65 100644
--- a/tdeioslave/http/kcookiejar/kcookiewin.cpp
+++ b/tdeioslave/http/kcookiejar/kcookiewin.cpp
@@ -58,8 +58,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kidna.h>
#include <twin.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kurllabel.h>
#include <klineedit.h>
#include <kiconloader.h>
diff --git a/tdeioslave/http/kcookiejar/main.cpp b/tdeioslave/http/kcookiejar/main.cpp
index 59d912524..414afb41f 100644
--- a/tdeioslave/http/kcookiejar/main.cpp
+++ b/tdeioslave/http/kcookiejar/main.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <dcopclient.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
static const char description[] =
diff --git a/tdeioslave/metainfo/metainfo.cpp b/tdeioslave/metainfo/metainfo.cpp
index 54f7acc3a..389a9182e 100644
--- a/tdeioslave/metainfo/metainfo.cpp
+++ b/tdeioslave/metainfo/metainfo.cpp
@@ -24,7 +24,7 @@
#include <kmimetype.h>
#include <kdebug.h>
#include <tdefilemetainfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <stdlib.h>
#include "metainfo.h"