From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:47:22 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 tdecore/kurl.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tdecore/kurl.cpp')

diff --git a/tdecore/kurl.cpp b/tdecore/kurl.cpp
index 7817742bc..9479029a9 100644
--- a/tdecore/kurl.cpp
+++ b/tdecore/kurl.cpp
@@ -334,14 +334,14 @@ static TQString cleanpath(const TQString &_path, bool cleanDirSeparator, bool de
   if (decodeDots)
   {
 #ifndef KDE_QT_ONLY
-     static const TQString &encodedDot = KGlobal::staticQString("%2e");
+     static const TQString &encodedDot = TDEGlobal::staticQString("%2e");
 #else
      TQString encodedDot("%2e");
 #endif
      if (path.find(encodedDot, 0, false) != -1)
      {
 #ifndef KDE_QT_ONLY
-        static const TQString &encodedDOT = KGlobal::staticQString("%2E"); // Uppercase!
+        static const TQString &encodedDOT = TDEGlobal::staticQString("%2E"); // Uppercase!
 #else
         TQString encodedDOT("%2E");
 #endif
@@ -2340,7 +2340,7 @@ KURL::URIMode KURL::uriModeForProtocol(const TQString& protocol)
     KURL::URIMode mode = Auto;
     if (protocol == fileProt)
         return URL;
-    if (KGlobal::_instance)
+    if (TDEGlobal::_instance)
         mode = KProtocolInfo::uriParseMode(protocol);
     if (mode == Auto ) {
 #else
-- 
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

---
 tdecore/kurl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tdecore/kurl.cpp')

diff --git a/tdecore/kurl.cpp b/tdecore/kurl.cpp
index 9479029a9..2079c050b 100644
--- a/tdecore/kurl.cpp
+++ b/tdecore/kurl.cpp
@@ -27,7 +27,7 @@
 // KDE_QT_ONLY is first used for dcop/client (e.g. marshalling)
 #ifndef KDE_QT_ONLY
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kidna.h>
 #include <kprotocolinfo.h>
 #endif
-- 
cgit v1.2.1