From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:35:07 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 tdeprint/management/kmwsocketutil.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tdeprint/management/kmwsocketutil.cpp')

diff --git a/tdeprint/management/kmwsocketutil.cpp b/tdeprint/management/kmwsocketutil.cpp
index e667d1fa1..04556c07b 100644
--- a/tdeprint/management/kmwsocketutil.cpp
+++ b/tdeprint/management/kmwsocketutil.cpp
@@ -148,7 +148,7 @@ bool KMWSocketUtil::checkPrinter(const TQString& IPstr, int port, TQString* host
 		if (hostname)
 		{
 			TQString	portname;
-			KExtendedSocket::resolve((KSocketAddress*)(sock.peerAddress()), *hostname, portname);
+			KExtendedSocket::resolve((TDESocketAddress*)(sock.peerAddress()), *hostname, portname);
 		}
 		result = true;
 	}
-- 
cgit v1.2.1


From 8bd62a3b0d3b362b783a273e2460811392485bbd Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 14 Feb 2013 17:17:18 -0600
Subject: Rename common header files for consistency with class renaming

---
 tdeprint/management/kmwsocketutil.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tdeprint/management/kmwsocketutil.cpp')

diff --git a/tdeprint/management/kmwsocketutil.cpp b/tdeprint/management/kmwsocketutil.cpp
index 04556c07b..a4f23959a 100644
--- a/tdeprint/management/kmwsocketutil.cpp
+++ b/tdeprint/management/kmwsocketutil.cpp
@@ -32,7 +32,7 @@
 #include <tqregexp.h>
 #include <knumvalidator.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kextsock.h>
 #include <kdebug.h>
-- 
cgit v1.2.1


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

---
 tdeprint/management/kmwsocketutil.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tdeprint/management/kmwsocketutil.cpp')

diff --git a/tdeprint/management/kmwsocketutil.cpp b/tdeprint/management/kmwsocketutil.cpp
index a4f23959a..02b0a6b69 100644
--- a/tdeprint/management/kmwsocketutil.cpp
+++ b/tdeprint/management/kmwsocketutil.cpp
@@ -27,13 +27,13 @@
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlayout.h>
 #include <tqregexp.h>
 #include <knumvalidator.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kextsock.h>
 #include <kdebug.h>
 
-- 
cgit v1.2.1