diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /konsole/konsole/main.cpp | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'konsole/konsole/main.cpp')
| -rw-r--r-- | konsole/konsole/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp index f8859da75..840ac6ac1 100644 --- a/konsole/konsole/main.cpp +++ b/konsole/konsole/main.cpp @@ -162,8 +162,8 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) bool scrollbaron = true; bool showtip = true; - KAboutData aboutData( "konsole", I18N_NOOP("Konsole"), - KONSOLE_VERSION, description, KAboutData::License_GPL_V2, + TDEAboutData aboutData( "konsole", I18N_NOOP("Konsole"), + KONSOLE_VERSION, description, TDEAboutData::License_GPL_V2, "Copyright (c) 1997-2006, Lars Doelle"); aboutData.addAuthor("Robert Knight",I18N_NOOP("Maintainer"), "robertknight@gmail.com"); aboutData.addAuthor("Lars Doelle",I18N_NOOP("Author"), "lars.doelle@on-line.de"); |