From 5cc26ceed345bb95cb1defab204b631cb79319de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 20:03:01 +0200 Subject: Additional k => tde renaming and fixes --- tdeunittest/Makefile.am | 6 +++--- tdeunittest/dcopinterface.h | 4 ++-- tdeunittest/example/module/samplemodule.cpp | 8 ++++---- tdeunittest/example/module/samplemodule2.cpp | 6 +++--- tdeunittest/example/simple/Makefile.am | 4 ++-- tdeunittest/example/simple/sampletest.cpp | 6 +++--- tdeunittest/runnergui.h | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) (limited to 'tdeunittest') diff --git a/tdeunittest/Makefile.am b/tdeunittest/Makefile.am index 5393f517..28cfbcf6 100644 --- a/tdeunittest/Makefile.am +++ b/tdeunittest/Makefile.am @@ -4,15 +4,15 @@ METASOURCES = AUTO lib_LTLIBRARIES = libtdeunittestgui.la libtdeunittestgui_la_SOURCES = testerwidget.ui runnergui.cpp dcopinterface.skel -libtdeunittestgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdeunittest +libtdeunittestgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeunittest libtdeunittestgui_la_LIBADD = -ltdeunittest $(LIB_TDECORE) runnergui.lo : testerwidget.h bin_PROGRAMS = tdeunittestguimodrunner tdeunittestguimodrunner_SOURCES = guimodrunner.cpp -tdeunittestguimodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdeunittest -tdeunittestguimodrunner_LDADD = libtdeunittestgui.la $(LIB_TDECORE) $(LIB_KIO) +tdeunittestguimodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeunittest +tdeunittestguimodrunner_LDADD = libtdeunittestgui.la $(LIB_TDECORE) $(LIB_TDEIO) noinst_HEADERS = dcopinterface.h libtdeunittestinclude_HEADERS = runnergui.h diff --git a/tdeunittest/dcopinterface.h b/tdeunittest/dcopinterface.h index 50f15d3d..034c15c1 100644 --- a/tdeunittest/dcopinterface.h +++ b/tdeunittest/dcopinterface.h @@ -17,8 +17,8 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef KUNITTEST_DCOPINTERFACE_H -#define KUNITTEST_DCOPINTERFACE_H +#ifndef TDEUNITTEST_DCOPINTERFACE_H +#define TDEUNITTEST_DCOPINTERFACE_H #include #include diff --git a/tdeunittest/example/module/samplemodule.cpp b/tdeunittest/example/module/samplemodule.cpp index 4ffadb6c..b100df08 100644 --- a/tdeunittest/example/module/samplemodule.cpp +++ b/tdeunittest/example/module/samplemodule.cpp @@ -31,7 +31,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE( tdeunittest_samplemodule, "Suite1" ) -KUNITTEST_MODULE_REGISTER_TESTER( SlotSampleTester ) -KUNITTEST_MODULE_REGISTER_TESTER( SomeSampleTester ) -KUNITTEST_MODULE_REGISTER_TESTER( SomeExtraTester ) +TDEUNITTEST_MODULE( tdeunittest_samplemodule, "Suite1" ) +TDEUNITTEST_MODULE_REGISTER_TESTER( SlotSampleTester ) +TDEUNITTEST_MODULE_REGISTER_TESTER( SomeSampleTester ) +TDEUNITTEST_MODULE_REGISTER_TESTER( SomeExtraTester ) diff --git a/tdeunittest/example/module/samplemodule2.cpp b/tdeunittest/example/module/samplemodule2.cpp index 1e08f102..fcb00fc6 100644 --- a/tdeunittest/example/module/samplemodule2.cpp +++ b/tdeunittest/example/module/samplemodule2.cpp @@ -33,9 +33,9 @@ using namespace KUnitTest; -KUNITTEST_MODULE( tdeunittest_samplemodule2, "Suite2::Sub" ) -KUNITTEST_MODULE_REGISTER_TESTER( SimpleSampleTester ) -KUNITTEST_MODULE_REGISTER_TESTER( SomeSampleTester ) +TDEUNITTEST_MODULE( tdeunittest_samplemodule2, "Suite2::Sub" ) +TDEUNITTEST_MODULE_REGISTER_TESTER( SimpleSampleTester ) +TDEUNITTEST_MODULE_REGISTER_TESTER( SomeSampleTester ) void SimpleSampleTester::allTests() { diff --git a/tdeunittest/example/simple/Makefile.am b/tdeunittest/example/simple/Makefile.am index 0ee63452..162741eb 100644 --- a/tdeunittest/example/simple/Makefile.am +++ b/tdeunittest/example/simple/Makefile.am @@ -4,11 +4,11 @@ METASOURCES = AUTO check_PROGRAMS = sampletests sampletestsgui sampletests_SOURCES = main.cpp sampletest.cpp -sampletests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +sampletests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor sampletests_LDADD = -ltdeunittest sampletestsgui_SOURCES = maingui.cpp sampletest.cpp -sampletestsgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +sampletestsgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # Normally you would write -ltdeunittestgui here, but since the examples # are bundled with the library source code itself we don't want to # have you install the libraries before you can compile the examples. diff --git a/tdeunittest/example/simple/sampletest.cpp b/tdeunittest/example/simple/sampletest.cpp index 04be74de..30bdbfd9 100644 --- a/tdeunittest/example/simple/sampletest.cpp +++ b/tdeunittest/example/simple/sampletest.cpp @@ -32,9 +32,9 @@ using namespace KUnitTest; -KUNITTEST_SUITE("SampleSuite"); -KUNITTEST_REGISTER_TESTER(SimpleSampleTester); -KUNITTEST_REGISTER_TESTER(SomeSampleTester); +TDEUNITTEST_SUITE("SampleSuite"); +TDEUNITTEST_REGISTER_TESTER(SimpleSampleTester); +TDEUNITTEST_REGISTER_TESTER(SomeSampleTester); void SimpleSampleTester::allTests() { diff --git a/tdeunittest/runnergui.h b/tdeunittest/runnergui.h index 73d8863c..1c7d85a9 100644 --- a/tdeunittest/runnergui.h +++ b/tdeunittest/runnergui.h @@ -23,8 +23,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _KUNITTEST_TESTER_H_ -#define _KUNITTEST_TESTER_H_ +#ifndef _TDEUNITTEST_TESTER_H_ +#define _TDEUNITTEST_TESTER_H_ #include #include -- cgit v1.2.1