diff options
author | Timothy Pearson <[email protected]> | 2013-01-22 19:52:27 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-22 19:52:27 -0600 |
commit | fd7791939e48e06e7f0b9cc9d32738757783e180 (patch) | |
tree | 64efdead645c6d058b560dbf9952e2dd73a99f83 /src/kreplacements/kreplacements.h | |
parent | 046d6d18d5e6e3ca95711968793d8c46f56de6e8 (diff) | |
download | kdiff3-fd7791939e48e06e7f0b9cc9d32738757783e180.tar.gz kdiff3-fd7791939e48e06e7f0b9cc9d32738757783e180.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'src/kreplacements/kreplacements.h')
-rw-r--r-- | src/kreplacements/kreplacements.h | 14 |
1 files changed, 7 insertions, 7 deletions
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; }; |