diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:10:41 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:10:41 -0600 |
| commit | 7422cac1a18dca897d3830a267eb91683d05a95b (patch) | |
| tree | 2ba309f49b47a5fbb0b226801b224c2532b7ab1a /chalk/core/tiles/tests | |
| parent | 3fe437def8063926892bddf2dcc733861308836d (diff) | |
| download | koffice-7422cac1a18dca897d3830a267eb91683d05a95b.tar.gz koffice-7422cac1a18dca897d3830a267eb91683d05a95b.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'chalk/core/tiles/tests')
| -rw-r--r-- | chalk/core/tiles/tests/Makefile.am | 12 | ||||
| -rw-r--r-- | chalk/core/tiles/tests/kis_tiled_data_tester.cpp | 6 | ||||
| -rw-r--r-- | chalk/core/tiles/tests/kis_tiled_data_tester.h | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/chalk/core/tiles/tests/Makefile.am b/chalk/core/tiles/tests/Makefile.am index c546d7f5..c6821483 100644 --- a/chalk/core/tiles/tests/Makefile.am +++ b/chalk/core/tiles/tests/Makefile.am @@ -5,11 +5,11 @@ AM_CPPFLAGS = -I$(srcdir)/../ \ # The check_ target makes sure we don't install the modules, # $(KDE_CHECK_PLUGIN) assures a shared library is created. -check_LTLIBRARIES = kunittest_kis_tiled_data_tester.la -kunittest_kis_tiled_data_tester_la_SOURCES = kis_tiled_data_tester.cpp -kunittest_kis_tiled_data_tester_la_LIBADD = -lkunittest ../../../libchalkcommon.la -kunittest_kis_tiled_data_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +check_LTLIBRARIES = tdeunittest_kis_tiled_data_tester.la +tdeunittest_kis_tiled_data_tester_la_SOURCES = kis_tiled_data_tester.cpp +tdeunittest_kis_tiled_data_tester_la_LIBADD = -ltdeunittest ../../../libchalkcommon.la +tdeunittest_kis_tiled_data_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -check-local: kunittest_kis_tiled_data_tester.la - kunittestmodrunner +check-local: tdeunittest_kis_tiled_data_tester.la + tdeunittestmodrunner diff --git a/chalk/core/tiles/tests/kis_tiled_data_tester.cpp b/chalk/core/tiles/tests/kis_tiled_data_tester.cpp index 15d3e50b..be09579c 100644 --- a/chalk/core/tiles/tests/kis_tiled_data_tester.cpp +++ b/chalk/core/tiles/tests/kis_tiled_data_tester.cpp @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kunittest/runner.h> -#include <kunittest/module.h> +#include <tdeunittest/runner.h> +#include <tdeunittest/module.h> #include "kis_tiled_data_tester.h" #include "kis_datamanager.h" @@ -25,7 +25,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kis_tiled_data_tester, "Tiled Data Tester" ); +KUNITTEST_MODULE( tdeunittest_kis_tiled_data_tester, "Tiled Data Tester" ); KUNITTEST_MODULE_REGISTER_TESTER( KisTiledDataTester ); #define TEST_PIXEL_SIZE 4 diff --git a/chalk/core/tiles/tests/kis_tiled_data_tester.h b/chalk/core/tiles/tests/kis_tiled_data_tester.h index 8a569d23..64c04bd7 100644 --- a/chalk/core/tiles/tests/kis_tiled_data_tester.h +++ b/chalk/core/tiles/tests/kis_tiled_data_tester.h @@ -20,7 +20,7 @@ #ifndef KIS_TILED_DATA_TESTER_H #define KIS_TILED_DATA_TESTER_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> class KisTiledDataTester : public KUnitTest::Tester { |