TDE
/
koffice
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/koffice
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a number of libraries and executables to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent 3fe437def8
commit 7422cac1a1
441 changed files with 788 additions and 788 deletions
Show Stats Download Patch File Download Diff File

4
Doxyfile.temp
Unescape View File

@ -66,8 +66,8 @@ INPUT = example \
FILE_PATTERNS = *.h
RECURSIVE = YES
#EXCLUDE = \
#arts/tests tdeprint/tests khtml/java/tests kio/kfile/tests kioslave/http/kcookiejar/tests kwallet/backend/tests \
#tdecore/tests tdeui/tests kinit/tests kio/tests kparts/tests libkmid/tests
#arts/tests tdeprint/tests tdehtml/java/tests kio/kfile/tests kioslave/http/kcookiejar/tests tdewallet/backend/tests \
#tdecore/tests tdeui/tests kinit/tests kio/tests tdeparts/tests libtdemid/tests
# */tests doesn't seem to work :(
# If the value of the INPUT tag contains directories, you can use the

26
acinclude.m4
Unescape View File

@ -2066,16 +2066,16 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils")
AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest")
AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
@ -2083,13 +2083,13 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
@ -2535,7 +2535,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml)
dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still
dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3477,7 +3477,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN)

2
chalk/chalkcolor/Makefile.am
Unescape View File

@ -32,7 +32,7 @@ include_HEADERS = \
kis_colorspace_factory_registry.h kis_abstract_colorspace.h
if include_kunittest_tests
if include_tdeunittest_tests
TESTSDIR = tests
endif

4
chalk/chalkcolor/kis_colorspace_factory_registry.cc
Unescape View File

@ -18,10 +18,10 @@
*/
#include "kdebug.h"
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
#include <kservice.h>
#include <ktrader.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <kmessagebox.h>
#include <klocale.h>
#include "kis_debug_areas.h"

12
chalk/chalkcolor/tests/Makefile.am
Unescape View File

@ -5,12 +5,12 @@ AM_CPPFLAGS = \
# The check_ target makes sure we don't install the modules,
# $(KDE_CHECK_PLUGIN) assures a shared library is created.
check_LTLIBRARIES = kunittest_kis_color_conversions_tester.la
check_LTLIBRARIES = tdeunittest_kis_color_conversions_tester.la
kunittest_kis_color_conversions_tester_la_SOURCES = kis_color_conversions_tester.cpp
kunittest_kis_color_conversions_tester_la_LIBADD = -lkunittest ../libchalkcolor.la ../../libchalkcommon.la
kunittest_kis_color_conversions_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
tdeunittest_kis_color_conversions_tester_la_SOURCES = kis_color_conversions_tester.cpp
tdeunittest_kis_color_conversions_tester_la_LIBADD = -ltdeunittest ../libchalkcolor.la ../../libchalkcommon.la
tdeunittest_kis_color_conversions_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
check-local: kunittest_kis_color_conversions_tester.la
kunittestmodrunner
check-local: tdeunittest_kis_color_conversions_tester.la
tdeunittestmodrunner

6
chalk/chalkcolor/tests/kis_color_conversions_tester.cpp
Unescape View File

@ -16,15 +16,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <kunittest/runner.h>
#include <kunittest/module.h>
#include <tdeunittest/runner.h>
#include <tdeunittest/module.h>
#include "kis_color_conversions_tester.h"
#include "kis_color_conversions.h"
using namespace KUnitTest;
KUNITTEST_MODULE(kunittest_kis_color_conversions_tester, "Color Conversions Tester");
KUNITTEST_MODULE(tdeunittest_kis_color_conversions_tester, "Color Conversions Tester");
KUNITTEST_MODULE_REGISTER_TESTER(KisColorConversionsTester);
void KisColorConversionsTester::allTests()

2
chalk/chalkcolor/tests/kis_color_conversions_tester.h
Unescape View File

@ -19,7 +19,7 @@
#ifndef KIS_COLOR_CONVERSIONS_TESTER_H
#define KIS_COLOR_CONVERSIONS_TESTER_H
#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
#define CHECK_TOLERANCE( x, y, tolerance ) \
if ((x) <= (y) + (tolerance) && (x) >= (y) - (tolerance)) \

2
chalk/colorspaces/cmyk_u16/Makefile.am
Unescape View File

@ -18,7 +18,7 @@ kde_module_LTLIBRARIES = chalk_cmyk_u16_plugin.la
chalk_cmyk_u16_plugin_la_SOURCES = cmyk_u16_plugin.cc
noinst_HEADERS = cmyk_u16_plugin.h kis_cmyk_u16_colorspace.h
chalk_cmyk_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms
chalk_cmyk_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms
chalk_cmyk_u16_plugin_la_LIBADD = libchalk_cmyk_u16.la ../../chalkcolor/libchalkcolor.la
chalk_cmyk_u16_plugin_la_METASOURCES = AUTO

2
chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h
Unescape View File

@ -19,7 +19,7 @@
#ifndef CMYK_U16_PLUGIN_H_
#define CMYK_U16_PLUGIN_H_
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
/**
* A plugin wrapper around the CMYK U16 colour space strategy.

2
chalk/colorspaces/cmyk_u8/Makefile.am
Unescape View File

@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = chalkcmykplugin.la
chalkcmykplugin_la_SOURCES = cmyk_plugin.cc kis_cmyk_colorspace.cc
noinst_HEADERS = cmyk_plugin.h kis_cmyk_colorspace.h
chalkcmykplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms
chalkcmykplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms
chalkcmykplugin_la_LIBADD = ../../chalkcolor/libchalkcolor.la
chalkcmykplugin_la_METASOURCES = AUTO

2
chalk/colorspaces/cmyk_u8/cmyk_plugin.h
Unescape View File

@ -19,7 +19,7 @@
#ifndef CMYK_PLUGIN_H_
#define CMYK_PLUGIN_H_
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
/**
* A plugin wrapper around the CMYK colour space strategy.

2
chalk/colorspaces/gray_u16/Makefile.am
Unescape View File

@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = chalk_gray_u16_plugin.la
chalk_gray_u16_plugin_la_SOURCES = gray_u16_plugin.cc
noinst_HEADERS = gray_u16_plugin.h kis_gray_u16_colorspace.h
chalk_gray_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms
chalk_gray_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms
chalk_gray_u16_plugin_la_LIBADD = libchalk_gray_u16.la ../../chalkcolor/libchalkcolor.la
chalk_gray_u16_plugin_la_METASOURCES = AUTO

2
chalk/colorspaces/gray_u16/gray_u16_plugin.h
Unescape View File

@ -19,7 +19,7 @@
#ifndef GRAY_U16_PLUGIN_H_
#define GRAY_U16_PLUGIN_H_
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
/**
* A plugin wrapper around the GRAY U16 colour space strategy.

4
chalk/colorspaces/gray_u8/Makefile.am
Unescape View File

@ -18,12 +18,12 @@ kde_module_LTLIBRARIES = chalkgrayplugin.la
chalkgrayplugin_la_SOURCES = gray_plugin.cc
noinst_HEADERS = gray_plugin.h kis_gray_colorspace.h
chalkgrayplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms
chalkgrayplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms
chalkgrayplugin_la_LIBADD = libchalkgrayscale.la ../../chalkcolor/libchalkcolor.la
chalkgrayplugin_la_METASOURCES = AUTO
if include_kunittest_tests
if include_tdeunittest_tests
TESTSDIR = tests
endif

2
chalk/colorspaces/gray_u8/gray_plugin.h
Unescape View File

@ -19,7 +19,7 @@
#ifndef GRAY_PLUGIN_H_
#define GRAY_PLUGIN_H_
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
/**
* A plugin wrapper around the GRAY colour space strategy.

12
chalk/colorspaces/gray_u8/tests/Makefile.am
Unescape View File

@ -6,12 +6,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_strategy_colorspace_grayscale_tester.la
check_LTLIBRARIES = tdeunittest_kis_strategy_colorspace_grayscale_tester.la
kunittest_kis_strategy_colorspace_grayscale_tester_la_SOURCES = kis_strategy_colorspace_grayscale_tester.cpp
kunittest_kis_strategy_colorspace_grayscale_tester_la_LIBADD = -lkunittest ../libchalkgrayscale.la
kunittest_kis_strategy_colorspace_grayscale_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
tdeunittest_kis_strategy_colorspace_grayscale_tester_la_SOURCES = kis_strategy_colorspace_grayscale_tester.cpp
tdeunittest_kis_strategy_colorspace_grayscale_tester_la_LIBADD = -ltdeunittest ../libchalkgrayscale.la
tdeunittest_kis_strategy_colorspace_grayscale_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
check-local: kunittest_kis_strategy_colorspace_grayscale_tester.la
kunittestmodrunner
check-local: tdeunittest_kis_strategy_colorspace_grayscale_tester.la
tdeunittestmodrunner

6
chalk/colorspaces/gray_u8/tests/kis_strategy_colorspace_grayscale_tester.cpp
Unescape View File

@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, 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_strategy_colorspace_grayscale_tester.h"
@ -25,7 +25,7 @@
using namespace KUnitTest;
KUNITTEST_MODULE( kunittest_kis_strategy_colorspace_grayscale_tester, "Greyscale ColorSpace Tester" );
KUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_grayscale_tester, "Greyscale ColorSpace Tester" );
KUNITTEST_MODULE_REGISTER_TESTER( KisGrayColorSpaceTester );
void KisGrayColorSpaceTester::allTests()

2
chalk/colorspaces/gray_u8/tests/kis_strategy_colorspace_grayscale_tester.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef KIS_STRATEGY_COLORSPACE_GRAYSCALE_TESTER_H
#define KIS_STRATEGY_COLORSPACE_GRAYSCALE_TESTER_H
#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
class KisGrayColorSpaceTester : public KUnitTest::Tester
{

2
chalk/colorspaces/lms_f32/Makefile.am
Unescape View File

@ -21,7 +21,7 @@ kde_module_LTLIBRARIES = chalk_lms_f32_plugin.la
chalk_lms_f32_plugin_la_SOURCES = lms_f32_plugin.cc
noinst_HEADERS = lms_f32_plugin.h kis_lms_f32_colorspace.h
chalk_lms_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms
chalk_lms_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms
chalk_lms_f32_plugin_la_LIBADD = libchalk_lms_f32.la ../../chalkcolor/libchalkcolor.la
chalk_lms_f32_plugin_la_METASOURCES = AUTO

2
chalk/colorspaces/lms_f32/lms_f32_plugin.h
Unescape View File

@ -21,7 +21,7 @@
#ifndef LMS_F32_PLUGIN_H_
#define LMS_F32_PLUGIN_H_
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
/**
* A plugin wrapper around the LMS F32 colour space strategy.

4
chalk/colorspaces/rgb_f16half/Makefile.am
Unescape View File

@ -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

2
chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h
Unescape View File

@ -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.

12
chalk/colorspaces/rgb_f16half/tests/Makefile.am
Unescape View File

@ -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

6
chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc
Unescape View File

@ -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

2
chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.h
Unescape View File

@ -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)) \

4
chalk/colorspaces/rgb_f32/Makefile.am
Unescape View File

@ -21,12 +21,12 @@ kde_module_LTLIBRARIES = chalk_rgb_f32_plugin.la
chalk_rgb_f32_plugin_la_SOURCES = rgb_f32_plugin.cc
noinst_HEADERS = rgb_f32_plugin.h kis_rgb_f32_colorspace.h
chalk_rgb_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms
chalk_rgb_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms
chalk_rgb_f32_plugin_la_LIBADD = libchalk_rgb_f32.la ../../chalkcolor/libchalkcolor.la
chalk_rgb_f32_plugin_la_METASOURCES = AUTO
if include_kunittest_tests
if include_tdeunittest_tests
TESTSDIR = tests
endif

2
chalk/colorspaces/rgb_f32/rgb_f32_plugin.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef RGB_F32_PLUGIN_H_
#define RGB_F32_PLUGIN_H_
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
/**
* A plugin wrapper around the RGB F32 colour space strategy.

12
chalk/colorspaces/rgb_f32/tests/Makefile.am
Unescape View File

@ -6,12 +6,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_strategy_colorspace_rgb_f32_tester.la
check_LTLIBRARIES = tdeunittest_kis_strategy_colorspace_rgb_f32_tester.la
kunittest_kis_strategy_colorspace_rgb_f32_tester_la_SOURCES = kis_strategy_colorspace_rgb_f32_tester.cc
kunittest_kis_strategy_colorspace_rgb_f32_tester_la_LIBADD = -lkunittest ../libchalk_rgb_f32.la
kunittest_kis_strategy_colorspace_rgb_f32_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
tdeunittest_kis_strategy_colorspace_rgb_f32_tester_la_SOURCES = kis_strategy_colorspace_rgb_f32_tester.cc
tdeunittest_kis_strategy_colorspace_rgb_f32_tester_la_LIBADD = -ltdeunittest ../libchalk_rgb_f32.la
tdeunittest_kis_strategy_colorspace_rgb_f32_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
check-local: kunittest_kis_strategy_colorspace_rgb_f32_tester.la
kunittestmodrunner
check-local: tdeunittest_kis_strategy_colorspace_rgb_f32_tester.la
tdeunittestmodrunner

6
chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc
Unescape View File

@ -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_strategy_colorspace_rgb_f32_tester.h"
@ -28,7 +28,7 @@
using namespace KUnitTest;
KUNITTEST_MODULE( kunittest_kis_strategy_colorspace_rgb_f32_tester, "RGBA 32-bit float colorspace tester" );
KUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_f32_tester, "RGBA 32-bit float colorspace tester" );
KUNITTEST_MODULE_REGISTER_TESTER( KisRgbF32ColorSpaceTester );
#define PIXEL_BLUE 0

2
chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.h
Unescape View File

@ -21,7 +21,7 @@
#ifndef KIS_STRATEGY_COLORSPACE_RGB_F32_TESTER_H
#define KIS_STRATEGY_COLORSPACE_RGB_F32_TESTER_H
#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
#define CHECK_TOLERANCE( x, y, tolerance ) \
if ((x) <= (y) + (tolerance) && (x) >= (y) - (tolerance)) \

4
chalk/colorspaces/rgb_u16/Makefile.am
Unescape View File

@ -19,12 +19,12 @@ kde_module_LTLIBRARIES = chalk_rgb_u16_plugin.la
chalk_rgb_u16_plugin_la_SOURCES = rgb_u16_plugin.cc
noinst_HEADERS = rgb_u16_plugin.h kis_rgb_u16_colorspace.h
chalk_rgb_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms
chalk_rgb_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms
chalk_rgb_u16_plugin_la_LIBADD = libchalk_rgb_u16.la ../../chalkcolor/libchalkcolor.la
chalk_rgb_u16_plugin_la_METASOURCES = AUTO
if include_kunittest_tests
if include_tdeunittest_tests
TESTSDIR = tests
endif

2
chalk/colorspaces/rgb_u16/rgb_u16_plugin.h
Unescape View File

@ -19,7 +19,7 @@
#ifndef RGB_U16_PLUGIN_H_
#define RGB_U16_PLUGIN_H_
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
/**
* A plugin wrapper around the RGB U16 colour space strategy.

12
chalk/colorspaces/rgb_u16/tests/Makefile.am
Unescape View File

@ -6,12 +6,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_strategy_colorspace_rgb_u16_tester.la
check_LTLIBRARIES = tdeunittest_kis_strategy_colorspace_rgb_u16_tester.la
kunittest_kis_strategy_colorspace_rgb_u16_tester_la_SOURCES = kis_strategy_colorspace_rgb_u16_tester.cc
kunittest_kis_strategy_colorspace_rgb_u16_tester_la_LIBADD = -lkunittest ../libchalk_rgb_u16.la
kunittest_kis_strategy_colorspace_rgb_u16_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
tdeunittest_kis_strategy_colorspace_rgb_u16_tester_la_SOURCES = kis_strategy_colorspace_rgb_u16_tester.cc
tdeunittest_kis_strategy_colorspace_rgb_u16_tester_la_LIBADD = -ltdeunittest ../libchalk_rgb_u16.la
tdeunittest_kis_strategy_colorspace_rgb_u16_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
check-local: kunittest_kis_strategy_colorspace_rgb_u16_tester.la
kunittestmodrunner
check-local: tdeunittest_kis_strategy_colorspace_rgb_u16_tester.la
tdeunittestmodrunner

6
chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc
Unescape View File

@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, 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_strategy_colorspace_rgb_u16_tester.h"
@ -27,7 +27,7 @@
using namespace KUnitTest;
KUNITTEST_MODULE( kunittest_kis_strategy_colorspace_rgb_u16_tester, "RGB 16-bit integer colorspace tester" );
KUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_u16_tester, "RGB 16-bit integer colorspace tester" );
KUNITTEST_MODULE_REGISTER_TESTER( KisRgbU16ColorSpaceTester );
#define PIXEL_BLUE 0

2
chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef KIS_STRATEGY_COLORSPACE_RGB_U16_TESTER_H
#define KIS_STRATEGY_COLORSPACE_RGB_U16_TESTER_H
#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
#define CHECK_TOLERANCE( x, y, tolerance ) \
if ((x) <= (y) + (tolerance) && (x) >= (y) - (tolerance)) \

4
chalk/colorspaces/rgb_u8/Makefile.am
Unescape View File

@ -19,13 +19,13 @@ kde_module_LTLIBRARIES = chalkrgbplugin.la
chalkrgbplugin_la_SOURCES = rgb_plugin.cc
noinst_HEADERS = rgb_plugin.h kis_rgb_colorspace.h
chalkrgbplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms
chalkrgbplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms
chalkrgbplugin_la_LIBADD = libchalkrgb.la ../../chalkcolor/libchalkcolor.la
chalkrgbplugin_la_METASOURCES = AUTO
#METASOURCES = AUTO # XXX: which of the two?
if include_kunittest_tests
if include_tdeunittest_tests
TESTSDIR = tests
endif

2
chalk/colorspaces/rgb_u8/rgb_plugin.h
Unescape View File

@ -19,7 +19,7 @@
#ifndef RGB_PLUGIN_H_
#define RGB_PLUGIN_H_
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
/**
* A plugin wrapper around the RGB colour space strategy.

12
chalk/colorspaces/rgb_u8/tests/Makefile.am
Unescape View File

@ -6,12 +6,12 @@ AM_CPPFLAGS = -I$(srcdir)/../../../sdk \
# The check_ target makes sure we don't install the modules,
# $(KDE_CHECK_PLUGIN) assures a shared library is created.
check_LTLIBRARIES = kunittest_kis_strategy_colorspace_rgb_tester.la
check_LTLIBRARIES = tdeunittest_kis_strategy_colorspace_rgb_tester.la
kunittest_kis_strategy_colorspace_rgb_tester_la_SOURCES = kis_strategy_colorspace_rgb_tester.cpp
kunittest_kis_strategy_colorspace_rgb_tester_la_LIBADD = -lkunittest ../libchalkrgb.la
kunittest_kis_strategy_colorspace_rgb_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
tdeunittest_kis_strategy_colorspace_rgb_tester_la_SOURCES = kis_strategy_colorspace_rgb_tester.cpp
tdeunittest_kis_strategy_colorspace_rgb_tester_la_LIBADD = -ltdeunittest ../libchalkrgb.la
tdeunittest_kis_strategy_colorspace_rgb_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
check-local: kunittest_kis_strategy_colorspace_rgb_tester.la
kunittestmodrunner
check-local: tdeunittest_kis_strategy_colorspace_rgb_tester.la
tdeunittestmodrunner

6
chalk/colorspaces/rgb_u8/tests/kis_strategy_colorspace_rgb_tester.cpp
Unescape View File

@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, 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_strategy_colorspace_rgb_tester.h"
@ -25,7 +25,7 @@
using namespace KUnitTest;
KUNITTEST_MODULE( kunittest_kis_strategy_colorspace_rgb_tester, "RGB ColorSpace Tester" );
KUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_tester, "RGB ColorSpace Tester" );
KUNITTEST_MODULE_REGISTER_TESTER( KisRgbColorSpaceTester );
void KisRgbColorSpaceTester::allTests()

2
chalk/colorspaces/rgb_u8/tests/kis_strategy_colorspace_rgb_tester.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef KIS_STRATEGY_COLORSPACE_RGB_TESTER_H
#define KIS_STRATEGY_COLORSPACE_RGB_TESTER_H
#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
class KisRgbColorSpaceTester : public KUnitTest::Tester
{

2
chalk/colorspaces/wet/Makefile.am
Unescape View File

@ -20,7 +20,7 @@ kde_module_LTLIBRARIES = chalkwetplugin.la
chalkwetplugin_la_SOURCES = kis_wet_colorspace.cc wet_plugin.cc kis_wetop.cc kis_wet_palette_widget.cc kis_wetness_visualisation_filter.cc kis_texture_painter.cc kis_texture_filter.cc wetphysicsfilter.cc wdgpressure.ui
noinst_HEADERS = kis_wet_colorspace.h wet_plugin.h wetphysicsfilter.h kis_wetop.cc kis_wet_palette_widget.h kis_texture_painter.h kis_wetness_visualisation_filter.h kis_texture_filter.h wetphysicsfilter.h
chalkwetplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms
chalkwetplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms
chalkwetplugin_la_LIBADD = ../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \
../../../chalk/chalkcolor/libchalkcolor.la \
../../../chalk/core/libchalkimage.la \

2
chalk/colorspaces/wet/wet_plugin.h
Unescape View File

@ -19,7 +19,7 @@
#ifndef WET_PLUGIN_H_
#define WET_PLUGIN_H_
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
#include "kis_types.h"

2
chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.h
Unescape View File

@ -19,7 +19,7 @@
#ifndef WSBRUSH_PAINTOP_PLUGIN_H_
#define WSBRUSH_PAINTOP_PLUGIN_H_
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
#include "kis_types.h"

2
chalk/colorspaces/wetsticky/wet_sticky_plugin.h
Unescape View File

@ -19,7 +19,7 @@
#ifndef WET_STICKY_PLUGIN_H_
#define WET_STICKY_PLUGIN_H_
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
/**
* A plugin wrapper around the Wet & Sticky colour space strategy.

2
chalk/colorspaces/ycbcr_u16/Makefile.am
Unescape View File

@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = chalk_ycbcr_u16_plugin.la
chalk_ycbcr_u16_plugin_la_SOURCES = ycbcr_u16_plugin.cc
noinst_HEADERS = ycbcr_u16_plugin.h kis_ycbcr_u16_colorspace.h
chalk_ycbcr_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms
chalk_ycbcr_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms
chalk_ycbcr_u16_plugin_la_LIBADD = libchalk_ycbcr_u16.la ../../chalkcolor/libchalkcolor.la
METASOURCES = AUTO

2
chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h
Unescape View File

@ -19,7 +19,7 @@
#ifndef YCBCR_U16_PLUGIN_H_
#define YCBCR_U16_PLUGIN_H_
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
/**
* A plugin wrapper around the YCbCr U16 colour space strategy.

2
chalk/colorspaces/ycbcr_u8/Makefile.am
Unescape View File

@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = chalk_ycbcr_u8_plugin.la
chalk_ycbcr_u8_plugin_la_SOURCES = ycbcr_u8_plugin.cc
noinst_HEADERS = ycbcr_u8_plugin.h kis_ycbcr_u8_colorspace.h
chalk_ycbcr_u8_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms
chalk_ycbcr_u8_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts -llcms
chalk_ycbcr_u8_plugin_la_LIBADD = libchalk_ycbcr_u8.la ../../chalkcolor/libchalkcolor.la
METASOURCES = AUTO

2
chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h
Unescape View File

@ -19,7 +19,7 @@
#ifndef YCBCR_U8_PLUGIN_H_
#define YCBCR_U8_PLUGIN_H_
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
/**
* A plugin wrapper around the YCbCr U8 colour space strategy.

10
chalk/configure.in.in
Unescape View File

@ -91,12 +91,12 @@ else
AC_MSG_RESULT(no)
fi
# Check for kunittest
AC_MSG_CHECKING([for kunittest])
# Check for tdeunittest
AC_MSG_CHECKING([for tdeunittest])
have_kunittest_header="no"
KDE_CHECK_HEADER(kunittest/tester.h, have_kunittest_header="yes", , )
AM_CONDITIONAL(include_kunittest_tests, test "$have_kunittest_header" = "yes")
have_tdeunittest_header="no"
KDE_CHECK_HEADER(tdeunittest/tester.h, have_tdeunittest_header="yes", , )
AM_CONDITIONAL(include_tdeunittest_tests, test "$have_tdeunittest_header" = "yes")
# --- OpenGL check ---

2
chalk/core/Makefile.am
Unescape View File

@ -47,7 +47,7 @@ include_HEADERS = kis_adjustment_layer.h kis_alpha_mask.h \
libchalkimage_la_LDFLAGS = -version-info 1:0:0 -no-undefined $(all_libraries)
libchalkimage_la_LIBADD = ../sdk/libchalksdk.la ../chalkcolor/libchalkcolor.la tiles/libchalktile.la $(OPENEXR_LIBS) $(LCMS_LIBS) $(LIB_KOFFICECORE) $(LIB_KOPAINTER) $(LIB_TDECORE) $(LIB_QT) $(OPENEXR_LIBS)
if include_kunittest_tests
if include_tdeunittest_tests
TESTSDIR = tests
endif

4
chalk/core/kis_filter_registry.cc
Unescape View File

@ -22,10 +22,10 @@
#include <kaction.h>
#include <kdebug.h>
#include <klocale.h>
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
#include <kservice.h>
#include <ktrader.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include "kis_debug_areas.h"
#include <math.h>
#include "kis_types.h"

4
chalk/core/kis_paintop_registry.cc
Unescape View File

@ -23,10 +23,10 @@
#include <kglobal.h>
#include <klocale.h>
#include <kstandarddirs.h>
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
#include <kservice.h>
#include <ktrader.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include "kis_generic_registry.h"
#include "kis_types.h"

24
chalk/core/tests/Makefile.am
Unescape View File

@ -10,21 +10,21 @@ AM_CPPFLAGS = \
# The check_ target makes sure we don't install the modules,
# $(KDE_CHECK_PLUGIN) assures a shared library is created.
check_LTLIBRARIES = kunittest_kis_integer_maths_tester.la kunittest_kis_image_tester.la kunittest_kis_filter_configuration_tester.la
check_LTLIBRARIES = tdeunittest_kis_integer_maths_tester.la tdeunittest_kis_image_tester.la tdeunittest_kis_filter_configuration_tester.la
kunittest_kis_integer_maths_tester_la_SOURCES = kis_integer_maths_tester.cpp
kunittest_kis_integer_maths_tester_la_LIBADD = -lkunittest ../../libchalkcommon.la
kunittest_kis_integer_maths_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
tdeunittest_kis_integer_maths_tester_la_SOURCES = kis_integer_maths_tester.cpp
tdeunittest_kis_integer_maths_tester_la_LIBADD = -ltdeunittest ../../libchalkcommon.la
tdeunittest_kis_integer_maths_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
kunittest_kis_image_tester_la_SOURCES = kis_image_tester.cpp
kunittest_kis_image_tester_la_LIBADD = -lkunittest ../../libchalkcommon.la
kunittest_kis_image_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
tdeunittest_kis_image_tester_la_SOURCES = kis_image_tester.cpp
tdeunittest_kis_image_tester_la_LIBADD = -ltdeunittest ../../libchalkcommon.la
tdeunittest_kis_image_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
kunittest_kis_filter_configuration_tester_la_SOURCES = kis_filter_configuration_tester.cc
kunittest_kis_filter_configuration_tester_la_LIBADD = -lkunittest ../../libchalkcommon.la
kunittest_kis_filter_configuration_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
tdeunittest_kis_filter_configuration_tester_la_SOURCES = kis_filter_configuration_tester.cc
tdeunittest_kis_filter_configuration_tester_la_LIBADD = -ltdeunittest ../../libchalkcommon.la
tdeunittest_kis_filter_configuration_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
check-local: kunittest_kis_integer_maths_tester.la kunittest_kis_image_tester.la kunittest_kis_filter_configuration_tester.la
kunittestmodrunner
check-local: tdeunittest_kis_integer_maths_tester.la tdeunittest_kis_image_tester.la tdeunittest_kis_filter_configuration_tester.la
tdeunittestmodrunner

6
chalk/core/tests/kis_filter_configuration_tester.cc
Unescape View File

@ -19,15 +19,15 @@
#include <tqapplication.h>
#include <kdebug.h>
#include <kunittest/runner.h>
#include <kunittest/module.h>
#include <tdeunittest/runner.h>
#include <tdeunittest/module.h>
#include "kis_filter_configuration_tester.h"
#include "../kis_filter_configuration.h"
using namespace KUnitTest;
KUNITTEST_MODULE(kunittest_kis_filter_configuration_tester, "KisFilterConfiguration Tester");
KUNITTEST_MODULE(tdeunittest_kis_filter_configuration_tester, "KisFilterConfiguration Tester");
KUNITTEST_MODULE_REGISTER_TESTER(KisFilterConfigurationTester);
void KisFilterConfigurationTester::allTests()

2
chalk/core/tests/kis_filter_configuration_tester.h
Unescape View File

@ -19,7 +19,7 @@
#ifndef KIS_FILTER_CONFIGURATION_TESTER_H
#define KIS_FILTER_CONFIGURATION_TESTER_H
#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
class KisFilterConfigurationTester : public KUnitTest::Tester
{

6
chalk/core/tests/kis_image_tester.cpp
Unescape View File

@ -18,8 +18,8 @@
#include <tqapplication.h>
#include <kunittest/runner.h>
#include <kunittest/module.h>
#include <tdeunittest/runner.h>
#include <tdeunittest/module.h>
#include "kis_image_tester.h"
#include "kis_image.h"
@ -32,7 +32,7 @@
using namespace KUnitTest;
KUNITTEST_MODULE(kunittest_kis_image_tester, "KisImage Tester");
KUNITTEST_MODULE(tdeunittest_kis_image_tester, "KisImage Tester");
KUNITTEST_MODULE_REGISTER_TESTER(KisImageTester);
void KisImageTester::allTests()

2
chalk/core/tests/kis_image_tester.h
Unescape View File

@ -19,7 +19,7 @@
#ifndef KIS_IMAGE_TESTER_H
#define KIS_IMAGE_TESTER_H
#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
class KisImageTester : public KUnitTest::Tester
{

6
chalk/core/tests/kis_integer_maths_tester.cpp
Unescape View File

@ -16,15 +16,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <kunittest/runner.h>
#include <kunittest/module.h>
#include <tdeunittest/runner.h>
#include <tdeunittest/module.h>
#include "kis_integer_maths_tester.h"
#include "kis_integer_maths.h"
using namespace KUnitTest;
KUNITTEST_MODULE(kunittest_kis_integer_maths_tester, "Integer Maths Tester");
KUNITTEST_MODULE(tdeunittest_kis_integer_maths_tester, "Integer Maths Tester");
KUNITTEST_MODULE_REGISTER_TESTER(KisIntegerMathsTester);
void KisIntegerMathsTester::allTests()

2
chalk/core/tests/kis_integer_maths_tester.h
Unescape View File

@ -19,7 +19,7 @@
#ifndef KIS_INTEGER_MATHS_TESTER_H
#define KIS_INTEGER_MATHS_TESTER_H
#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
class KisIntegerMathsTester : public KUnitTest::Tester
{

2
chalk/core/tiles/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
if include_kunittest_tests
if include_tdeunittest_tests
TESTSDIR = tests
endif

12
chalk/core/tiles/tests/Makefile.am
Unescape View File

@ -5,11 +5,11 @@ 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_tiled_data_tester.la
kunittest_kis_tiled_data_tester_la_SOURCES = kis_tiled_data_tester.cpp
kunittest_kis_tiled_data_tester_la_LIBADD = -lkunittest ../../../libchalkcommon.la
kunittest_kis_tiled_data_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
check_LTLIBRARIES = tdeunittest_kis_tiled_data_tester.la
tdeunittest_kis_tiled_data_tester_la_SOURCES = kis_tiled_data_tester.cpp
tdeunittest_kis_tiled_data_tester_la_LIBADD = -ltdeunittest ../../../libchalkcommon.la
tdeunittest_kis_tiled_data_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
check-local: kunittest_kis_tiled_data_tester.la
kunittestmodrunner
check-local: tdeunittest_kis_tiled_data_tester.la
tdeunittestmodrunner

6
chalk/core/tiles/tests/kis_tiled_data_tester.cpp
Unescape View File

@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <kunittest/runner.h>
#include <kunittest/module.h>
#include <tdeunittest/runner.h>
#include <tdeunittest/module.h>
#include "kis_tiled_data_tester.h"
#include "kis_datamanager.h"
@ -25,7 +25,7 @@
using namespace KUnitTest;
KUNITTEST_MODULE( kunittest_kis_tiled_data_tester, "Tiled Data Tester" );
KUNITTEST_MODULE( tdeunittest_kis_tiled_data_tester, "Tiled Data Tester" );
KUNITTEST_MODULE_REGISTER_TESTER( KisTiledDataTester );
#define TEST_PIXEL_SIZE 4

2
chalk/core/tiles/tests/kis_tiled_data_tester.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef KIS_TILED_DATA_TESTER_H
#define KIS_TILED_DATA_TESTER_H
#include <kunittest/tester.h>
#include <tdeunittest/tester.h>
class KisTiledDataTester : public KUnitTest::Tester
{

2
chalk/doc/DESIGN.obsolete
Unescape View File

@ -39,7 +39,7 @@ Design Patterns
* Tools are created by a Factory pattern (but it isn't
dynamic yet): kis_tool_factory. Tools are intended to
become kparts.
become tdeparts.
* There's the start of a Memento pattern for tools, but it
doesn't seem to be used (kis_tool_memento). It was an

10
chalk/doc/colorspaces.xmi
Unescape View File

@ -21005,9 +21005,9 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
</codeclassfield>
</classfields>
</classifiercodedocument>
<classifiercodedocument writeOutCode="true" package="" id="864" parent_class="864" fileExt=".cpp" fileName="kparts" >
<classifiercodedocument writeOutCode="true" package="" id="864" parent_class="864" fileExt=".cpp" fileName="tdeparts" >
<textblocks>
<codeblockwithcomments tag="includes" text="#include &quot;kparts.h&quot;&amp;#010;" >
<codeblockwithcomments tag="includes" text="#include &quot;tdeparts.h&quot;&amp;#010;" >
<header>
<cppcodedocumentation tag="" writeOutText="false" />
</header>
@ -21030,7 +21030,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
</header>
<classfields/>
</classifiercodedocument>
<classifiercodedocument writeOutCode="true" package="kparts" id="865" parent_class="865" fileExt=".cpp" fileName="plugin" >
<classifiercodedocument writeOutCode="true" package="tdeparts" id="865" parent_class="865" fileExt=".cpp" fileName="plugin" >
<textblocks>
<codeblockwithcomments tag="includes" text="#include &quot;plugin.h&quot;&amp;#010;" >
<header>
@ -35127,7 +35127,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
</codeclassfield>
</classfields>
</classifiercodedocument>
<classifiercodedocument writeOutCode="true" package="" id="cppheader864" parent_class="864" fileExt=".h" fileName="kparts" >
<classifiercodedocument writeOutCode="true" package="" id="cppheader864" parent_class="864" fileExt=".h" fileName="tdeparts" >
<textblocks>
<codeblockwithcomments tag="hashDefBlock" text="#ifndef KPARTS_H&amp;#010;#define KPARTS_H" >
<header>
@ -35333,7 +35333,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
</header>
<classfields/>
</classifiercodedocument>
<classifiercodedocument writeOutCode="true" package="kparts" id="cppheader865" parent_class="865" fileExt=".h" fileName="plugin" >
<classifiercodedocument writeOutCode="true" package="tdeparts" id="cppheader865" parent_class="865" fileExt=".h" fileName="plugin" >
<textblocks>
<codeblockwithcomments tag="hashDefBlock" text="#ifndef PLUGIN_H&amp;#010;#define PLUGIN_H" >
<header>

2
chalk/plugins/README
Unescape View File

@ -38,5 +38,5 @@ There are several kinds of plugins for Chalk:
elements such as dialog boxes and wizards. Their parent is KisView and
they provide an .rc file to merge their gui with the view gui. Extensions
have the servicetype Chalk/Plugin. They are not loaded automatically by
the KParts mechanism; please do not create ordinary kparts that are to
the KParts mechanism; please do not create ordinary tdeparts that are to
be loaded by the Chalk view since KParts are not versioned.

2
chalk/plugins/filters/blur/Makefile.am
Unescape View File

@ -14,7 +14,7 @@ chalkblurfilter_la_SOURCES = wdgblur.ui blur.cc kis_blur_filter.cc kis_wdg_blur.
kde_module_LTLIBRARIES = chalkblurfilter.la
noinst_HEADERS = blur.h kis_blur_filter.h
chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts
chalkblurfilter_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
../../../../chalk/chalkcolor/libchalkcolor.la \
../../../../chalk/core/libchalkimage.la \

2
chalk/plugins/filters/blur/blur.h
Unescape View File

@ -25,7 +25,7 @@
#define LCMS_HEADER <lcms.h>
// TODO: remove it !
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
class BlurFilterPlugin : public KParts::Plugin
{

2
chalk/plugins/filters/bumpmap/Makefile.am
Unescape View File

@ -12,7 +12,7 @@ chalkbumpmap_la_SOURCES = bumpmap.cc wdgbumpmap.ui
kde_module_LTLIBRARIES = chalkbumpmap.la
noinst_HEADERS = bumpmap.h
chalkbumpmap_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
chalkbumpmap_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts
chalkbumpmap_la_LIBADD = ../../../libchalkcommon.la \
../../../../chalk/chalkcolor/libchalkcolor.la \
../../../../chalk/core/libchalkimage.la \

2
chalk/plugins/filters/bumpmap/bumpmap.h
Unescape View File

@ -24,7 +24,7 @@
#include <tqwidget.h>
#include <kparts/plugin.h>
#include <tdeparts/plugin.h>
#include <kis_types.h>
#include <kis_filter.h>

2
chalk/plugins/filters/cimg/Makefile.am
Unescape View File