diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 19:50:11 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 19:50:11 -0600 |
| commit | d27f8b16e4c71149fae710de57c29c44c2b51a88 (patch) | |
| tree | 4522ddd5f158a134fc336dd6e5a603d67d687340 | |
| parent | 8aed4b829a1731352e119bdf5f8f51f31a1f354a (diff) | |
| download | adept-d27f8b16e4c71149fae710de57c29c44c2b51a88.tar.gz adept-d27f8b16e4c71149fae710de57c29c44c2b51a88.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
| -rw-r--r-- | adept/batch/main.cpp | 4 | ||||
| -rw-r--r-- | adept/installer/main.cpp | 4 | ||||
| -rw-r--r-- | adept/manager/main.cpp | 4 | ||||
| -rw-r--r-- | adept/notifier/app.cpp | 4 | ||||
| -rw-r--r-- | adept/updater/main.cpp | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/adept/batch/main.cpp b/adept/batch/main.cpp index eed84e5..d255f89 100644 --- a/adept/batch/main.cpp +++ b/adept/batch/main.cpp @@ -18,11 +18,11 @@ int main(int argc, char *argv[]) TQString description = i18n("Adept Batch"); - KAboutData aboutData( "adept_batch", + TDEAboutData aboutData( "adept_batch", I18N_NOOP("Adept Batch"), "2.1 Cruiser", description.latin1(), - KAboutData::License_BSD, + TDEAboutData::License_BSD, I18N_NOOP("(c) 2006 Peter Rockai"), 0, "http://web.mornfall.net/adept.html"); diff --git a/adept/installer/main.cpp b/adept/installer/main.cpp index c68c294..49c245d 100644 --- a/adept/installer/main.cpp +++ b/adept/installer/main.cpp @@ -19,11 +19,11 @@ int main(int argc, char *argv[]) putenv( "TQT_IM_MODULE=xim" ); TQString description = i18n("Adept Installer"); - KAboutData aboutData( "adept_installer", + TDEAboutData aboutData( "adept_installer", I18N_NOOP("Adept Installer"), "2.1 Cruiser", description.latin1(), - KAboutData::License_BSD, + TDEAboutData::License_BSD, I18N_NOOP("(c) 2005, 2006 Peter Rockai"), 0, "http://web.mornfall.net/adept.html"); diff --git a/adept/manager/main.cpp b/adept/manager/main.cpp index 4b1eb73..3d6709e 100644 --- a/adept/manager/main.cpp +++ b/adept/manager/main.cpp @@ -19,11 +19,11 @@ int main(int argc, char *argv[]) putenv( "TQT_IM_MODULE=xim" ); TQString description = i18n("Adept Manager"); - KAboutData aboutData( "adept_manager", + TDEAboutData aboutData( "adept_manager", I18N_NOOP("Adept Manager"), "2.1 Cruiser", description.latin1(), - KAboutData::License_BSD, + TDEAboutData::License_BSD, I18N_NOOP("(c) 2005, 2006 Peter Rockai"), 0, "http://web.mornfall.net/adept.html"); diff --git a/adept/notifier/app.cpp b/adept/notifier/app.cpp index e79567f..1107af4 100644 --- a/adept/notifier/app.cpp +++ b/adept/notifier/app.cpp @@ -350,9 +350,9 @@ const char * DESCRIPTION = /* extern "C" KDE_EXPORT */ int main(int argc, char *argv[]) { - KAboutData about("adept_notifier", I18N_NOOP("Adept Notifier"), + TDEAboutData about("adept_notifier", I18N_NOOP("Adept Notifier"), "2.1 Cruiser", - DESCRIPTION, KAboutData::License_BSD, + DESCRIPTION, TDEAboutData::License_BSD, "Copyright (C) 2005, 2006 Peter Rockai"); TDECmdLineArgs::init(argc, argv, &about); NotifierApp::addCmdLineOptions(); diff --git a/adept/updater/main.cpp b/adept/updater/main.cpp index 0ec76eb..804596a 100644 --- a/adept/updater/main.cpp +++ b/adept/updater/main.cpp @@ -19,11 +19,11 @@ int main(int argc, char *argv[]) putenv( "TQT_IM_MODULE=xim" ); TQString description = i18n("Adept Updater"); - KAboutData aboutData( "adept_updater", + TDEAboutData aboutData( "adept_updater", I18N_NOOP("Adept Updater"), "2.1 Cruiser", description.latin1(), - KAboutData::License_BSD, + TDEAboutData::License_BSD, I18N_NOOP("(c) 2005, 2006 Peter Rockai"), 0, "http://web.mornfall.net/adept.html"); |