diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /kdesktop | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop')
| -rw-r--r-- | kdesktop/kwebdesktop/kwebdesktop.cpp | 4 | ||||
| -rw-r--r-- | kdesktop/main.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp index 2c8650f85..e845750a1 100644 --- a/kdesktop/kwebdesktop/kwebdesktop.cpp +++ b/kdesktop/kwebdesktop/kwebdesktop.cpp @@ -86,10 +86,10 @@ void KWebDesktopRun::slotFinished( KIO::Job * job ) int main( int argc, char **argv ) { - KAboutData data( "kwebdesktop", I18N_NOOP("TDE Web Desktop"), + TDEAboutData data( "kwebdesktop", I18N_NOOP("TDE Web Desktop"), VERSION, I18N_NOOP("Displays an HTML page as the background of the desktop"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2000, David Faure <[email protected]>" ); data.addAuthor( "David Faure", I18N_NOOP("developer and maintainer"), "[email protected]" ); diff --git a/kdesktop/main.cc b/kdesktop/main.cc index 51eb7b2a3..a12f241b8 100644 --- a/kdesktop/main.cc +++ b/kdesktop/main.cc @@ -168,8 +168,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) twin_name.sprintf("twin-screen-%d", kdesktop_screen_number); } - KAboutData aboutData( kdesktop_name, I18N_NOOP("KDesktop"), - version, description, KAboutData::License_GPL, + TDEAboutData aboutData( kdesktop_name, I18N_NOOP("KDesktop"), + version, description, TDEAboutData::License_GPL, "(c) 1998-2000, The KDesktop Authors"); aboutData.addAuthor("David Faure", 0, "[email protected]"); aboutData.addAuthor("Martin Koller", 0, "[email protected]"); |