7
0
Fork 0

Additional k => tde renaming and fixes

pull/1/head
Slávek Banko 11 anos atrás
commit 15ae7be824

@ -1 +1 @@
Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360
Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461

@ -19,7 +19,7 @@ libchalkcolor_la_SOURCES = kis_color.cc kis_colorspace.cc \
kis_u16_base_colorspace.cc kis_f32_base_colorspace.cc $(OPENEXR_SOURCES)
libchalkcolor_la_LDFLAGS = -version-info 1:0:0 -no-undefined $(all_libraries)
libchalkcolor_la_LIBADD = colorspaces/libchalkcolorspaces.la $(LCMS_LIBS) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_QT) $(OPENEXR_LIBS)
libchalkcolor_la_LIBADD = colorspaces/libchalkcolorspaces.la $(LCMS_LIBS) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_QT) $(OPENEXR_LIBS)
include_HEADERS = \
kis_channelinfo.h \

@ -24,8 +24,8 @@
using namespace KUnitTest;
KUNITTEST_MODULE(tdeunittest_kis_color_conversions_tester, "Color Conversions Tester");
KUNITTEST_MODULE_REGISTER_TESTER(KisColorConversionsTester);
TDEUNITTEST_MODULE(tdeunittest_kis_color_conversions_tester, "Color Conversions Tester");
TDEUNITTEST_MODULE_REGISTER_TESTER(KisColorConversionsTester);
void KisColorConversionsTester::allTests()
{

@ -25,8 +25,8 @@
using namespace KUnitTest;
KUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_grayscale_tester, "Greyscale ColorSpace Tester" );
KUNITTEST_MODULE_REGISTER_TESTER( KisGrayColorSpaceTester );
TDEUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_grayscale_tester, "Greyscale ColorSpace Tester" );
TDEUNITTEST_MODULE_REGISTER_TESTER( KisGrayColorSpaceTester );
void KisGrayColorSpaceTester::allTests()
{

@ -29,8 +29,8 @@
using namespace KUnitTest;
KUNITTEST_MODULE( tdeunittest_kis_rgb_f16half_colorspace_tester, "RGBA 16-bit float half colorspace tester" );
KUNITTEST_MODULE_REGISTER_TESTER( KisRgbF16HalfColorSpaceTester );
TDEUNITTEST_MODULE( tdeunittest_kis_rgb_f16half_colorspace_tester, "RGBA 16-bit float half colorspace tester" );
TDEUNITTEST_MODULE_REGISTER_TESTER( KisRgbF16HalfColorSpaceTester );
#define PIXEL_BLUE 0
#define PIXEL_GREEN 1

@ -28,8 +28,8 @@
using namespace KUnitTest;
KUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_f32_tester, "RGBA 32-bit float colorspace tester" );
KUNITTEST_MODULE_REGISTER_TESTER( KisRgbF32ColorSpaceTester );
TDEUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_f32_tester, "RGBA 32-bit float colorspace tester" );
TDEUNITTEST_MODULE_REGISTER_TESTER( KisRgbF32ColorSpaceTester );
#define PIXEL_BLUE 0
#define PIXEL_GREEN 1

@ -27,8 +27,8 @@
using namespace KUnitTest;
KUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_u16_tester, "RGB 16-bit integer colorspace tester" );
KUNITTEST_MODULE_REGISTER_TESTER( KisRgbU16ColorSpaceTester );
TDEUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_u16_tester, "RGB 16-bit integer colorspace tester" );
TDEUNITTEST_MODULE_REGISTER_TESTER( KisRgbU16ColorSpaceTester );
#define PIXEL_BLUE 0
#define PIXEL_GREEN 1

@ -25,8 +25,8 @@
using namespace KUnitTest;
KUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_tester, "RGB ColorSpace Tester" );
KUNITTEST_MODULE_REGISTER_TESTER( KisRgbColorSpaceTester );
TDEUNITTEST_MODULE( tdeunittest_kis_strategy_colorspace_rgb_tester, "RGB ColorSpace Tester" );
TDEUNITTEST_MODULE_REGISTER_TESTER( KisRgbColorSpaceTester );
void KisRgbColorSpaceTester::allTests()
{

@ -27,8 +27,8 @@
using namespace KUnitTest;
KUNITTEST_MODULE(tdeunittest_kis_filter_configuration_tester, "KisFilterConfiguration Tester");
KUNITTEST_MODULE_REGISTER_TESTER(KisFilterConfigurationTester);
TDEUNITTEST_MODULE(tdeunittest_kis_filter_configuration_tester, "KisFilterConfiguration Tester");
TDEUNITTEST_MODULE_REGISTER_TESTER(KisFilterConfigurationTester);
void KisFilterConfigurationTester::allTests()
{

@ -32,8 +32,8 @@
using namespace KUnitTest;
KUNITTEST_MODULE(tdeunittest_kis_image_tester, "KisImage Tester");
KUNITTEST_MODULE_REGISTER_TESTER(KisImageTester);
TDEUNITTEST_MODULE(tdeunittest_kis_image_tester, "KisImage Tester");
TDEUNITTEST_MODULE_REGISTER_TESTER(KisImageTester);
void KisImageTester::allTests()
{

@ -24,8 +24,8 @@
using namespace KUnitTest;
KUNITTEST_MODULE(tdeunittest_kis_integer_maths_tester, "Integer Maths Tester");
KUNITTEST_MODULE_REGISTER_TESTER(KisIntegerMathsTester);
TDEUNITTEST_MODULE(tdeunittest_kis_integer_maths_tester, "Integer Maths Tester");
TDEUNITTEST_MODULE_REGISTER_TESTER(KisIntegerMathsTester);
void KisIntegerMathsTester::allTests()
{

@ -25,8 +25,8 @@
using namespace KUnitTest;
KUNITTEST_MODULE( tdeunittest_kis_tiled_data_tester, "Tiled Data Tester" );
KUNITTEST_MODULE_REGISTER_TESTER( KisTiledDataTester );
TDEUNITTEST_MODULE( tdeunittest_kis_tiled_data_tester, "Tiled Data Tester" );
TDEUNITTEST_MODULE_REGISTER_TESTER( KisTiledDataTester );
#define TEST_PIXEL_SIZE 4

@ -35129,7 +35129,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
</classifiercodedocument>
<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" >
<codeblockwithcomments tag="hashDefBlock" text="#ifndef TDEPARTS_H&amp;#010;#define TDEPARTS_H" >
<header>
<cppcodedocumentation tag="" writeOutText="false" />
</header>
@ -35322,7 +35322,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
</cppheaderclassdeclarationblock>
</textblocks>
</hierarchicalcodeblock>
<codeblockwithcomments tag="hashDefBlockEnd" text="#endif //KPARTS_H" >
<codeblockwithcomments tag="hashDefBlockEnd" text="#endif //TDEPARTS_H" >
<header>
<cppcodedocumentation tag="" writeOutText="false" />
</header>

@ -911,7 +911,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
// set the annotations
exportAnnotationsForImage(image, annotationsStart, annotationsEnd);
// XXX: Write to a temp file, then have Chalk use KIO to copy temp
// XXX: Write to a temp file, then have Chalk use TDEIO to copy temp
// image to remote location.
WriteImage(ii, image);

@ -854,7 +854,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
// set the annotations
exportAnnotationsForImage(image, annotationsStart, annotationsEnd);
// XXX: Write to a temp file, then have Chalk use KIO to copy temp
// XXX: Write to a temp file, then have Chalk use TDEIO to copy temp
// image to remote location.
WriteImage(ii, image);

@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libgenerickofilter.la
libgenerickofilter_la_SOURCES = generic_filter.cc
libgenerickofilter_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
libgenerickofilter_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KIO)
libgenerickofilter_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEIO)
METASOURCES = AUTO

@ -16,7 +16,7 @@ noinst_HEADERS = latexexport.h
#check_PROGRAMS = texlauncher
#texlauncher_SOURCES = texlauncher.cc
#texlauncher_LDADD = liblatexexport.la
#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
METASOURCES = AUTO

@ -16,7 +16,7 @@ noinst_HEADERS = pngexport.h pngexportdia.h
#check_PROGRAMS = texlauncher
#texlauncher_SOURCES = texlauncher.cc
#texlauncher_LDADD = liblatexexport.la
#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
METASOURCES = AUTO

@ -16,7 +16,7 @@ noinst_HEADERS = svgexport.h
#check_PROGRAMS = texlauncher
#texlauncher_SOURCES = texlauncher.cc
#texlauncher_LDADD = liblatexexport.la
#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
METASOURCES = AUTO

@ -22,7 +22,7 @@ noinst_HEADERS = cell.h column.h config.h document.h fileheader.h format.h \
#check_PROGRAMS = texlauncher
#texlauncher_SOURCES = texlauncher.cc
#texlauncher_LDADD = liblatexexport.la
#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
METASOURCES = AUTO

@ -20,7 +20,7 @@ libkwordlatexexport_la_SOURCES = anchor.cc config.cc document.cc element.cc file
#check_PROGRAMS = texlauncher
#texlauncher_SOURCES = texlauncher.cc
#texlauncher_LDADD = liblatexexport.la
#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
METASOURCES = AUTO

@ -19,7 +19,7 @@ noinst_HEADERS = config.h lateximport.h lateximportdia.h
#check_PROGRAMS = texlauncher
#texlauncher_SOURCES = texlauncher.cc
#texlauncher_LDADD = liblatexexport.la
#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
METASOURCES = AUTO

@ -25,7 +25,7 @@ texscaner.cc: $(srcdir)/texscaner.y
check_PROGRAMS = texlauncher
texlauncher_SOURCES = texlauncher.cc
texlauncher_LDADD = liblatexexport.la
texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
METASOURCES = AUTO

@ -3,7 +3,7 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon -I$(top_srcdir)/karbon/co
kde_module_LTLIBRARIES = karbon_flattenpathplugin.la
karbon_flattenpathplugin_la_SOURCES = flattenpathplugin.cc
karbon_flattenpathplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
karbon_flattenpathplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
$(LIB_KOPAINTER) ../../libkarboncommon.la
karbon_flattenpathplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN)

@ -5,7 +5,7 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon -I$(top_srcdir)/karbon/co
kde_module_LTLIBRARIES = karbon_imagetoolplugin.la
karbon_imagetoolplugin_la_SOURCES = imagetoolplugin.cc vimagetool.cc
karbon_imagetoolplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
karbon_imagetoolplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
$(LIB_KOPAINTER) ../../libkarboncommon.la
karbon_imagetoolplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN)

@ -3,7 +3,7 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon -I$(top_srcdir)/karbon/co
kde_module_LTLIBRARIES = karbon_insertknotsplugin.la
karbon_insertknotsplugin_la_SOURCES = insertknotsplugin.cc
karbon_insertknotsplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
karbon_insertknotsplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
$(LIB_KOPAINTER) ../../libkarboncommon.la
karbon_insertknotsplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN)

@ -3,7 +3,7 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon -I$(top_srcdir)/karbon/co
kde_module_LTLIBRARIES = karbon_roundcornersplugin.la
karbon_roundcornersplugin_la_SOURCES = roundcornersplugin.cc
karbon_roundcornersplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
karbon_roundcornersplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
$(LIB_KOPAINTER) ../../libkarboncommon.la
karbon_roundcornersplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN)

@ -3,7 +3,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(KOPAINTER_INCLUDES) -I$(top_srcdir)/karbon -I$
kde_module_LTLIBRARIES = karbon_shadoweffectplugin.la
karbon_shadoweffectplugin_la_SOURCES = shadoweffectplugin.cc vshadowdecorator.cc
karbon_shadoweffectplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
karbon_shadoweffectplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
$(LIB_KOPAINTER) ../../libkarboncommon.la
karbon_shadoweffectplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN)

@ -3,7 +3,7 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon -I$(top_srcdir)/karbon/cor
kde_module_LTLIBRARIES = karbon_whirlpinchplugin.la
karbon_whirlpinchplugin_la_SOURCES = whirlpinchplugin.cc
karbon_whirlpinchplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOPAINTER) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
karbon_whirlpinchplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOPAINTER) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
../../libkarboncommon.la

@ -5,7 +5,7 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon -I$(top_srcdir)/karbon/co
kde_module_LTLIBRARIES = karbon_zoomtoolplugin.la
karbon_zoomtoolplugin_la_SOURCES = vzoomtool.cc zoomtoolplugin.cc
karbon_zoomtoolplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
karbon_zoomtoolplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
$(LIB_KOPAINTER) ../../libkarboncommon.la
karbon_zoomtoolplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(all_libraries) -module $(KDE_PLUGIN)

@ -56,7 +56,7 @@ karbon_defaulttools_la_SOURCES = \
vtexttool.cc \
vdefaulttools.cc
karbon_defaulttools_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPAINTER) ../libkarboncommon.la
karbon_defaulttools_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPAINTER) ../libkarboncommon.la
karbon_defaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio
karbon_defaulttools_la_METASOURCES = \

@ -22,7 +22,7 @@ libkformdesigner_la_LIBADD = \
$(top_builddir)/kexi/widget/utils/libkexiguiutils.la \
$(top_builddir)/kexi/widget/tableview/libkexidatatable.la \
$(top_builddir)/lib/koproperty/libkoproperty.la \
$(LIB_KPARTS)
$(LIB_TDEPARTS)
servicetypesdir = $(kde_servicetypesdir)
servicetypes_DATA=widgetfactory.desktop

@ -11,7 +11,7 @@ INCLUDES = -I$(top_srcdir)/kexi -I$(top_srcdir)/kexi/formeditor \
-I$(top_srcdir)/kexi/widget -I$(top_srcdir)/kexi/core \
-I$(top_srcdir)/lib -I$(top_srcdir)/lib/kofficecore $(all_includes)
kformdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kformdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kformdesigner_LDADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la

@ -53,7 +53,7 @@ transaction.h \
utils.h \
parser/parser.h
libkexidb_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO) \
libkexidb_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) \
$(top_builddir)/kexi/kexiutils/libkexiutils.la
libkexidb_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(VER_INFO)

@ -16,7 +16,7 @@ kexidb_mysqldriver_la_SOURCES = \
mysqlkeywords.cpp \
mysqlpreparedstatement.cpp
kexidb_mysqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) \
kexidb_mysqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) \
$(LIB_QT) \
$(MYSQL_LIBS) \
-lmysqlclient \

@ -8,7 +8,7 @@ kexidb_odbcdriver_la_METASOURCES = AUTO
kexidb_odbcdriver_la_SOURCES = odbcdriver.cpp odbcconnection.cpp
kexidb_odbcdriver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lodbc $(top_builddir)/kexi/kexidb/libkexidb.la
kexidb_odbcdriver_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) -lodbc $(top_builddir)/kexi/kexidb/libkexidb.la
kexidb_odbcdriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined

@ -9,7 +9,7 @@ kexidb_pqxxsqldriver_la_METASOURCES = AUTO
kexidb_pqxxsqldriver_la_SOURCES = pqxxdriver.cpp pqxxcursor.cpp pqxxconnection.cpp \
pqxxkeywords.cpp pqxxconnection_p.cpp pqxxpreparedstatement.cpp
kexidb_pqxxsqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) -lpqxx ../../libkexidb.la
kexidb_pqxxsqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) $(LIB_QT) -lpqxx ../../libkexidb.la
kexidb_pqxxsqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) \
-L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined \

@ -11,7 +11,7 @@ kexidb_sqlite3driver_la_SOURCES = sqliteconnection.cpp sqlitedriver.cpp sqlitecu
sqlitekeywords.cpp sqlitepreparedstatement.cpp sqlitevacuum.cpp sqliteadmin.cpp \
sqlitealter.cpp
kexidb_sqlite3driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) \
kexidb_sqlite3driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) $(LIB_QT) \
$(top_builddir)/kexi/3rdparty/kexisql3/src/libkexisql3.la \
$(top_builddir)/kexi/kexidb/libkexidb.la \
$(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \

@ -15,7 +15,7 @@ kexidb_sqlite2driver_la_METASOURCES = AUTO
kexidb_sqlite2driver_la_SOURCES = sqliteconnection.cpp sqlitedriver.cpp sqlitecursor.cpp \
sqlitepreparedstatement.cpp sqliteadmin.cpp sqlitealter.cpp
kexidb_sqlite2driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) \
kexidb_sqlite2driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) $(LIB_QT) \
$(top_builddir)/kexi/3rdparty/kexisql/src/libkexisql2.la \
$(top_builddir)/kexi/kexidb/libkexidb.la \
$(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \

@ -2,7 +2,7 @@ include $(top_srcdir)/kexi/Makefile.global
lib_LTLIBRARIES = libkexidbparser.la
libkexidbparser_la_SOURCES = sqlscanner.cpp sqlparser.cpp parser.cpp parser_p.cpp
libkexidbparser_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEUI) ../libkexidb.la
libkexidbparser_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEUI) ../libkexidb.la
libkexidbparser_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(VER_INFO)
noinst_HEADERS = parser_p.h

@ -14,7 +14,7 @@ libkexiutils_la_LDFLAGS = \
$(KDE_RPATH) $(all_libraries) \
$(VER_INFO) -Wnounresolved -no-undefined
libkexiutils_la_LIBADD = $(LIB_QT) $(LIB_TDEUI) $(LIB_KIO)
libkexiutils_la_LIBADD = $(LIB_QT) $(LIB_TDEUI) $(LIB_TDEIO)
INCLUDES = -I$(top_srcdir)/kexi $(all_includes)

@ -18,7 +18,7 @@ libkeximain_la_LIBADD = $(top_builddir)/kexi/kexidb/libkexidb.la $(top_builddir
$(top_builddir)/kexi/main/printing/libkeximainprinting.la \
$(top_builddir)/lib/koproperty/libkoproperty.la \
$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
$(LIB_KFEEDBACK) $(LIB_KEXI_KMDI) $(LIB_KNEWSTUFF) $(LIB_KIO) $(LIB_TDEPRINT)
$(LIB_KFEEDBACK) $(LIB_KEXI_KMDI) $(LIB_KNEWSTUFF) $(LIB_TDEIO) $(LIB_TDEPRINT)
#disabled ../migration/libkeximigrate.la

@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
Loosely based on tdevelop/src/statusbar.cpp
Copyright (C) 2001 by Bernd Gehrmann <bernd@tdevelop.org>
Copyright (C) 2001 by Bernd Gehrmann <bernd@kdevelop.org>
*/
#include "kexistatusbar.h"

@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
Loosely based on tdevelop/src/statusbar.h
Copyright (C) 2001 by Bernd Gehrmann <bernd@tdevelop.org>
Copyright (C) 2001 by Bernd Gehrmann <bernd@kdevelop.org>
*/
#ifndef KEXISTATUSBAR_H

@ -53,5 +53,5 @@ keximigratetest_LDADD = libkeximigrate.la \
$(top_builddir)/kexi/main/libkeximain.la \
$(LIB_QT) $(LIB_TDECORE)
keximigratetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
keximigratetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

@ -8,7 +8,7 @@ keximigrate_mysql_la_METASOURCES = AUTO
keximigrate_mysql_la_SOURCES = mysqlmigrate.cpp
keximigrate_mysql_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) ../libkeximigrate.la $(MYSQL_LIBS) -lmysqlclient \
keximigrate_mysql_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) $(LIB_QT) ../libkeximigrate.la $(MYSQL_LIBS) -lmysqlclient \
../../../kexi/kexidb/libkexidb.la \
../../../kexi/kexiutils/libkexiutils.la

@ -9,8 +9,8 @@ keximigrate_pqxx_la_METASOURCES = AUTO
keximigrate_pqxx_la_SOURCES = pqxxmigrate.cpp
#TODO share -libs with pqxx kexidb drv!
#keximigrate_pqxx_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lcom_err -lkrb5 -lssl -lcrypto -lcrypt -lpqxx ../libkeximigrate.la
keximigrate_pqxx_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) -lpqxx ../libkeximigrate.la \
#keximigrate_pqxx_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) -lcom_err -lkrb5 -lssl -lcrypto -lcrypt -lpqxx ../libkeximigrate.la
keximigrate_pqxx_la_LIBADD = $(KOFFICE_LIBS) $(LIB_TDEPARTS) $(LIB_QT) -lpqxx ../libkeximigrate.la \
../../../kexi/kexidb/libkexidb.la \
../../../kexi/kexiutils/libkexiutils.la

@ -8,7 +8,7 @@ keximigrate_txtmigrate_la_METASOURCES = AUTO
keximigrate_txtmigrate_la_SOURCES = txtmigrate.cpp
keximigrate_txtmigrate_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) ../libkeximigrate.la
keximigrate_txtmigrate_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) ../libkeximigrate.la
keximigrate_txtmigrate_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined

@ -7,13 +7,13 @@ endif
bin_PROGRAMS = komacrotest $(GUIBINPROGRAM)
komacrotest_SOURCES = komacrotest.cpp testobject.cpp testaction.cpp actiontests.cpp macrotests.cpp macroitemtests.cpp variabletests.cpp xmlhandlertests.cpp xmlhandlertests2.cpp
komacrotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
komacrotest_LDADD = -ltdeunittest ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_KPARTS)
komacrotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
komacrotest_LDADD = -ltdeunittest ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_TDEPARTS)
if include_tdeunittestgui
komacrotestgui_SOURCES = komacrotestgui.cpp testobject.cpp testaction.cpp actiontests.cpp macrotests.cpp macroitemtests.cpp variabletests.cpp xmlhandlertests.cpp xmlhandlertests2.cpp
komacrotestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
komacrotestgui_LDADD = -ltdeunittestgui ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_KPARTS)
komacrotestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
komacrotestgui_LDADD = -ltdeunittestgui ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_TDEPARTS)
endif
KDE_CXXFLAGS = $(USE_EXCEPTIONS)

@ -50,8 +50,8 @@ namespace KoMacroTest {
* Register KoMacroTest::CommonTests as TestSuite.
*/
KUNITTEST_SUITE("KoMacroTestSuite");
KUNITTEST_REGISTER_TESTER(ActionTests);
TDEUNITTEST_SUITE("KoMacroTestSuite");
TDEUNITTEST_REGISTER_TESTER(ActionTests);
class ActionTests::Private

@ -51,8 +51,8 @@ namespace KoMacroTest {
/**
* Register KoMacroTest::CommonTests as TestSuite.
*/
KUNITTEST_SUITE("CommonTestsSuite")
KUNITTEST_REGISTER_TESTER(CommonTests);
TDEUNITTEST_SUITE("CommonTestsSuite")
TDEUNITTEST_REGISTER_TESTER(CommonTests);
/**
* @internal d-pointer class to be more flexible on future extension of the

@ -48,8 +48,8 @@ namespace KoMacroTest {
* Register KoMacroTest::CommonTests as TestSuite.
*/
KUNITTEST_SUITE("KoMacroTestSuite");
KUNITTEST_REGISTER_TESTER(MacroitemTests);
TDEUNITTEST_SUITE("KoMacroTestSuite");
TDEUNITTEST_REGISTER_TESTER(MacroitemTests);
class MacroitemTests::Private

@ -49,8 +49,8 @@ namespace KoMacroTest {
/**
* Register KoMacroTest::CommonTests as TestSuite.
*/
KUNITTEST_SUITE("KoMacroTestSuite")
KUNITTEST_REGISTER_TESTER(MacroTests);
TDEUNITTEST_SUITE("KoMacroTestSuite")
TDEUNITTEST_REGISTER_TESTER(MacroTests);
class MacroTests::Private
{

@ -50,8 +50,8 @@ namespace KoMacroTest {
* Register KoMacroTest::CommonTests as TestSuite.
*/
KUNITTEST_SUITE("KoMacroTestSuite");
KUNITTEST_REGISTER_TESTER(VariableTests);
TDEUNITTEST_SUITE("KoMacroTestSuite");
TDEUNITTEST_REGISTER_TESTER(VariableTests);
class VariableTests::Private

@ -43,8 +43,8 @@ namespace KoMacroTest {
/**
* Register KoMacroTest::CommonTests as TestSuite.
*/
KUNITTEST_SUITE("KoMacroTestSuite")
KUNITTEST_REGISTER_TESTER(XMLHandlerTests);
TDEUNITTEST_SUITE("KoMacroTestSuite")
TDEUNITTEST_REGISTER_TESTER(XMLHandlerTests);
class XMLHandlerTests::Private
{

@ -43,8 +43,8 @@ namespace KoMacroTest {
/**
* Register KoMacroTest::CommonTests as TestSuite.
*/
KUNITTEST_SUITE("KoMacroTestSuite")
KUNITTEST_REGISTER_TESTER(XMLHandlerTests2);
TDEUNITTEST_SUITE("KoMacroTestSuite")
TDEUNITTEST_REGISTER_TESTER(XMLHandlerTests2);
class XMLHandlerTests2::Private
{

@ -18,5 +18,5 @@ kexialtertabletest_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/
$(top_builddir)/kexi/main/libkeximain.la \
$(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \
$(top_builddir)/kexi/widget/libkexiextendedwidgets.la
kexialtertabletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kexialtertabletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

@ -20,14 +20,14 @@ kexidbtest_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexid
../../kexidb/parser/libkexidbparser.la \
$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
../../widget/tableview/libkexidatatable.la
kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
#kexidbmysqlcursor_SOURCES = mysqlcursor.cpp
#kexidbmysqlcursor_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
# ../../kexidb/parser/libkexidbparser.la
#kexidbmysqlcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
#kexidbmysqlcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
#kexidbfirebirdcursor_SOURCES = firebirdcursor.cpp
#kexidbfirebirdcursor_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la
#kexidbfirebirdcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
#kexidbfirebirdcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

@ -8,7 +8,7 @@ kexidbdrivercombotest_SOURCES = kexidbdrivercombotest.cpp
kexidbdrivercombotest_LDADD = $(LIB_QT) $(LIB_TDECORE) \
$(top_builddir)/kexi/kexidb/libkexidb.la \
$(top_builddir)/kexi/widget/libkexiextendedwidgets.la
kexidbdrivercombotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kexidbdrivercombotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
METASOURCES = AUTO

@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef KLISTVIEWITEMTEMPLATE_H
#define KLISTVIEWITEMTEMPLATE_H
#ifndef TDELISTVIEWITEMTEMPLATE_H
#define TDELISTVIEWITEMTEMPLATE_H
#include <tdelistview.h>

@ -27,8 +27,8 @@
using namespace KUnitTest;
KUNITTEST_MODULE(tdeunittest_CalendarTester, "Calendar Tester");
KUNITTEST_MODULE_REGISTER_TESTER(CalendarTester);
TDEUNITTEST_MODULE(tdeunittest_CalendarTester, "Calendar Tester");
TDEUNITTEST_MODULE_REGISTER_TESTER(CalendarTester);
void CalendarTester::allTests() {
testSingleDay();

@ -26,8 +26,8 @@
using namespace KUnitTest;
KUNITTEST_MODULE(tdeunittest_DateTimeTester, "DateTime Tester");
KUNITTEST_MODULE_REGISTER_TESTER(DateTimeTester);
TDEUNITTEST_MODULE(tdeunittest_DateTimeTester, "DateTime Tester");
TDEUNITTEST_MODULE_REGISTER_TESTER(DateTimeTester);
void DateTimeTester::allTests() {
testSubtract();

@ -23,8 +23,8 @@
using namespace KUnitTest;
KUNITTEST_MODULE(tdeunittest_DurationTester, "Duration Tester");
KUNITTEST_MODULE_REGISTER_TESTER(DurationTester);
TDEUNITTEST_MODULE(tdeunittest_DurationTester, "Duration Tester");
TDEUNITTEST_MODULE_REGISTER_TESTER(DurationTester);
void DurationTester::allTests() {
testArithmetic();

@ -131,7 +131,7 @@ void KPrConfig::openPage(int flags)
showPage( 0 );
else if(flags & KP_COLOR)
showPage(1 );
else if(flags & KP_KSPELL)
else if(flags & KP_TDESPELL)
showPage(2);
else if(flags & KP_MISC)
showPage(3 );

@ -215,7 +215,7 @@ class KPrConfig : public KDialogBase
Q_OBJECT
public:
enum { KP_INTERFACE = 1, KP_COLOR=2, KP_KSPELL=4,KP_MISC=8, KP_DOC=16, KP_TOOLS=32,KP_PATH = 64 };
enum { KP_INTERFACE = 1, KP_COLOR=2, KP_TDESPELL=4,KP_MISC=8, KP_DOC=16, KP_TOOLS=32,KP_PATH = 64 };
KPrConfig( KPrView* parent );
public slots:
void slotApply();

@ -7,7 +7,7 @@ can be reached via Email: treat@kde.org
or visit http://www.koffice.org/kugar/
The former maintainer and the author of Kugar Report Designer
part can be reached via Email: adymo@tdevelop.org
part can be reached via Email: adymo@kdevelop.org
The former maintainer and author of Kugar report viewer and konqueror
part can be reached via Email: phil@river-bank.demon.co.uk

@ -9,13 +9,13 @@ lib_LTLIBRARIES = libkudesignercore.la
libkudesignercore_la_SOURCES = kudesigner_view.cpp kudesigner_factory.cpp \
kudesigner_doc.cpp
libkudesignercore_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
libkudesignercore_la_LIBADD = ../kudesigner_lib/libkudesignercommon.la $(LIB_KOFFICEUI) $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOPROPERTY) $(LIB_KIO) $(LIB_TDEPRINT)
libkudesignercore_la_LIBADD = ../kudesigner_lib/libkudesignercommon.la $(LIB_KOFFICEUI) $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOPROPERTY) $(LIB_TDEIO) $(LIB_TDEPRINT)
## The part
kde_module_LTLIBRARIES = libkudesignerpart.la
libkudesignerpart_la_SOURCES = kudesigner_part.cpp
libkudesignerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(KDE_RPATH) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
libkudesignerpart_la_LIBADD = libkudesignercore.la $(LIB_KOFFICEUI) $(LIB_KPARTS) $(LIB_KOFFICECORE)
libkudesignerpart_la_LIBADD = libkudesignercore.la $(LIB_KOFFICEUI) $(LIB_TDEPARTS) $(LIB_KOFFICECORE)
## The tdeinit loadable module
tdeinit_LTLIBRARIES = kudesigner.la

@ -1,6 +1,6 @@
/***************************************************************************
* Copyright (C) 2005 by Alexander Dymo *
* adymo@tdevelop.org *
* adymo@kdevelop.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU Library General Public License as *

@ -1,6 +1,6 @@
/***************************************************************************
* Copyright (C) 2005 by Alexander Dymo *
* adymo@tdevelop.org *
* adymo@kdevelop.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU Library General Public License as *

@ -4,7 +4,7 @@ lib_LTLIBRARIES =
kde_module_LTLIBRARIES = libkugarpart.la
libkugarpart_la_SOURCES = kugar_part.cpp kugar_factory.cpp kugar_view.cpp
libkugarpart_la_LDFLAGS = $(all_libraries) -module -avoid-version
libkugarpart_la_LIBADD = ../lib/libkugarlib.la $(LIB_KPARTS) $(LIB_TDEPRINT) $(LIB_KOFFICECORE)
libkugarpart_la_LIBADD = ../lib/libkugarlib.la $(LIB_TDEPARTS) $(LIB_TDEPRINT) $(LIB_KOFFICECORE)
libkugarpart_la_METASOURCES = AUTO

@ -53,8 +53,8 @@ DIRECTORIES:
source to allow merging of a (large) number of email addresses
into a single document
subdirectories:
kabc:
kwmailmerge_kabc.h/cc - KABC addressbook interface
tdeabc:
kwmailmerge_tdeabc.h/cc - KABC addressbook interface
sql:
various QTSQL interface implementation files
to handle table selection and mailmerge data

@ -136,7 +136,7 @@ void KWConfig::unitChanged( int u )
void KWConfig::openPage(int flags)
{
if(flags & KW_KSPELL)
if(flags & KW_TDESPELL)
showPage( 2 );
else if(flags & KP_INTERFACE)
showPage(0 );

@ -187,7 +187,7 @@ class KWConfig : public KDialogBase
Q_OBJECT
public:
enum { KW_KSPELL=1,KP_INTERFACE=2,KP_MISC=4, KP_DOCUMENT=8, KP_FORMULA=16, KP_PATH = 32};
enum { KW_TDESPELL=1,KP_INTERFACE=2,KP_MISC=4, KP_DOCUMENT=8, KP_FORMULA=16, KP_PATH = 32};
KWConfig( KWView* parent );
void openPage(int flags);
public slots:

@ -18,5 +18,5 @@ if include_sql
SQLDIRECTORY=sql
endif
SUBDIRS = . kabc kspread $(SQLDIRECTORY)
SUBDIRS = . tdeabc kspread $(SQLDIRECTORY)

@ -1,17 +0,0 @@
KDE_CXXFLAGS = $(USE_RTTI)
INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/lib/kformula \
$(KOTEXT_INCLUDES) -I$(top_srcdir)/kword $(all_includes)
kde_module_LTLIBRARIES = kwmailmerge_kabc.la
## Plugin encapsulating the QT SQL database interface
kwmailmerge_kabc_la_SOURCES = KWMailMergeTDEABC.cpp KWMailMergeTDEABCConfig.cpp addresspicker.ui
kwmailmerge_kabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
kwmailmerge_kabc_la_LIBADD = $(KOFFICE_LIBS) ../../libkwmailmerge_interface.la $(LIB_TDEUI) $(LIB_TDEABC)
METASOURCES = AUTO
services_DATA=kwmailmerge_kabc.desktop
servicesdir=$(kde_servicesdir)

@ -537,7 +537,7 @@ TQStringList KWMailMergeTDEABC::singleRecords() const
extern "C"
{
KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kabc( TDEInstance *inst, TQObject *parent )
KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_tdeabc( TDEInstance *inst, TQObject *parent )
{
return new KWMailMergeTDEABC( inst, parent );
}

@ -0,0 +1,17 @@
KDE_CXXFLAGS = $(USE_RTTI)
INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/lib/kformula \
$(KOTEXT_INCLUDES) -I$(top_srcdir)/kword $(all_includes)
kde_module_LTLIBRARIES = kwmailmerge_tdeabc.la
## Plugin encapsulating the QT SQL database interface
kwmailmerge_tdeabc_la_SOURCES = KWMailMergeTDEABC.cpp KWMailMergeTDEABCConfig.cpp addresspicker.ui
kwmailmerge_tdeabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
kwmailmerge_tdeabc_la_LIBADD = $(KOFFICE_LIBS) ../../libkwmailmerge_interface.la $(LIB_TDEUI) $(LIB_TDEABC)
METASOURCES = AUTO
services_DATA=kwmailmerge_tdeabc.desktop
servicesdir=$(kde_servicesdir)

@ -100,6 +100,6 @@ Comment[uk]=Цей тип джерела даних дає доступ до з
Comment[zh_CN]=该数据源类型允许您使用您的 TDE 地址簿条目。
Comment[zh_TW]=這個資料來源類別讓您使用您的 TDE 通訊錄項目。
X-TDE-Library=kwmailmerge_kabc
X-TDE-Library=kwmailmerge_tdeabc
X-TDE-Capabilities=open
X-TDE-InternalName=KABC

@ -25,8 +25,8 @@
using namespace KUnitTest;
KUNITTEST_MODULE(tdeunittest_FrameTester, "Frame Tester");
KUNITTEST_MODULE_REGISTER_TESTER(KWFrameTester);
TDEUNITTEST_MODULE(tdeunittest_FrameTester, "Frame Tester");
TDEUNITTEST_MODULE_REGISTER_TESTER(KWFrameTester);
void KWFrameTester::allTests() {
int argc = 0;

@ -30,8 +30,8 @@
using namespace KUnitTest;
KUNITTEST_MODULE(tdeunittest_FrameViewTester, "FrameView Tester");
KUNITTEST_MODULE_REGISTER_TESTER(KWFrameViewTester);
TDEUNITTEST_MODULE(tdeunittest_FrameViewTester, "FrameView Tester");
TDEUNITTEST_MODULE_REGISTER_TESTER(KWFrameViewTester);
void KWFrameViewTester::allTests() {
testListeners();

@ -26,8 +26,8 @@
using namespace KUnitTest;
KUNITTEST_MODULE(tdeunittest_KWPageManagerTester, "PageManager Tester");
KUNITTEST_MODULE_REGISTER_TESTER(KWPageManagerTester);
TDEUNITTEST_MODULE(tdeunittest_KWPageManagerTester, "PageManager Tester");
TDEUNITTEST_MODULE_REGISTER_TESTER(KWPageManagerTester);
void KWPageManagerTester::allTests() {
getAddPages();

@ -3,7 +3,7 @@
SUBDIRS = . tests
KDE_CXXFLAGS = $(USE_RTTI) $(WOVERLOADED_VIRTUAL)
INCLUDES= $(KSTORE_INCLUDES) $(KWMF_INCLUDES) $(all_includes)
libkofficecore_la_LIBADD = $(LIB_KSTORE) $(LIB_KOWMF) $(LIB_KPARTS) \
libkofficecore_la_LIBADD = $(LIB_KSTORE) $(LIB_KOWMF) $(LIB_TDEPARTS) \
$(LIB_TDEPRINT) $(LIB_TDEABC) $(LIB_KWMF) -lDCOP
####### Files

@ -50,7 +50,7 @@ include_HEADERS = \
#AM_CXXFLAGS = -DQT_PLUGIN
#kde_widget_LTLIBRARIES = kofficewidgets.la
#kofficewidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
#kofficewidgets_la_LIBADD = $(LIB_KIO) libkofficeui.la
#kofficewidgets_la_LIBADD = $(LIB_TDEIO) libkofficeui.la
#kofficewidgets_la_SOURCES = kofficewidgets.cpp
#kofficewidgets.cpp: $(srcdir)/koffice.widgets

@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef TKACTION_H
#define TKACTION_H
#ifndef TTDEACTION_H
#define TTDEACTION_H
#include <tdeaction.h>
#include <tqstringlist.h>

@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef TKTOOLBARBUTTON_H
#define TKTOOLBARBUTTON_H
#ifndef TTDETOOLBARBUTTON_H
#define TTDETOOLBARBUTTON_H
#include <ttdeaction.h>

@ -1,7 +1,7 @@
INCLUDES = -I$(top_srcdir)/lib/koproperty -I$(top_srcdir)/lib/kofficecore $(all_includes)
noinst_LTLIBRARIES = libkopropertyeditors.la
libkopropertyeditors_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO)
libkopropertyeditors_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO)
libkopropertyeditors_la_LDFLAGS = -Wno-unresolved $(all_libraries)
libkopropertyeditors_la_SOURCES = booledit.cpp coloredit.cpp combobox.cpp cursoredit.cpp dateedit.cpp \
datetimeedit.cpp dummywidget.cpp fontedit.cpp linestyledit.cpp pixmapedit.cpp pointedit.cpp \

@ -6,7 +6,7 @@ METASOURCES = AUTO
noinst_PROGRAMS = propertytest
propertytest_SOURCES = main.cpp test.cpp
propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
propertytest_LDADD = $(LIB_KOPROPERTY)
# this is where the shell's XML-GUI resource file goes

@ -18,4 +18,4 @@ check_PROGRAMS = kohyphentest
kohyphentest_SOURCES = kohyphentest.cpp
kohyphentest_LDADD = ./libkohyphen.la $(LIB_QT) $(LIB_TDECORE)
kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

@ -29,8 +29,8 @@
#include "KoUserStyleTester.h"
#include "KoUserStyleTester.moc"
KUNITTEST_MODULE(tdeunittest_KoUserStyleTester, "KoUserStyle Tester");
KUNITTEST_MODULE_REGISTER_TESTER(KoUserStyleTester);
TDEUNITTEST_MODULE(tdeunittest_KoUserStyleTester, "KoUserStyle Tester");
TDEUNITTEST_MODULE_REGISTER_TESTER(KoUserStyleTester);
#undef COMPARE
/// for source-compat with qttestlib: use COMPARE(x,y) if you plan to port to qttestlib later.

@ -8,7 +8,7 @@ check_PROGRAMS = kotextformattertest kobordertest kovariabletest
TESTS = kotextformattertest kovariabletest
LDADD = ../libkotext.la
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kobordertest_SOURCES = kobordertest.cpp
kotextformattertest_SOURCES = kotextformattertest.cpp

@ -6,6 +6,6 @@ bin_PROGRAMS = krossrunner
krossrunner_SOURCES = main.cpp
krossrunner_LDADD = $(LIB_QT) $(LIB_TDECORE) ../api/libkrossapi.la ../main/libkrossmain.la
INCLUDES = $(KROSS_INCLUDES) $(all_includes)
krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
SUBDIRS = .
METASOURCES = AUTO

@ -12,6 +12,6 @@ krosstest_LDADD = \
../main/libkrossmain.la
INCLUDES = $(KROSS_INCLUDES) $(all_includes)
krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
SUBDIRS = .
METASOURCES = AUTO

@ -7,7 +7,7 @@ INCLUDES = $(KOFFICECORE_INCLUDES) $(all_includes)
####### Files
libkstore_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
libkstore_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
libkstore_la_SOURCES = KoStore.cpp KoTarStore.cpp KoDirectoryStore.cpp KoZipStore.cpp KoStoreDrag.cpp KoStoreBase.cpp KoXmlWriter.cpp
libkstore_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 $(KDE_LDFLAGS) -no-undefined
include_HEADERS = KoStore.h KoStoreDevice.h KoXmlWriter.h

@ -16,7 +16,7 @@ kofficescan_la_SOURCES = scan.cpp
noinst_HEADERS = scan.h
kofficescan_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
kofficescan_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO) $(LIB_KOFFICECORE)
kofficescan_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEIO) $(LIB_KOFFICECORE)
kofficescan_la_METASOURCES = AUTO

@ -2,7 +2,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(all_includes)
bin_PROGRAMS = koconverter
koconverter_SOURCES = koconverter.cpp
koconverter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
koconverter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
koconverter_LDADD = $(top_builddir)/lib/kofficecore/libkofficecore.la
METASOURCES = AUTO

@ -7,7 +7,7 @@ tdeinit_LTLIBRARIES = kthesaurus.la
kthesaurus_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
kthesaurus_la_SOURCES = main.cc
kthesaurus_la_LIBADD = $(LIB_KSYCOCA)
kthesaurus_la_LIBADD = $(LIB_TDESYCOCA)
appsdir = $(kde_appsdir)/Office
apps_DATA = KThesaurus.desktop

@ -1,6 +1,6 @@
INCLUDES = $(all_includes)
libthesaurustool_la_LIBADD = $(LIB_KSYCOCA)
libthesaurustool_la_LIBADD = $(LIB_TDESYCOCA)
####### Files

Carregando…
Cancelar
Salvar