From 1d061b286a8b183b39be60fe531f2b1c2915f03a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:15:55 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kicker/applets/launcher/quicklauncher.cpp | 4 ++-- kicker/applets/media/mediaapplet.cpp | 4 ++-- kicker/applets/naughty/NaughtyApplet.cpp | 4 ++-- kicker/applets/trash/trashapplet.cpp | 4 ++-- kicker/kicker/core/main.cpp | 4 ++-- kicker/proxy/appletproxy.cpp | 4 ++-- kicker/proxy/extensiondebugger.cpp | 4 ++-- kicker/proxy/extensionproxy.cpp | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'kicker') diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index 3f46b6b11..7c693fc8f 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -496,9 +496,9 @@ void QuickLauncher::addAppBeforeManually(TQString url, TQString sender) void QuickLauncher::about() { - KAboutData about("quicklauncher", I18N_NOOP("Quick Launcher"), "2.0", + TDEAboutData about("quicklauncher", I18N_NOOP("Quick Launcher"), "2.0", I18N_NOOP("A simple application launcher"), - KAboutData::License_GPL_V2, + TDEAboutData::License_GPL_V2, "(C) 2000 Bill Nagel\n(C) 2004 Dan Bullok\n(C) 2005 Fred Schaettgen"); KAboutApplication a(&about, this); a.exec(); diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index 8f2d69ab7..61aefd673 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -89,11 +89,11 @@ MediaApplet::~MediaApplet() void MediaApplet::about() { - KAboutData data("mediaapplet", + TDEAboutData data("mediaapplet", I18N_NOOP("Media Applet"), "1.0", I18N_NOOP("\"media:/\" ioslave frontend applet"), - KAboutData::License_GPL_V2, + TDEAboutData::License_GPL_V2, "(c) 2004, Kevin Ottens"); data.addAuthor("Kevin \'ervin\' Ottens", diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp index 3e276fe18..c7b50d4a4 100644 --- a/kicker/applets/naughty/NaughtyApplet.cpp +++ b/kicker/applets/naughty/NaughtyApplet.cpp @@ -156,13 +156,13 @@ NaughtyApplet::slotLoad(uint l) void NaughtyApplet::about() { - KAboutData about + TDEAboutData about ( "naughtyapplet", I18N_NOOP("Naughty applet"), "1.0", I18N_NOOP("Runaway process catcher"), - KAboutData::License_GPL_V2, + TDEAboutData::License_GPL_V2, "(C) 2000 Rik Hemsley (rikkus) " ); diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp index d363f3879..94d8a92db 100644 --- a/kicker/applets/trash/trashapplet.cpp +++ b/kicker/applets/trash/trashapplet.cpp @@ -75,11 +75,11 @@ TrashApplet::~TrashApplet() void TrashApplet::about() { - KAboutData data("trashapplet", + TDEAboutData data("trashapplet", I18N_NOOP("Trash Applet"), "1.0", I18N_NOOP("\"trash:/\" ioslave frontend applet"), - KAboutData::License_GPL_V2, + TDEAboutData::License_GPL_V2, "(c) 2004, Kevin Ottens"); data.addAuthor("Kevin \'ervin\' Ottens", diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp index 82f82502c..1085bd430 100644 --- a/kicker/kicker/core/main.cpp +++ b/kicker/kicker/core/main.cpp @@ -107,8 +107,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) else appname.sprintf("kicker-screen-%d", kicker_screen_number); - KAboutData aboutData( appname.data(), I18N_NOOP("TDE Panel"), - version, description, KAboutData::License_GPL_V2, + TDEAboutData aboutData( appname.data(), I18N_NOOP("TDE Panel"), + version, description, TDEAboutData::License_GPL_V2, I18N_NOOP("(c) 1999-2010, The KDE Team") ); aboutData.addAuthor("Timothy Pearson", I18N_NOOP("Current maintainer"), "kb9vqf@pearsoncomputing.net"); diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index 328cec09c..734c6ef8c 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -70,10 +70,10 @@ static KCmdLineOptions options[] = extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) { - KAboutData aboutData( "kicker", I18N_NOOP("Panel applet proxy.") + TDEAboutData aboutData( "kicker", I18N_NOOP("Panel applet proxy.") , "v0.1.0" ,I18N_NOOP("Panel applet proxy.") - , KAboutData::License_BSD + , TDEAboutData::License_BSD , "(c) 2000, The KDE Developers"); TDECmdLineArgs::init(argc, argv, &aboutData ); aboutData.addAuthor("Matthias Elter",0, "elter@kde.org"); diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp index 0910294b1..a27d59321 100644 --- a/kicker/proxy/extensiondebugger.cpp +++ b/kicker/proxy/extensiondebugger.cpp @@ -74,10 +74,10 @@ KPanelExtension* loadExtension(const AppletInfo& info) int main( int argc, char ** argv ) { - KAboutData aboutData( "extensionproxy", I18N_NOOP("Panel extension proxy.") + TDEAboutData aboutData( "extensionproxy", I18N_NOOP("Panel extension proxy.") , "v0.1.0" ,I18N_NOOP("Panel extension proxy.") - , KAboutData::License_BSD + , TDEAboutData::License_BSD , "(c) 2000, The KDE Developers"); TDECmdLineArgs::init(argc, argv, &aboutData ); aboutData.addAuthor("Matthias Elter",0, "elter@kde.org"); diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index a5345dfcf..a2fc35ecc 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -56,10 +56,10 @@ static KCmdLineOptions options[] = extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) { - KAboutData aboutData( "extensionproxy", I18N_NOOP("Panel Extension Proxy") + TDEAboutData aboutData( "extensionproxy", I18N_NOOP("Panel Extension Proxy") , "v0.1.0" ,I18N_NOOP("Panel extension proxy") - , KAboutData::License_BSD + , TDEAboutData::License_BSD , "(c) 2000, The KDE Developers"); TDECmdLineArgs::init(argc, argv, &aboutData ); aboutData.addAuthor("Matthias Elter",0, "elter@kde.org"); -- cgit v1.2.1