From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:05 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- arts/kde/kconverttest.cc | 2 +- arts/kde/kiotest.cc | 2 +- arts/kde/kiotestslow.cc | 2 +- arts/kde/mcop-dcop/kmcop.cpp | 4 ++-- arts/knotify/knotify.cpp | 4 ++-- arts/message/artsmessage.cc | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'arts') diff --git a/arts/kde/kconverttest.cc b/arts/kde/kconverttest.cc index 10778d6bf..63f5ae536 100644 --- a/arts/kde/kconverttest.cc +++ b/arts/kde/kconverttest.cc @@ -55,7 +55,7 @@ void KConvertTest::slotRawStreamFinished() int main(int argc, char **argv) { - KAboutData aboutData("kconverttest", I18N_NOOP("KConvertTest"), I18N_NOOP("0.1"), "", KAboutData::License_GPL, ""); + TDEAboutData aboutData("kconverttest", I18N_NOOP("KConvertTest"), I18N_NOOP("0.1"), "", TDEAboutData::License_GPL, ""); TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); diff --git a/arts/kde/kiotest.cc b/arts/kde/kiotest.cc index b27978f47..826a3b165 100644 --- a/arts/kde/kiotest.cc +++ b/arts/kde/kiotest.cc @@ -20,7 +20,7 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData aboutData( "kiotest", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", KAboutData::License_GPL, ""); + TDEAboutData aboutData( "kiotest", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", TDEAboutData::License_GPL, ""); TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions(options); diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc index f35f2a3e2..e367ea924 100644 --- a/arts/kde/kiotestslow.cc +++ b/arts/kde/kiotestslow.cc @@ -88,7 +88,7 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData aboutData( "kiotestslow", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", KAboutData::License_GPL, ""); + TDEAboutData aboutData( "kiotestslow", I18N_NOOP("KIOTest"), I18N_NOOP("0.1"), "", TDEAboutData::License_GPL, ""); TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions(options); diff --git a/arts/kde/mcop-dcop/kmcop.cpp b/arts/kde/mcop-dcop/kmcop.cpp index b95f97de5..0ba9b48a4 100644 --- a/arts/kde/mcop-dcop/kmcop.cpp +++ b/arts/kde/mcop-dcop/kmcop.cpp @@ -48,9 +48,9 @@ public: int main(int argc, char **argv) { - KAboutData aboutdata("kmcop", I18N_NOOP("KMCOP"), + TDEAboutData aboutdata("kmcop", I18N_NOOP("KMCOP"), "0.1", I18N_NOOP("TDE MCOP-DCOP Bridge"), - KAboutData::License_GPL, "(C) 2001, Nikolas Zimmermann"); + TDEAboutData::License_GPL, "(C) 2001, Nikolas Zimmermann"); aboutdata.addAuthor("Nikolas Zimmermann", I18N_NOOP("Author"), "wildfox@kde.org"); TDECmdLineArgs::init(argc, argv, &aboutdata); diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp index e6a234fba..3fcaff6e0 100644 --- a/arts/knotify/knotify.cpp +++ b/arts/knotify/knotify.cpp @@ -105,9 +105,9 @@ extern "C"{ KDE_EXPORT int kdemain(int argc, char **argv) { - KAboutData aboutdata("knotify", I18N_NOOP("KNotify"), + TDEAboutData aboutdata("knotify", I18N_NOOP("KNotify"), "3.0", I18N_NOOP("TDE Notification Server"), - KAboutData::License_GPL, "(C) 1997-2003, KDE Developers"); + TDEAboutData::License_GPL, "(C) 1997-2003, KDE Developers"); aboutdata.addAuthor("Carsten Pfeiffer",I18N_NOOP("Current Maintainer"),"pfeiffer@kde.org"); aboutdata.addAuthor("Christian Esken",0,"esken@kde.org"); aboutdata.addAuthor("Stefan Westerfeld",I18N_NOOP("Sound support"),"stefan@space.twc.de"); diff --git a/arts/message/artsmessage.cc b/arts/message/artsmessage.cc index 410419302..37bf4b75e 100644 --- a/arts/message/artsmessage.cc +++ b/arts/message/artsmessage.cc @@ -51,9 +51,9 @@ static KCmdLineOptions options[] = KCmdLineLastOption // End of options. }; -KAboutData aboutData("artsmessage", I18N_NOOP("artsmessage"), "0.1", +TDEAboutData aboutData("artsmessage", I18N_NOOP("artsmessage"), "0.1", I18N_NOOP("Utility to display aRts error messages"), - KAboutData::License_GPL, "(c) 2001, Jeff Tranter", 0, 0, "tranter@kde.org"); + TDEAboutData::License_GPL, "(c) 2001, Jeff Tranter", 0, 0, "tranter@kde.org"); int main(int argc, char **argv) { aboutData.addAuthor("Jeff Tranter", 0, "tranter@kde.org"); -- cgit v1.2.1