Rename KInstance and KAboutData to avoid conflicts with KDE4

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index 6abf8083..7eebcbca 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -2217,7 +2217,7 @@ TQCString KoDocument::nativeOasisMimeType() const
 
 
 //static
-KService::Ptr KoDocument::readNativeService( KInstance *instance )
+KService::Ptr KoDocument::readNativeService( TDEInstance *instance )
 {
     TQString instname = instance ? instance->instanceName() : kapp->instanceName();
 
@@ -2241,7 +2241,7 @@ KService::Ptr KoDocument::readNativeService( KInstance *instance )
     return service;
 }
 
-TQCString KoDocument::readNativeFormatMimeType( KInstance *instance ) //static
+TQCString KoDocument::readNativeFormatMimeType( TDEInstance *instance ) //static
 {
     KService::Ptr service = readNativeService( instance );
     if ( !service )
@@ -2262,7 +2262,7 @@ TQCString KoDocument::readNativeFormatMimeType( KInstance *instance ) //static
     return service->property( "X-TDE-NativeMimeType" ).toString().latin1();
 }
 
-TQStringList KoDocument::readExtraNativeMimeTypes( KInstance *instance ) //static
+TQStringList KoDocument::readExtraNativeMimeTypes( TDEInstance *instance ) //static
 {
     KService::Ptr service = readNativeService( instance );
     if ( !service )
@@ -2600,7 +2600,7 @@ void KoDocument::startCustomDocument() {
     deleteOpenPane();
 }
 
-KoOpenPane* KoDocument::createOpenPane( TQWidget* parent, KInstance* instance,
+KoOpenPane* KoDocument::createOpenPane( TQWidget* parent, TDEInstance* instance,
                                         const TQString& templateType )
 {
     KoOpenPane* openPane = new KoOpenPane( parent, instance, templateType );