diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:52:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:52:27 -0600 |
| commit | fd7791939e48e06e7f0b9cc9d32738757783e180 (patch) | |
| tree | 64efdead645c6d058b560dbf9952e2dd73a99f83 /src/main.cpp | |
| parent | 046d6d18d5e6e3ca95711968793d8c46f56de6e8 (diff) | |
| download | kdiff3-fd7791939e48e06e7f0b9cc9d32738757783e180.tar.gz kdiff3-fd7791939e48e06e7f0b9cc9d32738757783e180.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 24f44b5..429dc2a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -170,8 +170,8 @@ int main(int argc, char *argv[]) #endif //TQApplication::setColorSpec( TQApplication::ManyColor ); // Grab all 216 colors - KAboutData aboutData( "kdiff3", I18N_NOOP("KDiff3"), - VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "kdiff3", I18N_NOOP("KDiff3"), + VERSION, description, TDEAboutData::License_GPL, "(c) 2002-2007 Joachim Eibl", 0, "http://kdiff3.sourceforge.net/", "joachim.eibl" "@" "gmx.de"); aboutData.addAuthor("Joachim Eibl",0, "joachim.eibl" "@" "gmx.de"); aboutData.addCredit("Eike Sauer", "Bugfixes, Debian package maintainer" ); |