From 7422cac1a18dca897d3830a267eb91683d05a95b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:10:41 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- chalk/core/tests/Makefile.am | 24 +++++++++++----------- .../core/tests/kis_filter_configuration_tester.cc | 6 +++--- chalk/core/tests/kis_filter_configuration_tester.h | 2 +- chalk/core/tests/kis_image_tester.cpp | 6 +++--- chalk/core/tests/kis_image_tester.h | 2 +- chalk/core/tests/kis_integer_maths_tester.cpp | 6 +++--- chalk/core/tests/kis_integer_maths_tester.h | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) (limited to 'chalk/core/tests') diff --git a/chalk/core/tests/Makefile.am b/chalk/core/tests/Makefile.am index 239c1ba6..97316685 100644 --- a/chalk/core/tests/Makefile.am +++ b/chalk/core/tests/Makefile.am @@ -10,21 +10,21 @@ AM_CPPFLAGS = \ # The check_ target makes sure we don't install the modules, # $(KDE_CHECK_PLUGIN) assures a shared library is created. -check_LTLIBRARIES = kunittest_kis_integer_maths_tester.la kunittest_kis_image_tester.la kunittest_kis_filter_configuration_tester.la +check_LTLIBRARIES = tdeunittest_kis_integer_maths_tester.la tdeunittest_kis_image_tester.la tdeunittest_kis_filter_configuration_tester.la -kunittest_kis_integer_maths_tester_la_SOURCES = kis_integer_maths_tester.cpp -kunittest_kis_integer_maths_tester_la_LIBADD = -lkunittest ../../libchalkcommon.la -kunittest_kis_integer_maths_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kis_integer_maths_tester_la_SOURCES = kis_integer_maths_tester.cpp +tdeunittest_kis_integer_maths_tester_la_LIBADD = -ltdeunittest ../../libchalkcommon.la +tdeunittest_kis_integer_maths_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -kunittest_kis_image_tester_la_SOURCES = kis_image_tester.cpp -kunittest_kis_image_tester_la_LIBADD = -lkunittest ../../libchalkcommon.la -kunittest_kis_image_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kis_image_tester_la_SOURCES = kis_image_tester.cpp +tdeunittest_kis_image_tester_la_LIBADD = -ltdeunittest ../../libchalkcommon.la +tdeunittest_kis_image_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -kunittest_kis_filter_configuration_tester_la_SOURCES = kis_filter_configuration_tester.cc -kunittest_kis_filter_configuration_tester_la_LIBADD = -lkunittest ../../libchalkcommon.la -kunittest_kis_filter_configuration_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kis_filter_configuration_tester_la_SOURCES = kis_filter_configuration_tester.cc +tdeunittest_kis_filter_configuration_tester_la_LIBADD = -ltdeunittest ../../libchalkcommon.la +tdeunittest_kis_filter_configuration_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -check-local: kunittest_kis_integer_maths_tester.la kunittest_kis_image_tester.la kunittest_kis_filter_configuration_tester.la - kunittestmodrunner +check-local: tdeunittest_kis_integer_maths_tester.la tdeunittest_kis_image_tester.la tdeunittest_kis_filter_configuration_tester.la + tdeunittestmodrunner diff --git a/chalk/core/tests/kis_filter_configuration_tester.cc b/chalk/core/tests/kis_filter_configuration_tester.cc index 6a4a2631..83d6b522 100644 --- a/chalk/core/tests/kis_filter_configuration_tester.cc +++ b/chalk/core/tests/kis_filter_configuration_tester.cc @@ -19,15 +19,15 @@ #include #include -#include -#include +#include +#include #include "kis_filter_configuration_tester.h" #include "../kis_filter_configuration.h" using namespace KUnitTest; -KUNITTEST_MODULE(kunittest_kis_filter_configuration_tester, "KisFilterConfiguration Tester"); +KUNITTEST_MODULE(tdeunittest_kis_filter_configuration_tester, "KisFilterConfiguration Tester"); KUNITTEST_MODULE_REGISTER_TESTER(KisFilterConfigurationTester); void KisFilterConfigurationTester::allTests() diff --git a/chalk/core/tests/kis_filter_configuration_tester.h b/chalk/core/tests/kis_filter_configuration_tester.h index 6e1ca2e5..0dffee33 100644 --- a/chalk/core/tests/kis_filter_configuration_tester.h +++ b/chalk/core/tests/kis_filter_configuration_tester.h @@ -19,7 +19,7 @@ #ifndef KIS_FILTER_CONFIGURATION_TESTER_H #define KIS_FILTER_CONFIGURATION_TESTER_H -#include +#include class KisFilterConfigurationTester : public KUnitTest::Tester { diff --git a/chalk/core/tests/kis_image_tester.cpp b/chalk/core/tests/kis_image_tester.cpp index f660f394..be125c94 100644 --- a/chalk/core/tests/kis_image_tester.cpp +++ b/chalk/core/tests/kis_image_tester.cpp @@ -18,8 +18,8 @@ #include -#include -#include +#include +#include #include "kis_image_tester.h" #include "kis_image.h" @@ -32,7 +32,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE(kunittest_kis_image_tester, "KisImage Tester"); +KUNITTEST_MODULE(tdeunittest_kis_image_tester, "KisImage Tester"); KUNITTEST_MODULE_REGISTER_TESTER(KisImageTester); void KisImageTester::allTests() diff --git a/chalk/core/tests/kis_image_tester.h b/chalk/core/tests/kis_image_tester.h index 4e676838..06ee65b7 100644 --- a/chalk/core/tests/kis_image_tester.h +++ b/chalk/core/tests/kis_image_tester.h @@ -19,7 +19,7 @@ #ifndef KIS_IMAGE_TESTER_H #define KIS_IMAGE_TESTER_H -#include +#include class KisImageTester : public KUnitTest::Tester { diff --git a/chalk/core/tests/kis_integer_maths_tester.cpp b/chalk/core/tests/kis_integer_maths_tester.cpp index 1878731b..eb9d76ae 100644 --- a/chalk/core/tests/kis_integer_maths_tester.cpp +++ b/chalk/core/tests/kis_integer_maths_tester.cpp @@ -16,15 +16,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include "kis_integer_maths_tester.h" #include "kis_integer_maths.h" using namespace KUnitTest; -KUNITTEST_MODULE(kunittest_kis_integer_maths_tester, "Integer Maths Tester"); +KUNITTEST_MODULE(tdeunittest_kis_integer_maths_tester, "Integer Maths Tester"); KUNITTEST_MODULE_REGISTER_TESTER(KisIntegerMathsTester); void KisIntegerMathsTester::allTests() diff --git a/chalk/core/tests/kis_integer_maths_tester.h b/chalk/core/tests/kis_integer_maths_tester.h index 2a9a9a20..9e91f030 100644 --- a/chalk/core/tests/kis_integer_maths_tester.h +++ b/chalk/core/tests/kis_integer_maths_tester.h @@ -19,7 +19,7 @@ #ifndef KIS_INTEGER_MATHS_TESTER_H #define KIS_INTEGER_MATHS_TESTER_H -#include +#include class KisIntegerMathsTester : public KUnitTest::Tester { -- cgit v1.2.1