diff options
Diffstat (limited to 'kivio')
-rw-r--r-- | kivio/kiviopart/kivio_aboutdata.h | 6 | ||||
-rw-r--r-- | kivio/kiviopart/kivio_factory.cpp | 10 | ||||
-rw-r--r-- | kivio/kiviopart/kivio_factory.h | 12 | ||||
-rw-r--r-- | kivio/kiviopart/kivioarrowheadaction.cpp | 2 | ||||
-rw-r--r-- | kivio/kiviopart/kiviostencilsetaction.cpp | 2 | ||||
-rw-r--r-- | kivio/plugins/kivioconnectortool/plugin.cpp | 6 | ||||
-rw-r--r-- | kivio/plugins/kivioconnectortool/plugin.h | 6 | ||||
-rw-r--r-- | kivio/plugins/kivioselecttool/plugin.cpp | 6 | ||||
-rw-r--r-- | kivio/plugins/kivioselecttool/plugin.h | 6 | ||||
-rw-r--r-- | kivio/plugins/kiviosmlconnector/plugin.cpp | 6 | ||||
-rw-r--r-- | kivio/plugins/kiviosmlconnector/plugin.h | 6 | ||||
-rw-r--r-- | kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp | 6 | ||||
-rw-r--r-- | kivio/plugins/kiviotargettool/kiviotargettoolfactory.h | 6 | ||||
-rw-r--r-- | kivio/plugins/kiviotexttool/plugin.cpp | 6 | ||||
-rw-r--r-- | kivio/plugins/kiviotexttool/plugin.h | 6 | ||||
-rw-r--r-- | kivio/plugins/kiviozoomtool/plugin.cpp | 6 | ||||
-rw-r--r-- | kivio/plugins/kiviozoomtool/plugin.h | 6 |
17 files changed, 52 insertions, 52 deletions
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"), "[email protected]"); 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 <kiconloader.h> -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 <KoFactory.h> #include <koffice_export.h> -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(); diff --git a/kivio/plugins/kivioconnectortool/plugin.cpp b/kivio/plugins/kivioconnectortool/plugin.cpp index 8a61df93..e55d4f9e 100644 --- a/kivio/plugins/kivioconnectortool/plugin.cpp +++ b/kivio/plugins/kivioconnectortool/plugin.cpp @@ -29,12 +29,12 @@ ***************************************************/ K_EXPORT_COMPONENT_FACTORY( libkivioconnectortool, ConnectorToolFactory ) -KInstance* ConnectorToolFactory::s_global = 0; +TDEInstance* ConnectorToolFactory::s_global = 0; ConnectorToolFactory::ConnectorToolFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { - s_global = new KInstance("kivio"); + s_global = new TDEInstance("kivio"); } ConnectorToolFactory::~ConnectorToolFactory() @@ -51,7 +51,7 @@ TQObject* ConnectorToolFactory::createObject( TQObject* parent, const char*, con return obj; } -KInstance* ConnectorToolFactory::global() +TDEInstance* ConnectorToolFactory::global() { return s_global; } diff --git a/kivio/plugins/kivioconnectortool/plugin.h b/kivio/plugins/kivioconnectortool/plugin.h index d8070335..7afc83ce 100644 --- a/kivio/plugins/kivioconnectortool/plugin.h +++ b/kivio/plugins/kivioconnectortool/plugin.h @@ -24,7 +24,7 @@ #include <klibloader.h> -class KInstance; +class TDEInstance; class ConnectorToolFactory : public KLibFactory { Q_OBJECT @@ -36,10 +36,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - static KInstance* global(); + static TDEInstance* global(); private: - static KInstance* s_global; + static TDEInstance* s_global; }; #endif diff --git a/kivio/plugins/kivioselecttool/plugin.cpp b/kivio/plugins/kivioselecttool/plugin.cpp index fba217c6..9107adac 100644 --- a/kivio/plugins/kivioselecttool/plugin.cpp +++ b/kivio/plugins/kivioselecttool/plugin.cpp @@ -29,12 +29,12 @@ ***************************************************/ K_EXPORT_COMPONENT_FACTORY( libkivioselecttool, SelectToolFactory ) -KInstance* SelectToolFactory::s_global = 0; +TDEInstance* SelectToolFactory::s_global = 0; SelectToolFactory::SelectToolFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { - s_global = new KInstance("kivio"); + s_global = new TDEInstance("kivio"); } SelectToolFactory::~SelectToolFactory() @@ -51,7 +51,7 @@ TQObject* SelectToolFactory::createObject( TQObject* parent, const char*, const return obj; } -KInstance* SelectToolFactory::global() +TDEInstance* SelectToolFactory::global() { return s_global; } diff --git a/kivio/plugins/kivioselecttool/plugin.h b/kivio/plugins/kivioselecttool/plugin.h index fc43d4fb..ee901dd3 100644 --- a/kivio/plugins/kivioselecttool/plugin.h +++ b/kivio/plugins/kivioselecttool/plugin.h @@ -24,7 +24,7 @@ #include <klibloader.h> -class KInstance; +class TDEInstance; class SelectToolFactory : public KLibFactory { Q_OBJECT @@ -36,10 +36,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - static KInstance* global(); + static TDEInstance* global(); private: - static KInstance* s_global; + static TDEInstance* s_global; }; #endif diff --git a/kivio/plugins/kiviosmlconnector/plugin.cpp b/kivio/plugins/kiviosmlconnector/plugin.cpp index 5c4b74f7..3f01b263 100644 --- a/kivio/plugins/kiviosmlconnector/plugin.cpp +++ b/kivio/plugins/kiviosmlconnector/plugin.cpp @@ -29,12 +29,12 @@ ***************************************************/ K_EXPORT_COMPONENT_FACTORY( libkiviosmlconnector, SMLConnectorFactory ) -KInstance* SMLConnectorFactory::s_global = 0; +TDEInstance* SMLConnectorFactory::s_global = 0; SMLConnectorFactory::SMLConnectorFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { - s_global = new KInstance("kivio"); + s_global = new TDEInstance("kivio"); } SMLConnectorFactory::~SMLConnectorFactory() @@ -51,7 +51,7 @@ TQObject* SMLConnectorFactory::createObject( TQObject* parent, const char*, cons return obj; } -KInstance* SMLConnectorFactory::global() +TDEInstance* SMLConnectorFactory::global() { return s_global; } diff --git a/kivio/plugins/kiviosmlconnector/plugin.h b/kivio/plugins/kiviosmlconnector/plugin.h index 2b3e8028..54c81ebc 100644 --- a/kivio/plugins/kiviosmlconnector/plugin.h +++ b/kivio/plugins/kiviosmlconnector/plugin.h @@ -24,7 +24,7 @@ #include <klibloader.h> -class KInstance; +class TDEInstance; class SMLConnectorFactory : public KLibFactory { Q_OBJECT @@ -36,10 +36,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - static KInstance* global(); + static TDEInstance* global(); private: - static KInstance* s_global; + static TDEInstance* s_global; }; #endif diff --git a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp index 048c8e32..ebc5075f 100644 --- a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp +++ b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp @@ -22,12 +22,12 @@ K_EXPORT_COMPONENT_FACTORY( libkiviotargettool, KivioTargetToolFactory ) -KInstance* KivioTargetToolFactory::s_global = 0; +TDEInstance* KivioTargetToolFactory::s_global = 0; KivioTargetToolFactory::KivioTargetToolFactory(TQObject *parent, const char *name) : KLibFactory(parent, name) { - s_global = new KInstance("kivio"); + s_global = new TDEInstance("kivio"); } KivioTargetToolFactory::~KivioTargetToolFactory() @@ -44,7 +44,7 @@ TQObject* KivioTargetToolFactory::createObject( TQObject* parent, const char*, c return obj; } -KInstance* KivioTargetToolFactory::global() +TDEInstance* KivioTargetToolFactory::global() { return s_global; } diff --git a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h index 391c7823..091cba2d 100644 --- a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h +++ b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h @@ -24,7 +24,7 @@ #include <klibloader.h> -class KInstance; +class TDEInstance; class KivioTargetToolFactory : public KLibFactory { @@ -37,10 +37,10 @@ class KivioTargetToolFactory : public KLibFactory virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - static KInstance* global(); + static TDEInstance* global(); private: - static KInstance* s_global; + static TDEInstance* s_global; }; #endif diff --git a/kivio/plugins/kiviotexttool/plugin.cpp b/kivio/plugins/kiviotexttool/plugin.cpp index fd173935..7e0ec4dc 100644 --- a/kivio/plugins/kiviotexttool/plugin.cpp +++ b/kivio/plugins/kiviotexttool/plugin.cpp @@ -29,12 +29,12 @@ ***************************************************/ K_EXPORT_COMPONENT_FACTORY( libkiviotexttool, TextToolFactory ) -KInstance* TextToolFactory::s_global = 0; +TDEInstance* TextToolFactory::s_global = 0; TextToolFactory::TextToolFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { - s_global = new KInstance("kivio"); + s_global = new TDEInstance("kivio"); } TextToolFactory::~TextToolFactory() @@ -51,7 +51,7 @@ TQObject* TextToolFactory::createObject( TQObject* parent, const char*, const ch return obj; } -KInstance* TextToolFactory::global() +TDEInstance* TextToolFactory::global() { return s_global; } diff --git a/kivio/plugins/kiviotexttool/plugin.h b/kivio/plugins/kiviotexttool/plugin.h index a8b63388..4eaa9cc6 100644 --- a/kivio/plugins/kiviotexttool/plugin.h +++ b/kivio/plugins/kiviotexttool/plugin.h @@ -24,7 +24,7 @@ #include <klibloader.h> -class KInstance; +class TDEInstance; class TextToolFactory : public KLibFactory { Q_OBJECT @@ -36,10 +36,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - static KInstance* global(); + static TDEInstance* global(); private: - static KInstance* s_global; + static TDEInstance* s_global; }; #endif diff --git a/kivio/plugins/kiviozoomtool/plugin.cpp b/kivio/plugins/kiviozoomtool/plugin.cpp index 4ecd452d..cccdfaec 100644 --- a/kivio/plugins/kiviozoomtool/plugin.cpp +++ b/kivio/plugins/kiviozoomtool/plugin.cpp @@ -29,12 +29,12 @@ ***************************************************/ K_EXPORT_COMPONENT_FACTORY( libkiviozoomtool, ZoomToolFactory ) -KInstance* ZoomToolFactory::s_global = 0; +TDEInstance* ZoomToolFactory::s_global = 0; ZoomToolFactory::ZoomToolFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { - s_global = new KInstance("kivio"); + s_global = new TDEInstance("kivio"); } ZoomToolFactory::~ZoomToolFactory() @@ -51,7 +51,7 @@ TQObject* ZoomToolFactory::createObject( TQObject* parent, const char*, const ch return obj; } -KInstance* ZoomToolFactory::global() +TDEInstance* ZoomToolFactory::global() { return s_global; } diff --git a/kivio/plugins/kiviozoomtool/plugin.h b/kivio/plugins/kiviozoomtool/plugin.h index a6b12515..4b2d8038 100644 --- a/kivio/plugins/kiviozoomtool/plugin.h +++ b/kivio/plugins/kiviozoomtool/plugin.h @@ -24,7 +24,7 @@ #include <klibloader.h> -class KInstance; +class TDEInstance; class ZoomToolFactory : public KLibFactory { Q_OBJECT @@ -35,10 +35,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - static KInstance* global(); + static TDEInstance* global(); private: - static KInstance* s_global; + static TDEInstance* s_global; }; #endif |