From 48087e1d5650499b6093a6816356d467c8461802 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:17:46 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kopete/libkopete/tests/Makefile.am | 32 +++++++++++----------- kopete/libkopete/tests/README | 6 ++-- kopete/libkopete/tests/create_test.rb | 2 +- kopete/libkopete/tests/kopetecontactlist_test.cpp | 4 +-- kopete/libkopete/tests/kopetecontactlist_test.h | 2 +- kopete/libkopete/tests/kopeteemoticontest.cpp | 4 +-- kopete/libkopete/tests/kopeteemoticontest.h | 2 +- kopete/libkopete/tests/kopetemessage_test.cpp | 4 +-- kopete/libkopete/tests/kopetemessage_test.h | 2 +- kopete/libkopete/tests/kopetepropertiestest.cpp | 4 +-- kopete/libkopete/tests/kopetepropertiestest.h | 2 +- .../libkopete/tests/kopetewallettest_program.cpp | 2 +- kopete/libkopete/tests/template_test.cpp | 4 +-- kopete/libkopete/tests/template_test.h | 2 +- 14 files changed, 36 insertions(+), 36 deletions(-) (limited to 'kopete/libkopete/tests') diff --git a/kopete/libkopete/tests/Makefile.am b/kopete/libkopete/tests/Makefile.am index 417ce2a8..3bb06d3d 100644 --- a/kopete/libkopete/tests/Makefile.am +++ b/kopete/libkopete/tests/Makefile.am @@ -3,22 +3,22 @@ AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_ASCII_CAST -DQT_NO_COMPAT \ $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private -I$(top_srcdir)/kopete/libkopete/private -I$(top_srcdir)/kopete/libkopete/tests/mock $(all_includes) -DSRCDIR=\"$(top_srcdir)/kopete/libkopete/tests\" METASOURCES = AUTO -check_LTLIBRARIES = kunittest_kopetemessage_test.la kunittest_kopetepropertiestest.la kunittest_kopetecontactlist_test.la -noinst_LTLIBRARIES = kunittest_kopeteemoticontest.la +check_LTLIBRARIES = tdeunittest_kopetemessage_test.la tdeunittest_kopetepropertiestest.la tdeunittest_kopetecontactlist_test.la +noinst_LTLIBRARIES = tdeunittest_kopeteemoticontest.la check_PROGRAMS = kopetewallettest_program kopetepasswordtest_program -kunittest_kopetepropertiestest_la_SOURCES = kopetepropertiestest.cpp ../kopeteproperties.cpp -kunittest_kopetepropertiestest_la_LIBADD = -lkunittest ../libkopete.la -kunittest_kopetepropertiestest_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kopetepropertiestest_la_SOURCES = kopetepropertiestest.cpp ../kopeteproperties.cpp +tdeunittest_kopetepropertiestest_la_LIBADD = -ltdeunittest ../libkopete.la +tdeunittest_kopetepropertiestest_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -kunittest_kopeteemoticontest_la_SOURCES = kopeteemoticontest.cpp -kunittest_kopeteemoticontest_la_LIBADD = -lkunittest ../libkopete.la -kunittest_kopeteemoticontest_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kopeteemoticontest_la_SOURCES = kopeteemoticontest.cpp +tdeunittest_kopeteemoticontest_la_LIBADD = -ltdeunittest ../libkopete.la +tdeunittest_kopeteemoticontest_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -kunittest_kopetemessage_test_la_SOURCES = kopetemessage_test.cpp -kunittest_kopetemessage_test_la_LIBADD = -lkunittest mock/libkopete_mock.la -kunittest_kopetemessage_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kopetemessage_test_la_SOURCES = kopetemessage_test.cpp +tdeunittest_kopetemessage_test_la_LIBADD = -ltdeunittest mock/libkopete_mock.la +tdeunittest_kopetemessage_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) kopetewallettest_program_SOURCES = kopetewallettest_program.cpp kopetewallettest_program_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH) @@ -28,14 +28,14 @@ kopetepasswordtest_program_SOURCES = kopetepasswordtest_program.cpp kopetepasswordtest_program_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH) kopetepasswordtest_program_LDADD = ../libkopete.la -kunittest_kopetecontactlist_test_la_SOURCES = kopetecontactlist_test.cpp -kunittest_kopetecontactlist_test_la_LIBADD = -lkunittest mock/libkopete_mock.la -kunittest_kopetecontactlist_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kopetecontactlist_test_la_SOURCES = kopetecontactlist_test.cpp +tdeunittest_kopetecontactlist_test_la_LIBADD = -ltdeunittest mock/libkopete_mock.la +tdeunittest_kopetecontactlist_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) noinst_HEADERS = kopetepropertiestest.h kopeteemoticontest.h check-local: - kunittestmodrunner + tdeunittestmodrunner guicheck: - kunittestmod $(PWD) + tdeunittestmod $(PWD) diff --git a/kopete/libkopete/tests/README b/kopete/libkopete/tests/README index ead9fbdc..c8ee619b 100644 --- a/kopete/libkopete/tests/README +++ b/kopete/libkopete/tests/README @@ -42,6 +42,6 @@ Add a new test quickly: Creating test for class Kopete::ContactList kopetecontactlist_test.h and kopetecontactlist_test.cpp writen. Please add the following to Makefile.am: - kunittest_kopetecontactlist_test_la_SOURCES = kopetecontactlist_test.cpp - kunittest_kopetecontactlist_test_la_LIBADD = -lkunittest ../mock/libkopete_mock.la - kunittest_kopetecontactlist_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) + tdeunittest_kopetecontactlist_test_la_SOURCES = kopetecontactlist_test.cpp + tdeunittest_kopetecontactlist_test_la_LIBADD = -ltdeunittest ../mock/libkopete_mock.la + tdeunittest_kopetecontactlist_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) diff --git a/kopete/libkopete/tests/create_test.rb b/kopete/libkopete/tests/create_test.rb index 7951bf35..e29a3267 100755 --- a/kopete/libkopete/tests/create_test.rb +++ b/kopete/libkopete/tests/create_test.rb @@ -37,7 +37,7 @@ fileCpp.gsub!(/template/, className.downcase.gsub(/::/,"")) fileCpp.gsub!(/Template/, className.gsub(/::/,"")) fileCpp.gsub!(/some requirement/, className + " class.") -makefileAm = "kunittest_template_test_la_SOURCES = template_test.cpp\nkunittest_template_test_la_LIBADD = -lkunittest ../mock/libkopete_mock.la\nkunittest_template_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)\n" +makefileAm = "tdeunittest_template_test_la_SOURCES = template_test.cpp\ntdeunittest_template_test_la_LIBADD = -ltdeunittest ../mock/libkopete_mock.la\ntdeunittest_template_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)\n" makefileAm.gsub!(/template/, className.downcase.gsub(/::/,"")) hNew = hBase.gsub(/template/, className.downcase.gsub(/::/,"")) diff --git a/kopete/libkopete/tests/kopetecontactlist_test.cpp b/kopete/libkopete/tests/kopetecontactlist_test.cpp index 5e43126d..6fb0db26 100644 --- a/kopete/libkopete/tests/kopetecontactlist_test.cpp +++ b/kopete/libkopete/tests/kopetecontactlist_test.cpp @@ -18,12 +18,12 @@ #include #include #include -#include +#include #include "kopetecontactlist_test.h" using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kopetecontactlist_test, "KopeteSuite"); +KUNITTEST_MODULE( tdeunittest_kopetecontactlist_test, "KopeteSuite"); KUNITTEST_MODULE_REGISTER_TESTER( KopeteContactList_Test ); void KopeteContactList_Test::allTests() diff --git a/kopete/libkopete/tests/kopetecontactlist_test.h b/kopete/libkopete/tests/kopetecontactlist_test.h index faab1e48..cd246b60 100644 --- a/kopete/libkopete/tests/kopetecontactlist_test.h +++ b/kopete/libkopete/tests/kopetecontactlist_test.h @@ -18,7 +18,7 @@ #ifndef KOPETECONTACTLIST_TEST_H #define KOPETECONTACTLIST_TEST_H -#include +#include // change to SlotTester when it works class KopeteContactList_Test : public KUnitTest::Tester diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp index 83c0e64c..fe1f8a35 100644 --- a/kopete/libkopete/tests/kopeteemoticontest.cpp +++ b/kopete/libkopete/tests/kopeteemoticontest.cpp @@ -27,14 +27,14 @@ #include #include -#include +#include #include "kopeteemoticontest.h" #include "kopetemessage.h" #include "kopeteemoticons.h" using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kopeteemoticontest, "KopeteSuite"); +KUNITTEST_MODULE( tdeunittest_kopeteemoticontest, "KopeteSuite"); KUNITTEST_MODULE_REGISTER_TESTER( KopeteEmoticonTest ); /* diff --git a/kopete/libkopete/tests/kopeteemoticontest.h b/kopete/libkopete/tests/kopeteemoticontest.h index a885b2c4..cfc6e2f0 100644 --- a/kopete/libkopete/tests/kopeteemoticontest.h +++ b/kopete/libkopete/tests/kopeteemoticontest.h @@ -19,7 +19,7 @@ #ifndef KOPETE_EMOTICON_TEST_H #define KOPETE_EMOTICON_TEST_H -#include +#include // change to SlotTester when it works class KopeteEmoticonTest : public KUnitTest::Tester diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp index ff18f587..238bdb57 100644 --- a/kopete/libkopete/tests/kopetemessage_test.cpp +++ b/kopete/libkopete/tests/kopetemessage_test.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include "kopetemessage_test.h" @@ -37,7 +37,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kopetemessage_test, "KopeteSuite"); +KUNITTEST_MODULE( tdeunittest_kopetemessage_test, "KopeteSuite"); KUNITTEST_MODULE_REGISTER_TESTER( KopeteMessage_Test ); /* diff --git a/kopete/libkopete/tests/kopetemessage_test.h b/kopete/libkopete/tests/kopetemessage_test.h index 52d09fb8..a42a2d6b 100644 --- a/kopete/libkopete/tests/kopetemessage_test.h +++ b/kopete/libkopete/tests/kopetemessage_test.h @@ -19,7 +19,7 @@ #ifndef KOPETEMESSAGE_TEST_H #define KOPETEMESSAGE_TEST_H -#include +#include #define private public #include "kopetemessage.h" diff --git a/kopete/libkopete/tests/kopetepropertiestest.cpp b/kopete/libkopete/tests/kopetepropertiestest.cpp index 76b8ae79..e9405c66 100644 --- a/kopete/libkopete/tests/kopetepropertiestest.cpp +++ b/kopete/libkopete/tests/kopetepropertiestest.cpp @@ -16,7 +16,7 @@ ************************************************************************* */ -#include +#include #include "kopeteproperties.h" @@ -32,7 +32,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kopetepropertiestest, "KopeteSuite"); +KUNITTEST_MODULE( tdeunittest_kopetepropertiestest, "KopeteSuite"); KUNITTEST_MODULE_REGISTER_TESTER( KopetePropertiesTest ); using namespace Kopete::Properties; diff --git a/kopete/libkopete/tests/kopetepropertiestest.h b/kopete/libkopete/tests/kopetepropertiestest.h index c997dd80..be4a8b27 100644 --- a/kopete/libkopete/tests/kopetepropertiestest.h +++ b/kopete/libkopete/tests/kopetepropertiestest.h @@ -19,7 +19,7 @@ #ifndef KOPETE_PROPERTIES_TEST_H #define KOPETE_PROPERTIES_TEST_H -#include +#include // change to SlotTester when it works class KopetePropertiesTest : public KUnitTest::Tester diff --git a/kopete/libkopete/tests/kopetewallettest_program.cpp b/kopete/libkopete/tests/kopetewallettest_program.cpp index 63467d34..74380115 100644 --- a/kopete/libkopete/tests/kopetewallettest_program.cpp +++ b/kopete/libkopete/tests/kopetewallettest_program.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "kopetewalletmanager.h" #include "kopetewallettest_program.h" diff --git a/kopete/libkopete/tests/template_test.cpp b/kopete/libkopete/tests/template_test.cpp index 8598f79f..919d25e0 100644 --- a/kopete/libkopete/tests/template_test.cpp +++ b/kopete/libkopete/tests/template_test.cpp @@ -15,12 +15,12 @@ ************************************************************************* */ -#include +#include #include "template_test.h" using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_template_test, "KopeteSuite"); +KUNITTEST_MODULE( tdeunittest_template_test, "KopeteSuite"); KUNITTEST_MODULE_REGISTER_TESTER( Template_Test ); void Template_Test::allTests() diff --git a/kopete/libkopete/tests/template_test.h b/kopete/libkopete/tests/template_test.h index 4d0f1617..28c73ea3 100644 --- a/kopete/libkopete/tests/template_test.h +++ b/kopete/libkopete/tests/template_test.h @@ -18,7 +18,7 @@ #ifndef TEMPLATE_TEST_H #define TEMPLATE_TEST_H -#include +#include // change to SlotTester when it works class Template_Test : public KUnitTest::Tester -- cgit v1.2.1