From 5fc6f26e12b596addd235f87320c31761bd5a84d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:22:15 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kalarm/kalarmd/admain.cpp | 4 ++-- kalarm/main.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kalarm') 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"); diff --git a/kalarm/main.cpp b/kalarm/main.cpp index 038a3ab75..12a6332c7 100644 --- a/kalarm/main.cpp +++ b/kalarm/main.cpp @@ -107,9 +107,9 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData(PROGRAM_NAME, I18N_NOOP("KAlarm"), KALARM_VERSION, + TDEAboutData aboutData(PROGRAM_NAME, I18N_NOOP("KAlarm"), KALARM_VERSION, I18N_NOOP("Personal alarm message, command and email scheduler for TDE"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "Copyright 2001-2007, David Jarvie", 0, "http://www.astrojar.org.uk/kalarm"); aboutData.addAuthor("David Jarvie", 0, "software@astrojar.org.uk"); -- cgit v1.2.1