From 3a044decb0a5d7be822c888b2d5374573d7df96e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:23:50 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 parts/documentation/protocols/chm/chm.cpp      |  2 +-
 parts/documentation/protocols/chm/kchmpart.cpp | 12 ++++++------
 parts/documentation/protocols/chm/kchmpart.h   | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'parts/documentation/protocols')

diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp
index 1d7543c3..3f0fbc54 100644
--- a/parts/documentation/protocols/chm/chm.cpp
+++ b/parts/documentation/protocols/chm/chm.cpp
@@ -41,7 +41,7 @@ extern "C"
 {
     int kdemain( int argc, char **argv )
     {
-        KInstance instance( "kio_chm" );
+        TDEInstance instance( "kio_chm" );
 
         kdDebug() << "*** Starting kio_chm " << endl;
 
diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp
index b1d9d166..c9c5f58e 100644
--- a/parts/documentation/protocols/chm/kchmpart.cpp
+++ b/parts/documentation/protocols/chm/kchmpart.cpp
@@ -32,8 +32,8 @@ extern "C"
    }
 }
 
-KInstance* KChmPartFactory::s_instance = 0L;
-KAboutData* KChmPartFactory::s_about = 0L;
+TDEInstance* KChmPartFactory::s_instance = 0L;
+TDEAboutData* KChmPartFactory::s_about = 0L;
 
 KChmPartFactory::KChmPartFactory( TQObject* parent, const char* name )
    : KParts::Factory( parent, name )
@@ -54,13 +54,13 @@ KParts::Part* KChmPartFactory::createPartObject( TQWidget *parentWidget, const c
    return part;
 }
 
-KInstance* KChmPartFactory::instance()
+TDEInstance* KChmPartFactory::instance()
 {
    if( !s_instance )
    {
-      s_about = new KAboutData( "kchmpart",
+      s_about = new TDEAboutData( "kchmpart",
                                 I18N_NOOP( "KChm" ), "1.0pre" );
-      s_instance = new KInstance( s_about );
+      s_instance = new TDEInstance( s_about );
    }
    return s_instance;
 }
@@ -69,7 +69,7 @@ KInstance* KChmPartFactory::instance()
 KChmPart::KChmPart( TQWidget * parent, const char * name )
 	: KDevHTMLPart(  ), m_job(0)
 {
-   KInstance * instance = new KInstance( "kchmpart" );
+   TDEInstance * instance = new TDEInstance( "kchmpart" );
    setInstance( instance );
    m_extension=new KParts::BrowserExtension(this);
    setOptions(-1);
diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h
index 5c4369c3..3ed054fe 100644
--- a/parts/documentation/protocols/chm/kchmpart.h
+++ b/parts/documentation/protocols/chm/kchmpart.h
@@ -27,8 +27,8 @@
 
 #include <tqcstring.h>
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 class KChmPartFactory: public KParts::Factory
 {
@@ -43,11 +43,11 @@ class KChmPartFactory: public KParts::Factory
           TQObject *parent, const char *name,
 		  const char *classname, const TQStringList &args );
 
-      static KInstance *instance();
+      static TDEInstance *instance();
 
    private:
-      static KInstance *s_instance;
-      static KAboutData *s_about;
+      static TDEInstance *s_instance;
+      static TDEAboutData *s_about;
 
 };
 
@@ -69,7 +69,7 @@ class KChmPart : public KDevHTMLPart
 */
    protected:
       //virtual bool openFile();
-      KInstance *m_instance;
+      TDEInstance *m_instance;
       KParts::BrowserExtension *m_extension;
       KIO::TransferJob *m_job;
       TQCString m_htmlData;
-- 
cgit v1.2.1