From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:57:54 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 tdecore/network/kresolver.cpp                | 2 +-
 tdecore/network/kresolverstandardworkers.cpp | 2 +-
 tdecore/network/tdesocketaddress.cpp         | 2 +-
 tdecore/network/tdesocketbase.cpp            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tdecore/network')

diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp
index 1c32e80ec..b9ac605c0 100644
--- a/tdecore/network/kresolver.cpp
+++ b/tdecore/network/kresolver.cpp
@@ -54,7 +54,7 @@
 #endif
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Us
 #include "kresolver.h"
diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp
index cde24f752..96519d1aa 100644
--- a/tdecore/network/kresolverstandardworkers.cpp
+++ b/tdecore/network/kresolverstandardworkers.cpp
@@ -44,7 +44,7 @@
 #include <tqfile.h>
 
 #include "kdebug.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "kstandarddirs.h"
 #include "tdeapplication.h"
 
diff --git a/tdecore/network/tdesocketaddress.cpp b/tdecore/network/tdesocketaddress.cpp
index ff97699c8..a6da5f7c0 100644
--- a/tdecore/network/tdesocketaddress.cpp
+++ b/tdecore/network/tdesocketaddress.cpp
@@ -36,7 +36,7 @@
 #include <tqfile.h>
 #include <tqobject.h>
 
-#include "klocale.h"
+#include "tdelocale.h"
 #include "tdesocketaddress.h"
 
 #include "netsupp.h"
diff --git a/tdecore/network/tdesocketbase.cpp b/tdecore/network/tdesocketbase.cpp
index 0eb31bbc1..66decb15d 100644
--- a/tdecore/network/tdesocketbase.cpp
+++ b/tdecore/network/tdesocketbase.cpp
@@ -24,7 +24,7 @@
 
 #include <config.h>
 #include <tqmutex.h>
-#include "klocale.h"
+#include "tdelocale.h"
 
 #include "tdesocketbase.h"
 #include "tdesocketdevice.h"
-- 
cgit v1.2.1