diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
| commit | dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 (patch) | |
| tree | c297348a55df66c571de4525646e0b9762427353 /tdecore/tests | |
| parent | b7658a0d5eca24a9d37c6e04f88298ef02389db0 (diff) | |
| download | tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.tar.gz tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/tests')
| -rw-r--r-- | tdecore/tests/Makefile.am | 8 | ||||
| -rw-r--r-- | tdecore/tests/dcopkonqtest.cpp | 4 | ||||
| -rw-r--r-- | tdecore/tests/kapptest.cpp | 2 | ||||
| -rw-r--r-- | tdecore/tests/kconfigtest.cpp | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/tdecore/tests/Makefile.am b/tdecore/tests/Makefile.am index e35ae68a4..9d2c5259c 100644 --- a/tdecore/tests/Makefile.am +++ b/tdecore/tests/Makefile.am @@ -79,8 +79,8 @@ kstdacceltest_SOURCES = kstdacceltest.cpp kglobaltest_SOURCES = kglobaltest.cpp ktimezonestest_SOURCES = ktimezonestest.cpp -check_LTLIBRARIES = kunittest_kconfig.la +check_LTLIBRARIES = tdeunittest_kconfig.la -kunittest_kconfig_la_SOURCES = kconfigtest.cpp -kunittest_kconfig_la_LIBADD = $(LIB_KUNITTEST) -kunittest_kconfig_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) +tdeunittest_kconfig_la_SOURCES = kconfigtest.cpp +tdeunittest_kconfig_la_LIBADD = $(LIB_KUNITTEST) +tdeunittest_kconfig_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) diff --git a/tdecore/tests/dcopkonqtest.cpp b/tdecore/tests/dcopkonqtest.cpp index 543efd706..79137cd5f 100644 --- a/tdecore/tests/dcopkonqtest.cpp +++ b/tdecore/tests/dcopkonqtest.cpp @@ -27,8 +27,8 @@ debug("sending configure to object KonquerorIface in konqueror"); debug("ko"); /// BROADCAST -debug("sending databaseChanged to object ksycoca in all apps"); - if (kapp->dcopClient()->send( "*", "ksycoca", "databaseChanged()", data )) +debug("sending databaseChanged to object tdesycoca in all apps"); + if (kapp->dcopClient()->send( "*", "tdesycoca", "databaseChanged()", data )) debug("ok"); else debug("ko"); diff --git a/tdecore/tests/kapptest.cpp b/tdecore/tests/kapptest.cpp index 53bb0f9f3..bae6a9c2e 100644 --- a/tdecore/tests/kapptest.cpp +++ b/tdecore/tests/kapptest.cpp @@ -23,7 +23,7 @@ #include <kcmdlineargs.h> #include <kaboutdata.h> #include <kglobalsettings.h> -#include <ksycoca.h> +#include <tdesycoca.h> int main(int argc, char *argv[]) diff --git a/tdecore/tests/kconfigtest.cpp b/tdecore/tests/kconfigtest.cpp index e4768119c..d3421a3d8 100644 --- a/tdecore/tests/kconfigtest.cpp +++ b/tdecore/tests/kconfigtest.cpp @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#include <kunittest/tester.h> -#include <kunittest/module.h> +#include <tdeunittest/tester.h> +#include <tdeunittest/module.h> #include <kconfig.h> @@ -31,7 +31,7 @@ private: void revertEntries(); }; -KUNITTEST_MODULE( kunittest_kconfig, "TDEConfigTest" ) +KUNITTEST_MODULE( tdeunittest_kconfig, "TDEConfigTest" ) KUNITTEST_MODULE_REGISTER_TESTER( TDEConfigTest ) // test data |