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

---
 kioslave/man/kio_man.cpp  |  2 +-
 kioslave/man/kmanpart.cpp | 12 ++++++------
 kioslave/man/kmanpart.h   | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'kioslave/man')

diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp
index 12c13d601..67778aaca 100644
--- a/kioslave/man/kio_man.cpp
+++ b/kioslave/man/kio_man.cpp
@@ -692,7 +692,7 @@ extern "C"
 
     int KDE_EXPORT kdemain( int argc, char **argv ) {
 
-        KInstance instance("kio_man");
+        TDEInstance instance("kio_man");
 
         kdDebug(7107) <<  "STARTING " << getpid() << endl;
 
diff --git a/kioslave/man/kmanpart.cpp b/kioslave/man/kmanpart.cpp
index a8d08908e..06ced93ec 100644
--- a/kioslave/man/kmanpart.cpp
+++ b/kioslave/man/kmanpart.cpp
@@ -36,8 +36,8 @@ extern "C"
    }
 }
 
-KInstance* KManPartFactory::s_instance = 0L;
-KAboutData* KManPartFactory::s_about = 0L;
+TDEInstance* KManPartFactory::s_instance = 0L;
+TDEAboutData* KManPartFactory::s_about = 0L;
 
 KManPartFactory::KManPartFactory( TQObject* parent, const char* name )
    : KParts::Factory( parent, name )
@@ -57,13 +57,13 @@ KParts::Part* KManPartFactory::createPartObject( TQWidget * parentWidget, const
    return part;
 }
 
-KInstance* KManPartFactory::instance()
+TDEInstance* KManPartFactory::instance()
 {
    if( !s_instance )
    {
-      s_about = new KAboutData( "kmanpart",
+      s_about = new TDEAboutData( "kmanpart",
                                 I18N_NOOP( "KMan" ), TDE_VERSION_STRING );
-      s_instance = new KInstance( s_about );
+      s_instance = new TDEInstance( s_about );
    }
    return s_instance;
 }
@@ -73,7 +73,7 @@ KManPart::KManPart( TQWidget * parent, const char * name )
 : KHTMLPart( parent, name )
 ,m_job(0)
 {
-   KInstance * instance = new KInstance( "kmanpart" );
+   TDEInstance * instance = new TDEInstance( "kmanpart" );
    setInstance( instance );
    m_extension=new KParts::BrowserExtension(this);
 }
diff --git a/kioslave/man/kmanpart.h b/kioslave/man/kmanpart.h
index f2d9e3891..2f39af11f 100644
--- a/kioslave/man/kmanpart.h
+++ b/kioslave/man/kmanpart.h
@@ -30,8 +30,8 @@
 
 #include <tqcstring.h>
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 /**
  * Man Page Viewer
@@ -48,11 +48,11 @@ class KManPartFactory: 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;
 
 };
 
@@ -70,7 +70,7 @@ class KManPart : public KHTMLPart
       void jobDone( KIO::Job *);
    protected:
       virtual bool openFile();
-      KInstance *m_instance;
+      TDEInstance *m_instance;
       KParts::BrowserExtension * m_extension;
       KIO::TransferJob *m_job;
 };
-- 
cgit v1.2.1