diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /kate | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kate')
| -rw-r--r-- | kate/part/katefactory.cpp | 2 | ||||
| -rw-r--r-- | kate/part/katefactory.h | 6 | ||||
| -rw-r--r-- | kate/plugins/kdatatool/kate_kdatatool.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
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")) diff --git a/kate/part/katefactory.h b/kate/part/katefactory.h index 0fd939ce3..79d3ac011 100644 --- a/kate/part/katefactory.h +++ b/kate/part/katefactory.h @@ -87,7 +87,7 @@ class KateFactory * public accessor to the instance * @return instance */ - inline KInstance *instance () { return &m_instance; }; + inline TDEInstance *instance () { return &m_instance; }; /** * register document at the factory @@ -221,12 +221,12 @@ class KateFactory /** * about data (authors and more) */ - KAboutData m_aboutData; + TDEAboutData m_aboutData; /** * our kinstance */ - KInstance m_instance; + TDEInstance m_instance; /** * registered docs diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp index e78bb4228..3265a77bf 100644 --- a/kate/plugins/kdatatool/kate_kdatatool.cpp +++ b/kate/plugins/kdatatool/kate_kdatatool.cpp @@ -157,7 +157,7 @@ void KDataToolPluginView::aboutToShow() } } - KInstance *inst=instance(); + TDEInstance *inst=instance(); TQValueList<KDataToolInfo> tools; tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "text/plain", inst ); |