diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:51:32 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:51:32 -0600 |
commit | 0c9d97065a3d6ceb12d687555a1a33d90db96238 (patch) | |
tree | 4305105967fc03b06139b57871d5ab6d2360e75b /kate | |
parent | 59d153016be1e09cb31cdb18bef0a649acfc6292 (diff) | |
download | tdelibs-0c9d97065a3d6ceb12d687555a1a33d90db96238.tar.gz tdelibs-0c9d97065a3d6ceb12d687555a1a33d90db96238.zip |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'kate')
-rw-r--r-- | kate/part/katefactory.cpp | 2 | ||||
-rw-r--r-- | kate/part/katefactory.h | 4 |
2 files changed, 3 insertions, 3 deletions
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 |