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.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/kreplacements/kreplacements.h')

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