From 7422cac1a18dca897d3830a267eb91683d05a95b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Jan 2013 13:10:41 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 chalk/colorspaces/rgb_f16half/Makefile.am                    |  4 ++--
 chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h           |  2 +-
 chalk/colorspaces/rgb_f16half/tests/Makefile.am              | 12 ++++++------
 .../rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc   |  6 +++---
 .../rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.h    |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'chalk/colorspaces/rgb_f16half')

diff --git a/chalk/colorspaces/rgb_f16half/Makefile.am b/chalk/colorspaces/rgb_f16half/Makefile.am
index 2419bb8c..f93fbcbb 100644
--- a/chalk/colorspaces/rgb_f16half/Makefile.am
+++ b/chalk/colorspaces/rgb_f16half/Makefile.am
@@ -22,12 +22,12 @@ kde_module_LTLIBRARIES = chalk_rgb_f16half_plugin.la
 chalk_rgb_f16half_plugin_la_SOURCES = rgb_f16half_plugin.cc
 noinst_HEADERS = rgb_f16half_plugin.h kis_rgb_f16half_colorspace.h
 
-chalk_rgb_f16half_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms
+chalk_rgb_f16half_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms
 chalk_rgb_f16half_plugin_la_LIBADD = libchalk_rgb_f16half.la ../../chalkcolor/libchalkcolor.la
 
 chalk_rgb_f16half_plugin_la_METASOURCES = AUTO
 
-if include_kunittest_tests
+if include_tdeunittest_tests
 TESTSDIR = tests
 endif
 
diff --git a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h
index 1c7818f0..699ba810 100644
--- a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h
+++ b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h
@@ -20,7 +20,7 @@
 #ifndef RGB_F16HALF_PLUGIN_H_
 #define RGB_F16HALF_PLUGIN_H_
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 /**
  * A plugin wrapper around the RGB F16Half colour space strategy.
diff --git a/chalk/colorspaces/rgb_f16half/tests/Makefile.am b/chalk/colorspaces/rgb_f16half/tests/Makefile.am
index 284359ee..cdb3f06c 100644
--- a/chalk/colorspaces/rgb_f16half/tests/Makefile.am
+++ b/chalk/colorspaces/rgb_f16half/tests/Makefile.am
@@ -8,12 +8,12 @@ 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_rgb_f16half_colorspace_tester.la
+check_LTLIBRARIES = tdeunittest_kis_rgb_f16half_colorspace_tester.la
 
-kunittest_kis_rgb_f16half_colorspace_tester_la_SOURCES = kis_rgb_f16half_colorspace_tester.cc
-kunittest_kis_rgb_f16half_colorspace_tester_la_LIBADD = -lkunittest ../libchalk_rgb_f16half.la
-kunittest_kis_rgb_f16half_colorspace_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+tdeunittest_kis_rgb_f16half_colorspace_tester_la_SOURCES = kis_rgb_f16half_colorspace_tester.cc
+tdeunittest_kis_rgb_f16half_colorspace_tester_la_LIBADD = -ltdeunittest ../libchalk_rgb_f16half.la
+tdeunittest_kis_rgb_f16half_colorspace_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
-check-local: kunittest_kis_rgb_f16half_colorspace_tester.la
-	kunittestmodrunner
+check-local: tdeunittest_kis_rgb_f16half_colorspace_tester.la
+	tdeunittestmodrunner
 
diff --git a/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc b/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc
index f5e39f84..4fc4d847 100644
--- a/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc
+++ b/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc
@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <kunittest/runner.h>
-#include <kunittest/module.h>
+#include <tdeunittest/runner.h>
+#include <tdeunittest/module.h>
 
 #include "kis_factory.h"
 #include "kis_rgb_f16half_colorspace.h"
@@ -29,7 +29,7 @@
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( kunittest_kis_rgb_f16half_colorspace_tester, "RGBA 16-bit float half colorspace tester" );
+KUNITTEST_MODULE( tdeunittest_kis_rgb_f16half_colorspace_tester, "RGBA 16-bit float half colorspace tester" );
 KUNITTEST_MODULE_REGISTER_TESTER( KisRgbF16HalfColorSpaceTester );
 
 #define PIXEL_BLUE 0
diff --git a/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.h b/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.h
index 6547e35b..fcae06d0 100644
--- a/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.h
+++ b/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.h
@@ -21,7 +21,7 @@
 #ifndef KIS_RGB_F16HALF_COLORSPACE_TESTER_H
 #define KIS_RGB_F16HALF_COLORSPACE_TESTER_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 #define CHECK_TOLERANCE( x, y, tolerance ) \
 if ((x) <= (y) + (tolerance) && (x) >= (y) - (tolerance)) \
-- 
cgit v1.2.1