From fd7791939e48e06e7f0b9cc9d32738757783e180 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 19:52:27 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 src/kreplacements/kreplacements.cpp | 14 +++++++-------
 src/kreplacements/kreplacements.h   | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/kreplacements')

diff --git a/src/kreplacements/kreplacements.cpp b/src/kreplacements/kreplacements.cpp
index 9b20e49..93954da 100644
--- a/src/kreplacements/kreplacements.cpp
+++ b/src/kreplacements/kreplacements.cpp
@@ -45,7 +45,7 @@ static TQString s_description;
 static TQString s_appName;
 static TQString s_version;
 static TQString s_homepage;
-static KAboutData* s_pAboutData;
+static TDEAboutData* s_pAboutData;
 
 
 #ifdef _WIN32
@@ -372,7 +372,7 @@ void KMainWindow::slotAbout()
       );
    d.addTab(tb1,i18n("&About"));
       
-   std::list<KAboutData::AboutDataEntry>::iterator i;
+   std::list<TDEAboutData::AboutDataEntry>::iterator i;
    
    TQString s2;   
    for( i=s_pAboutData->m_authorList.begin(); i!=s_pAboutData->m_authorList.end(); ++i )
@@ -847,7 +847,7 @@ TQPixmap KIconLoader::loadIcon( const TQString&, int )
    return TQPixmap();
 }
 
-KAboutData::KAboutData( const TQString& /*name*/, const TQString& appName, const TQString& version,
+TDEAboutData::TDEAboutData( const TQString& /*name*/, const TQString& appName, const TQString& version,
       const TQString& description, int,
       const TQString& copyright, int, const TQString& homepage, const TQString& email)
 {
@@ -859,16 +859,16 @@ KAboutData::KAboutData( const TQString& /*name*/, const TQString& appName, const
    s_homepage = homepage;
 }
 
-KAboutData::KAboutData( const TQString& /*name*/, const TQString& /*appName*/, const TQString& /*version*/ )
+TDEAboutData::TDEAboutData( const TQString& /*name*/, const TQString& /*appName*/, const TQString& /*version*/ )
 {
 }
 
-void KAboutData::addAuthor(const char* name, const char* task, const char* email, const char* weblink)
+void TDEAboutData::addAuthor(const char* name, const char* task, const char* email, const char* weblink)
 {
    m_authorList.push_back( AboutDataEntry( name, task, email, weblink) );
 }
 
-void KAboutData::addCredit(const char* name, const char* task, const char* email, const char* weblink)
+void TDEAboutData::addCredit(const char* name, const char* task, const char* email, const char* weblink)
 {
    m_creditList.push_back( AboutDataEntry( name, task, email, weblink) );
 }
@@ -896,7 +896,7 @@ TDECmdLineArgs* TDECmdLineArgs::parsedArgs()  // static
    return &s_cmdLineArgs;
 }
 
-void TDECmdLineArgs::init( int argc, char**argv, KAboutData* pAboutData )  // static
+void TDECmdLineArgs::init( int argc, char**argv, TDEAboutData* pAboutData )  // static
 {
    s_argc = argc;
    s_argv = argv;
diff --git a/src/kreplacements/kreplacements.h b/src/kreplacements/kreplacements.h
index 42993e1..ca172c6 100644
--- a/src/kreplacements/kreplacements.h
+++ b/src/kreplacements/kreplacements.h
@@ -325,13 +325,13 @@ struct KCmdLineOptions
 
 #define KCmdLineLastOption {0,0,0}
 
-class KAboutData
+class TDEAboutData
 {
 public:
-   KAboutData( const TQString& name, const TQString& appName, const TQString& version,
+   TDEAboutData( const TQString& name, const TQString& appName, const TQString& version,
       const TQString& description, int licence,
       const TQString& copyright, int w, const TQString& homepage, const TQString& email);
-   KAboutData( const TQString& name, const TQString& appName, const TQString& version );
+   TDEAboutData( const TQString& name, const TQString& appName, const TQString& version );
    void addAuthor(const char* name=0, const char* task=0, const char* email=0, const char* weblink=0);
    void addCredit(const char* name=0, const char* task=0, const char* email=0, const char* weblink=0);
    enum { License_GPL };
@@ -357,7 +357,7 @@ class TDECmdLineArgs
 {
 public:
    static TDECmdLineArgs* parsedArgs();
-   static void init( int argc, char**argv, KAboutData* );
+   static void init( int argc, char**argv, TDEAboutData* );
    static void addCmdLineOptions( KCmdLineOptions* options ); // Add our own options.
 
    int count();
@@ -450,10 +450,10 @@ namespace KIO
 
 typedef TQProgressBar KProgress;
 
-class KInstance : public TQObject
+class TDEInstance : public TQObject
 {
 public:
-   KInstance(KAboutData*){}
+   TDEInstance(TDEAboutData*){}
 };
 
 namespace KParts
@@ -486,7 +486,7 @@ namespace KParts
    public:
    ReadOnlyPart(){}
    ReadOnlyPart(TQObject*,const TQCString&){}
-   void setInstance( KInstance* ){}
+   void setInstance( TDEInstance* ){}
    TQString m_file;
    };
 
-- 
cgit v1.2.1