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 +-
 kate/part/katefactory.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kate/part')

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
diff --git a/kate/part/katefactory.h b/kate/part/katefactory.h
index a01e3a32c..bca0fe8a9 100644
--- a/kate/part/katefactory.h
+++ b/kate/part/katefactory.h
@@ -150,7 +150,7 @@ class KateFactory
      * on start detected plugins
      * @return list of all at launch detected tdetexteditor::plugins
      */
-    inline const KTrader::OfferList &plugins () { return m_plugins; };
+    inline const TDETrader::OfferList &plugins () { return m_plugins; };
 
     /**
      * global dirwatch
@@ -261,7 +261,7 @@ class KateFactory
     /**
      * at start found plugins
      */
-    KTrader::OfferList m_plugins;
+    TDETrader::OfferList m_plugins;
 
     /**
      * fallback document config
-- 
cgit v1.2.1