summaryrefslogtreecommitdiffstats
path: root/kunittest
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:22:42 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:22:42 -0600
commit63bcbec9a09626ba09945de06b3eb74f50f3b228 (patch)
tree205df87b7ca9a12d3295653c8e4a0dd7283ea03a /kunittest
parentcfe9ce987a45dd734b924ee4596946227a50609e (diff)
downloadtdesdk-63bcbec9a09626ba09945de06b3eb74f50f3b228.tar.gz
tdesdk-63bcbec9a09626ba09945de06b3eb74f50f3b228.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kunittest')
-rw-r--r--kunittest/example/simple/maingui.cpp4
-rw-r--r--kunittest/guimodrunner.cpp6
2 files changed, 5 insertions, 5 deletions
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);