From 73ff676f11662d6178c8854a7832ebffe2ae409d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 19:55:40 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kivio/kiviopart/kivio_aboutdata.h | 6 +++--- kivio/kiviopart/kivio_factory.cpp | 10 +++++----- kivio/kiviopart/kivio_factory.h | 12 ++++++------ kivio/kiviopart/kivioarrowheadaction.cpp | 2 +- kivio/kiviopart/kiviostencilsetaction.cpp | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'kivio/kiviopart') diff --git a/kivio/kiviopart/kivio_aboutdata.h b/kivio/kiviopart/kivio_aboutdata.h index bbfc5552..9d742905 100644 --- a/kivio/kiviopart/kivio_aboutdata.h +++ b/kivio/kiviopart/kivio_aboutdata.h @@ -28,10 +28,10 @@ static const char* description = I18N_NOOP("KOffice Flowchart And Diagram Tool"); static const char* version = KOFFICE_VERSION_STRING; -KAboutData * newKivioAboutData() +TDEAboutData * newKivioAboutData() { - KAboutData * aboutData=new KAboutData( "kivio", I18N_NOOP("Kivio"), - version, description, KAboutData::License_GPL, + TDEAboutData * aboutData=new TDEAboutData( "kivio", I18N_NOOP("Kivio"), + version, description, TDEAboutData::License_GPL, I18N_NOOP("(C) 2000-2006, The Kivio Team"), 0, "http://www.koffice.org/kivio/"); aboutData->addAuthor("Peter Simonsson", I18N_NOOP("Maintainer"), "psn@linux.se"); diff --git a/kivio/kiviopart/kivio_factory.cpp b/kivio/kiviopart/kivio_factory.cpp index e883aa2d..20140fcc 100644 --- a/kivio/kiviopart/kivio_factory.cpp +++ b/kivio/kiviopart/kivio_factory.cpp @@ -26,8 +26,8 @@ #include -KInstance* KivioFactory::s_global = 0; -KAboutData* KivioFactory::s_aboutData = 0; +TDEInstance* KivioFactory::s_global = 0; +TDEAboutData* KivioFactory::s_aboutData = 0; KivioFactory::KivioFactory( TQObject* parent, const char* name ) : KoFactory( parent, name ) @@ -55,18 +55,18 @@ KParts::Part* KivioFactory::createPartObject( TQWidget *parentWidget, const char return doc; } -KAboutData* KivioFactory::aboutData() +TDEAboutData* KivioFactory::aboutData() { if( !s_aboutData ) s_aboutData = newKivioAboutData(); return s_aboutData; } -KInstance* KivioFactory::global() +TDEInstance* KivioFactory::global() { if ( !s_global ) { - s_global = new KInstance(aboutData()); + s_global = new TDEInstance(aboutData()); s_global->dirs()->addResourceType( "kivio_template", KStandardDirs::kde_default("data") + "kivio/templates/" ); s_global->dirs()->addResourceType( "toolbar", KStandardDirs::kde_default("data") + "koffice/toolbar/"); s_global->iconLoader()->addAppDir("koffice"); diff --git a/kivio/kiviopart/kivio_factory.h b/kivio/kiviopart/kivio_factory.h index 8b747215..5814d42d 100644 --- a/kivio/kiviopart/kivio_factory.h +++ b/kivio/kiviopart/kivio_factory.h @@ -21,8 +21,8 @@ #include #include -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; class KIVIO_EXPORT KivioFactory : public KoFactory { Q_OBJECT @@ -33,12 +33,12 @@ public: virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); - static KInstance* global(); - static KAboutData* aboutData(); + static TDEInstance* global(); + static TDEAboutData* aboutData(); private: - static KInstance* s_global; - static KAboutData* s_aboutData; + static TDEInstance* s_global; + static TDEAboutData* s_aboutData; }; #endif diff --git a/kivio/kiviopart/kivioarrowheadaction.cpp b/kivio/kiviopart/kivioarrowheadaction.cpp index b61e877a..fe301ba3 100644 --- a/kivio/kiviopart/kivioarrowheadaction.cpp +++ b/kivio/kiviopart/kivioarrowheadaction.cpp @@ -116,7 +116,7 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index) index ); else { - KInstance *instance; + TDEInstance *instance; if ( m_parentCollection ) instance = m_parentCollection->instance(); diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp index 0741dfdc..3c798b37 100644 --- a/kivio/kiviopart/kiviostencilsetaction.cpp +++ b/kivio/kiviopart/kiviostencilsetaction.cpp @@ -129,7 +129,7 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index) index ); else { - KInstance *instance; + TDEInstance *instance; if ( m_parentCollection ) instance = m_parentCollection->instance(); -- cgit v1.2.1