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 /kparts/part.cpp | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kparts/part.cpp')
| -rw-r--r-- | kparts/part.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kparts/part.cpp b/kparts/part.cpp index a76fce282..d2efbeeac 100644 --- a/kparts/part.cpp +++ b/kparts/part.cpp @@ -102,12 +102,12 @@ TQObject *PartBase::partObject() const return m_obj; } -void PartBase::setInstance( KInstance *inst ) +void PartBase::setInstance( TDEInstance *inst ) { setInstance( inst, true ); } -void PartBase::setInstance( KInstance *inst, bool bLoadPlugins ) +void PartBase::setInstance( TDEInstance *inst, bool bLoadPlugins ) { KXMLGUIClient::setInstance( inst ); KGlobal::locale()->insertCatalogue( inst->instanceName() ); @@ -119,7 +119,7 @@ void PartBase::setInstance( KInstance *inst, bool bLoadPlugins ) loadPlugins( m_obj, this, instance() ); } -void PartBase::loadPlugins( TQObject *parent, KXMLGUIClient *parentGUIClient, KInstance *instance ) +void PartBase::loadPlugins( TQObject *parent, KXMLGUIClient *parentGUIClient, TDEInstance *instance ) { if( d->m_pluginLoadingMode != DoNotLoadPlugins ) Plugin::loadPlugins( parent, parentGUIClient, instance, d->m_pluginLoadingMode == LoadPlugins ); |