From aa28dd8ff70a02441fb799dd420d2953094d1e74 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 19:57:39 -0600 Subject: [PATCH] Rename KInstance and KAboutData to avoid conflicts with KDE4 --- microbe/main.cpp | 4 ++-- src/core/main.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/microbe/main.cpp b/microbe/main.cpp index 7e8d003..986b4eb 100644 --- a/microbe/main.cpp +++ b/microbe/main.cpp @@ -47,8 +47,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("microbe", I18N_NOOP("Microbe"), version, description, - KAboutData::License_GPL, "(C) 2004-2005, The KTechlab developers", 0, "http://ktechlab.org", "ktechlab-devel@lists.sourceforge.net" ); + TDEAboutData about("microbe", I18N_NOOP("Microbe"), version, description, + TDEAboutData::License_GPL, "(C) 2004-2005, The KTechlab developers", 0, "http://ktechlab.org", "ktechlab-devel@lists.sourceforge.net" ); about.addAuthor( "Daniel Clarke", 0, "daniel.jc@gmail.com" ); about.addAuthor( "David Saxton", 0, "david@bluehaze.org" ); TDECmdLineArgs::init(argc, argv, &about); diff --git a/src/core/main.cpp b/src/core/main.cpp index 3fca769..a3206ea 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -31,8 +31,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("ktechlab", I18N_NOOP("KTechlab"), version, description, - KAboutData::License_GPL, "(C) 2003-2005, The KTechlab developers", "", "http://ktechlab.org", "ktechlab-devel@lists.sourceforge.net" ); + TDEAboutData about("ktechlab", I18N_NOOP("KTechlab"), version, description, + TDEAboutData::License_GPL, "(C) 2003-2005, The KTechlab developers", "", "http://ktechlab.org", "ktechlab-devel@lists.sourceforge.net" ); about.addAuthor( "David Saxton", 0, "david@bluehaze.org" ); about.addAuthor( "Daniel Clarke", 0, "daniel.jc@gmail.com" ); about.addCredit( "Couriousous", "JK flip-flop, asyncronous preset/reset in the D flip-flop." );