From 63bcbec9a09626ba09945de06b3eb74f50f3b228 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:22:42 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kunittest/example/simple/maingui.cpp | 4 ++-- kunittest/guimodrunner.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'kunittest') diff --git a/kunittest/example/simple/maingui.cpp b/kunittest/example/simple/maingui.cpp index 9c3d52ed..b292d780 100644 --- a/kunittest/example/simple/maingui.cpp +++ b/kunittest/example/simple/maingui.cpp @@ -43,8 +43,8 @@ static KCmdLineOptions options[] = int main( int argc, char** argv ) { - KAboutData about("SampleTests", I18N_NOOP("SampleTests"), version, description, - KAboutData::License_BSD, "(C) 2005 Jeroen Wijnhout", 0, 0, + TDEAboutData about("SampleTests", I18N_NOOP("SampleTests"), version, description, + TDEAboutData::License_BSD, "(C) 2005 Jeroen Wijnhout", 0, 0, "Jeroen.Wijnhout@kdemail.net"); TDECmdLineArgs::init(argc, argv, &about); diff --git a/kunittest/guimodrunner.cpp b/kunittest/guimodrunner.cpp index 455cf45b..11a3532b 100644 --- a/kunittest/guimodrunner.cpp +++ b/kunittest/guimodrunner.cpp @@ -49,10 +49,10 @@ static KCmdLineOptions options[] = int main( int argc, char **argv ) { - KInstance instance("modrunner"); + TDEInstance instance("modrunner"); - KAboutData about("KUnitTestModRunner", I18N_NOOP("KUnitTestModRunner"), version, description, - KAboutData::License_BSD, "(C) 2005 Jeroen Wijnhout", 0, 0, + TDEAboutData about("KUnitTestModRunner", I18N_NOOP("KUnitTestModRunner"), version, description, + TDEAboutData::License_BSD, "(C) 2005 Jeroen Wijnhout", 0, 0, "Jeroen.Wijnhout@kdemail.net"); TDECmdLineArgs::init(argc, argv, &about); -- cgit v1.2.1