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 /lib/kotext/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 'lib/kotext/tests')
| -rw-r--r-- | lib/kotext/tests/KoUserStyleTester.cpp | 6 | ||||
| -rw-r--r-- | lib/kotext/tests/KoUserStyleTester.h | 2 | ||||
| -rw-r--r-- | lib/kotext/tests/Makefile.am | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/lib/kotext/tests/KoUserStyleTester.cpp b/lib/kotext/tests/KoUserStyleTester.cpp index 7eac3881..72e5081c 100644 --- a/lib/kotext/tests/KoUserStyleTester.cpp +++ b/lib/kotext/tests/KoUserStyleTester.cpp @@ -18,8 +18,8 @@ // KoUserStyle/KoUserStyleCollection test -#include <kunittest/runner.h> -#include <kunittest/module.h> +#include <tdeunittest/runner.h> +#include <tdeunittest/module.h> #include <KoUserStyleCollection.h> #include <KoUserStyle.h> @@ -29,7 +29,7 @@ #include "KoUserStyleTester.h" #include "KoUserStyleTester.moc" -KUNITTEST_MODULE(kunittest_KoUserStyleTester, "KoUserStyle Tester"); +KUNITTEST_MODULE(tdeunittest_KoUserStyleTester, "KoUserStyle Tester"); KUNITTEST_MODULE_REGISTER_TESTER(KoUserStyleTester); #undef COMPARE diff --git a/lib/kotext/tests/KoUserStyleTester.h b/lib/kotext/tests/KoUserStyleTester.h index c53b8415..4be17d4c 100644 --- a/lib/kotext/tests/KoUserStyleTester.h +++ b/lib/kotext/tests/KoUserStyleTester.h @@ -19,7 +19,7 @@ #ifndef KOUSERSTYLETESTER_H #define KOUSERSTYLETESTER_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> class KoUserStyleTester : public KUnitTest::SlotTester { Q_OBJECT diff --git a/lib/kotext/tests/Makefile.am b/lib/kotext/tests/Makefile.am index d5cf50a2..fd7754b2 100644 --- a/lib/kotext/tests/Makefile.am +++ b/lib/kotext/tests/Makefile.am @@ -8,17 +8,17 @@ check_PROGRAMS = kotextformattertest kobordertest kovariabletest TESTS = kotextformattertest kovariabletest LDADD = ../libkotext.la -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kobordertest_SOURCES = kobordertest.cpp kotextformattertest_SOURCES = kotextformattertest.cpp kovariabletest_SOURCES = kovariabletest.cpp -check_LTLIBRARIES = kunittest_KoUserStyleTester.la +check_LTLIBRARIES = tdeunittest_KoUserStyleTester.la -kunittest_KoUserStyleTester_la_SOURCES = KoUserStyleTester.cpp -kunittest_KoUserStyleTester_la_LIBADD = ../libkotext.la -lkunittest -kunittest_KoUserStyleTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_KoUserStyleTester_la_SOURCES = KoUserStyleTester.cpp +tdeunittest_KoUserStyleTester_la_LIBADD = ../libkotext.la -ltdeunittest +tdeunittest_KoUserStyleTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) check-local: - kunittestmodrunner + tdeunittestmodrunner |