From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:20:05 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 kate/part/katefactory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kate/part/katefactory.cpp')

diff --git a/kate/part/katefactory.cpp b/kate/part/katefactory.cpp
index 64bde8718..aa4c43658 100644
--- a/kate/part/katefactory.cpp
+++ b/kate/part/katefactory.cpp
@@ -68,7 +68,7 @@ KateFactory *KateFactory::s_self = 0;
 
 KateFactory::KateFactory ()
  : m_aboutData ("katepart", I18N_NOOP("Kate Part"), KATEPART_VERSION,
-             I18N_NOOP( "Embeddable editor component" ), KAboutData::License_LGPL_V2,
+             I18N_NOOP( "Embeddable editor component" ), TDEAboutData::License_LGPL_V2,
              I18N_NOOP( "(c) 2000-2004 The Kate Authors" ), 0, "http://kate.kde.org")
  , m_instance (&m_aboutData)
  , m_plugins (KTrader::self()->query("KTextEditor/Plugin"))
-- 
cgit v1.2.1


From 0c9d97065a3d6ceb12d687555a1a33d90db96238 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 10:51:32 -0600
Subject: Rename KLock and KTrader to avoid conflicts with KDE4

---
 kate/part/katefactory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kate/part/katefactory.cpp')

diff --git a/kate/part/katefactory.cpp b/kate/part/katefactory.cpp
index aa4c43658..eb760aaff 100644
--- a/kate/part/katefactory.cpp
+++ b/kate/part/katefactory.cpp
@@ -71,7 +71,7 @@ KateFactory::KateFactory ()
              I18N_NOOP( "Embeddable editor component" ), TDEAboutData::License_LGPL_V2,
              I18N_NOOP( "(c) 2000-2004 The Kate Authors" ), 0, "http://kate.kde.org")
  , m_instance (&m_aboutData)
- , m_plugins (KTrader::self()->query("KTextEditor/Plugin"))
+ , m_plugins (TDETrader::self()->query("KTextEditor/Plugin"))
  , m_jscript (0)
 {
   // set s_self
-- 
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

---
 kate/part/katefactory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kate/part/katefactory.cpp')

diff --git a/kate/part/katefactory.cpp b/kate/part/katefactory.cpp
index eb760aaff..d6a9e0d59 100644
--- a/kate/part/katefactory.cpp
+++ b/kate/part/katefactory.cpp
@@ -34,7 +34,7 @@
 #include "../interfaces/katecmd.h"
 
 #include <kvmallocator.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdirwatch.h>
 #include <kstaticdeleter.h>
 
-- 
cgit v1.2.1