summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.am2
-rw-r--r--lib/kdoc.rules8
-rw-r--r--lib/kformula/Makefile.am2
-rw-r--r--lib/kofficecore/KoMainWindow.cpp2
-rw-r--r--lib/kofficecore/Makefile.am4
-rw-r--r--lib/kopainter/svgpathparser.cc2
-rw-r--r--lib/koproperty/test/Makefile.am2
-rw-r--r--lib/kotext/kohyphen/Makefile.am2
-rw-r--r--lib/kotext/tests/Makefile.am2
-rw-r--r--lib/kross/runner/Makefile.am2
-rw-r--r--lib/kross/test/Makefile.am2
-rw-r--r--lib/kwmf/Makefile.am2
12 files changed, 16 insertions, 16 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 35fc9150..4907df59 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -24,5 +24,5 @@ messages:
# $(XGETTEXT) kotext/kohyphen/*.cpp */*.cc */*.cpp -o $(podir)/koffice.pot
# rm -f kformula/symbolnames.cc
-DOXYGEN_REFERENCES = dcop kprint kdeui kparts
+DOXYGEN_REFERENCES = dcop kprint tdeui kparts
include ../admin/Doxyfile.am
diff --git a/lib/kdoc.rules b/lib/kdoc.rules
index 818da2dc..e70b58a0 100644
--- a/lib/kdoc.rules
+++ b/lib/kdoc.rules
@@ -7,14 +7,14 @@
kde_MODULES = store kofficecore kofficeui kotext
store_FILES = *.h
-store_LIBS = -lkdecore -lqt
+store_LIBS = -ltdecore -lqt
kofficecore_FILES = *.h
-kofficecore_LIBS = -lkparts -lkdecore -lqt
+kofficecore_LIBS = -lkparts -ltdecore -lqt
kofficeui_FILES = *.h
-kofficeui_LIBS = -lkofficecore -lkdeui -lkdecore -lqt
+kofficeui_LIBS = -lkofficecore -ltdeui -ltdecore -lqt
kotext_FILES = *.h
-kotext_LIBS = -lkofficecore -lkdeui -lkdecore -lqt
+kotext_LIBS = -lkofficecore -ltdeui -ltdecore -lqt
diff --git a/lib/kformula/Makefile.am b/lib/kformula/Makefile.am
index 83ba7198..eb795cc3 100644
--- a/lib/kformula/Makefile.am
+++ b/lib/kformula/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES= $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES) $(all_includes)
SUBDIRS = pics fonts dtd
#######
-# We have to name it kformulalib, not just kformula, since that's the name of the kdeinit module for kformula.
+# We have to name it kformulalib, not just kformula, since that's the name of the tdeinit module for kformula.
lib_LTLIBRARIES = libkformulalib.la
libkformulalib_la_SOURCES = basicelement.cc contextstyle.cc formulacursor.cc \
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index 5e4567de..94bc9bbb 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -1253,7 +1253,7 @@ void KoMainWindow::slotFilePrintPreview()
printer.setOutputFileName( tmpFile.name() );
int oldNumCopies = printer.numCopies();
printer.setNumCopies( 1 );
- // Disable kdeprint's own preview, we'd get two. This shows that KPrinter needs
+ // Disable tdeprint's own preview, we'd get two. This shows that KPrinter needs
// a "don't use the previous settings" mode. The current way is really too much of a hack.
TQString oldKDEPreview = printer.option( "kde-preview" );
printer.setOption( "kde-preview", "0" );
diff --git a/lib/kofficecore/Makefile.am b/lib/kofficecore/Makefile.am
index 56461115..2312578d 100644
--- a/lib/kofficecore/Makefile.am
+++ b/lib/kofficecore/Makefile.am
@@ -34,7 +34,7 @@ libkofficecore_la_SOURCES = KoDocument.cpp \
KoSpeaker.cpp KoOasisLoadingContext.cpp \
KoRect.cpp
-libkofficecore_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio
+libkofficecore_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio
include_HEADERS = KoContainerHandler.h \
KoFilter.h KoFilterChain.h \
@@ -59,7 +59,7 @@ noinst_HEADERS = KoDocument_p.h KoFilterManager_p.h \
kodocinfopropspage_la_SOURCES = KoDocInfoPropsFactory.cpp
kodocinfopropspage_la_LIBADD = ./libkofficecore.la
-kodocinfopropspage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio
+kodocinfopropspage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio
METASOURCES = AUTO
diff --git a/lib/kopainter/svgpathparser.cc b/lib/kopainter/svgpathparser.cc
index 9295cdd2..8d9375fe 100644
--- a/lib/kopainter/svgpathparser.cc
+++ b/lib/kopainter/svgpathparser.cc
@@ -405,7 +405,7 @@ SVGPathParser::parseSVG( const TQString &s, bool process )
// This works by converting the SVG arc to "simple" beziers.
// For each bezier found a svgToCurve call is done.
-// Adapted from Niko's code in kdelibs/kdecore/svgicons.
+// Adapted from Niko's code in kdelibs/tdecore/svgicons.
// Maybe this can serve in some shared lib? (Rob)
void
SVGPathParser::calculateArc(bool relative, double &curx, double &cury, double angle, double x, double y, double r1, double r2, bool largeArcFlag, bool sweepFlag)
diff --git a/lib/koproperty/test/Makefile.am b/lib/koproperty/test/Makefile.am
index 3529798c..edd3885b 100644
--- a/lib/koproperty/test/Makefile.am
+++ b/lib/koproperty/test/Makefile.am
@@ -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_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
propertytest_LDADD = $(LIB_KOPROPERTY)
# this is where the shell's XML-GUI resource file goes
diff --git a/lib/kotext/kohyphen/Makefile.am b/lib/kotext/kohyphen/Makefile.am
index e72b6a74..915423c2 100644
--- a/lib/kotext/kohyphen/Makefile.am
+++ b/lib/kotext/kohyphen/Makefile.am
@@ -18,4 +18,4 @@ check_PROGRAMS = kohyphentest
kohyphentest_SOURCES = kohyphentest.cpp
kohyphentest_LDADD = ./libkohyphen.la $(LIB_QT) $(LIB_KDECORE)
-kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
diff --git a/lib/kotext/tests/Makefile.am b/lib/kotext/tests/Makefile.am
index 826d7b93..14c6f7a0 100644
--- a/lib/kotext/tests/Makefile.am
+++ b/lib/kotext/tests/Makefile.am
@@ -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_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kobordertest_SOURCES = kobordertest.cpp
kotextformattertest_SOURCES = kotextformattertest.cpp
diff --git a/lib/kross/runner/Makefile.am b/lib/kross/runner/Makefile.am
index a30494cc..4de9bed7 100644
--- a/lib/kross/runner/Makefile.am
+++ b/lib/kross/runner/Makefile.am
@@ -6,6 +6,6 @@ bin_PROGRAMS = krossrunner
krossrunner_SOURCES = main.cpp
krossrunner_LDADD = $(LIB_QT) $(LIB_KDECORE) ../api/libkrossapi.la ../main/libkrossmain.la
INCLUDES = $(KROSS_INCLUDES) $(all_includes)
-krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
SUBDIRS = .
METASOURCES = AUTO
diff --git a/lib/kross/test/Makefile.am b/lib/kross/test/Makefile.am
index 6022adf7..04fa1c71 100644
--- a/lib/kross/test/Makefile.am
+++ b/lib/kross/test/Makefile.am
@@ -12,6 +12,6 @@ krosstest_LDADD = \
../main/libkrossmain.la
INCLUDES = $(KROSS_INCLUDES) $(all_includes)
-krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
SUBDIRS = .
METASOURCES = AUTO
diff --git a/lib/kwmf/Makefile.am b/lib/kwmf/Makefile.am
index b257f435..a7af75d4 100644
--- a/lib/kwmf/Makefile.am
+++ b/lib/kwmf/Makefile.am
@@ -2,7 +2,7 @@
INCLUDES= $(KOFFICECORE_INCLUDES) -I$(srcdir) $(all_includes)
libkwmf_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined
-# We use kdecore for kdDebug :)
+# We use tdecore for kdDebug :)
libkwmf_la_LIBADD = $(LIB_KDECORE)
####### Files