diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:15 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:15 -0600 |
commit | 5fc6f26e12b596addd235f87320c31761bd5a84d (patch) | |
tree | 0a1ff964c23fce07fc088017df4ad537d57e62e5 /kalarm/kalarmd/admain.cpp | |
parent | 12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff) | |
download | tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kalarm/kalarmd/admain.cpp')
-rw-r--r-- | kalarm/kalarmd/admain.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kalarm/kalarmd/admain.cpp b/kalarm/kalarmd/admain.cpp index 282f368b4..bd5c8bf1a 100644 --- a/kalarm/kalarmd/admain.cpp +++ b/kalarm/kalarmd/admain.cpp @@ -39,8 +39,8 @@ static const KCmdLineOptions options[] = int main(int argc, char** argv) { - KAboutData aboutData(DAEMON_APP_NAME, I18N_NOOP("KAlarm Daemon"), - DAEMON_VERSION, I18N_NOOP("KAlarm Alarm Daemon"), KAboutData::License_GPL, + TDEAboutData aboutData(DAEMON_APP_NAME, I18N_NOOP("KAlarm Daemon"), + DAEMON_VERSION, I18N_NOOP("KAlarm Alarm Daemon"), TDEAboutData::License_GPL, "Copyright 1997-1999 Preston Brown\nCopyright 2000-2001 Cornelius Schumacher\nCopyright 2001,2004-2007 David Jarvie", 0, "http://www.astrojar.org.uk/kalarm"); aboutData.addAuthor("David Jarvie", I18N_NOOP("Maintainer"), "software@astrojar.org.uk"); |