summaryrefslogtreecommitdiffstats
path: root/kword
diff options
context:
space:
mode:
Diffstat (limited to 'kword')
-rw-r--r--kword/CHANGES2
-rw-r--r--kword/KWBgSpellCheck.cpp2
-rw-r--r--kword/KWCanvas.cpp6
-rw-r--r--kword/KWConfig.cpp6
-rw-r--r--kword/KWDocument.cpp6
-rw-r--r--kword/KWView.cpp8
-rw-r--r--kword/KWView.h2
-rw-r--r--kword/KWordPartFrameSetIface.cpp2
-rw-r--r--kword/Makefile.am8
-rw-r--r--kword/demos/framestest.kwd2
-rw-r--r--kword/mailmerge/Makefile.am2
-rw-r--r--kword/mailmerge/kabc/Makefile.am2
-rw-r--r--kword/mailmerge/kspread/Makefile.am2
-rw-r--r--kword/mailmerge/sql/Makefile.am4
-rw-r--r--kword/tests/FrameTester.cpp6
-rw-r--r--kword/tests/FrameTester.h2
-rw-r--r--kword/tests/FrameViewTester.cpp6
-rw-r--r--kword/tests/FrameViewTester.h2
-rw-r--r--kword/tests/KWPageManagerTester.cpp6
-rw-r--r--kword/tests/KWPageManagerTester.h2
-rw-r--r--kword/tests/Makefile.am28
21 files changed, 53 insertions, 53 deletions
diff --git a/kword/CHANGES b/kword/CHANGES
index 2b974a22..d39ef9f3 100644
--- a/kword/CHANGES
+++ b/kword/CHANGES
@@ -40,7 +40,7 @@ Changes after KWord-1.3
- Reorganized and simplified GUI of the configuration dialog
- Support for "protect content" in all types of framesets
- Support for different run-around-gaps on every side of the frame
-- Use kspell2
+- Use tdespell2
- Copy/paste between kword/kpresenter
- Add statistic variable
diff --git a/kword/KWBgSpellCheck.cpp b/kword/KWBgSpellCheck.cpp
index e1f0cf8e..53e74d02 100644
--- a/kword/KWBgSpellCheck.cpp
+++ b/kword/KWBgSpellCheck.cpp
@@ -27,7 +27,7 @@
#include "KoTextIterator.h"
#include "KoTextObject.h"
-#include <kspell2/broker.h>
+#include <tdespell2/broker.h>
using namespace KSpell2;
#include <kdebug.h>
diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp
index 7dc7b96a..3bf00e2b 100644
--- a/kword/KWCanvas.cpp
+++ b/kword/KWCanvas.cpp
@@ -55,7 +55,7 @@
#include <kcursor.h>
#include <kdebug.h>
#include <kmessagebox.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
#include <kurl.h>
#include <kurldrag.h>
#include <kio/netaccess.h>
@@ -1516,7 +1516,7 @@ void KWCanvas::contentsDropEvent( TQDropEvent *e )
} else if ( KURLDrag::canDecode( e ) ) {
// TODO ask (with a popupmenu) between inserting a link and inserting the contents
- // TODO fix khtml to export images when dragging an image+link (as it does when using "Copy")
+ // TODO fix tdehtml to export images when dragging an image+link (as it does when using "Copy")
KURL::List lst;
KURLDrag::decode( e, lst );
@@ -1590,7 +1590,7 @@ void KWCanvas::doAutoScroll()
return;
}
- // This code comes from khtml
+ // This code comes from tdehtml
TQPoint pos( mapFromGlobal( TQCursor::pos() ) );
pos = TQPoint(pos.x() - viewport()->x(), pos.y() - viewport()->y());
diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp
index 5959d39d..e7aaff94 100644
--- a/kword/KWConfig.cpp
+++ b/kword/KWConfig.cpp
@@ -54,9 +54,9 @@
#include <KoVariable.h>
#include <kformulaconfigpage.h>
-#include <kspell2/configwidget.h>
-#include <kspell2/settings.h>
-#include <kspell2/broker.h>
+#include <tdespell2/configwidget.h>
+#include <tdespell2/settings.h>
+#include <tdespell2/broker.h>
using namespace KSpell2;
#include <float.h>
diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp
index 01236753..ece87a9a 100644
--- a/kword/KWDocument.cpp
+++ b/kword/KWDocument.cpp
@@ -76,13 +76,13 @@
#include <kdebug.h>
#include <kglobalsettings.h>
#include <klibloader.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kspell.h>
+#include <tdespell.h>
#include <kstandarddirs.h>
-#include <kspell2/settings.h>
+#include <tdespell2/settings.h>
#include <tqfileinfo.h>
#include <tqregexp.h>
diff --git a/kword/KWView.cpp b/kword/KWView.cpp
index 4197b903..0b7f6c64 100644
--- a/kword/KWView.cpp
+++ b/kword/KWView.cpp
@@ -100,7 +100,7 @@
#include <tkcoloractions.h>
#include <KoSpeaker.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/partmanager.h>
#include <kaccelgen.h>
#include <kcolordialog.h>
#include <kdebug.h>
@@ -109,7 +109,7 @@
#include <kinputdialog.h>
#include <kio/netaccess.h>
#include <kmessagebox.h>
-#include <kparts/event.h>
+#include <tdeparts/event.h>
#include <kstandarddirs.h>
#include <kstatusbar.h>
#include <kstdaccel.h>
@@ -131,8 +131,8 @@
#include <stdlib.h>
-#include <kspell2/dialog.h>
-#include <kspell2/defaultdictionary.h>
+#include <tdespell2/dialog.h>
+#include <tdespell2/defaultdictionary.h>
#include "KoSpell.h"
using namespace KSpell2;
diff --git a/kword/KWView.h b/kword/KWView.h
index 117dafdb..70d921aa 100644
--- a/kword/KWView.h
+++ b/kword/KWView.h
@@ -82,7 +82,7 @@ class KFontAction;
class TQResizeEvent;
class TQSplitter;
-#include <kspell2/broker.h>
+#include <tdespell2/broker.h>
namespace KSpell2 {
class Dialog;
}
diff --git a/kword/KWordPartFrameSetIface.cpp b/kword/KWordPartFrameSetIface.cpp
index fa2acefe..ea88e8bb 100644
--- a/kword/KWordPartFrameSetIface.cpp
+++ b/kword/KWordPartFrameSetIface.cpp
@@ -24,7 +24,7 @@
#include "KWCanvas.h"
#include <kapplication.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/partmanager.h>
#include <dcopclient.h>
KWordPartFrameSetIface::KWordPartFrameSetIface( KWPartFrameSet *fs )
diff --git a/kword/Makefile.am b/kword/Makefile.am
index 1b89a714..58f3bf4c 100644
--- a/kword/Makefile.am
+++ b/kword/Makefile.am
@@ -9,7 +9,7 @@ lib_LTLIBRARIES = libkwmailmerge_interface.la libkwordprivate.la
## The part
libkwordpart_la_SOURCES = KWFactoryInit.cpp
-libkwordpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+libkwordpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
libkwordpart_la_LIBADD = $(KOFFICE_LIBS) libkwordprivate.la
## A lib with all the code
@@ -54,14 +54,14 @@ libkwordprivate_la_SOURCES = KWTableFrameSet.cpp KWCanvas.cpp KWFrame.cpp KWForm
KWLoadingInfo.cpp
-libkwordprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts $(LIBKSPELL2)
+libkwordprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts $(LIBKSPELL2)
libkwordprivate_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOTEXT) ../lib/kformula/libkformulalib.la ./libkwmailmerge_interface.la
METASOURCES = AUTO
## The mailmerge interface library
libkwmailmerge_interface_la_SOURCES = KWMailMergeDataSource.cpp KWMailMergeDataSource.skel
-libkwmailmerge_interface_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+libkwmailmerge_interface_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
libkwmailmerge_interface_la_LIBADD = $(KOFFICE_LIBS) $(LIB_QT) -lDCOP
twincludedir = $(includedir)/kword
twinclude_HEADERS = KWMailMergeDataSource.h
@@ -73,7 +73,7 @@ kwmailmerge_servicetypedir=$(kde_servicetypesdir)
tdeinit_LTLIBRARIES = kword.la
bin_PROGRAMS =
kword_la_SOURCES = main.cpp
-kword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
kword_la_LIBADD = $(KOFFICE_LIBS)
xdg_apps_DATA = kword.desktop
diff --git a/kword/demos/framestest.kwd b/kword/demos/framestest.kwd
index c9e7fb03..c766448a 100644
--- a/kword/demos/framestest.kwd
+++ b/kword/demos/framestest.kwd
@@ -279,7 +279,7 @@
</LAYOUT>
</PARAGRAPH>
<PARAGRAPH>
- <TEXT>kparts: found Plugin ::(formatting): KWTextFrameSet::formatMore finished</TEXT>
+ <TEXT>tdeparts: found Plugin ::(formatting): KWTextFrameSet::formatMore finished</TEXT>
<LAYOUT>
<NAME value="Standard" />
<FLOW align="left" />
diff --git a/kword/mailmerge/Makefile.am b/kword/mailmerge/Makefile.am
index ccc86c55..4f4e1cb8 100644
--- a/kword/mailmerge/Makefile.am
+++ b/kword/mailmerge/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kwmailmerge_classic.la
## Plugin encapsulating the (old) internally stored style
kwmailmerge_classic_la_SOURCES = KWClassicSerialDataSource.cpp
-kwmailmerge_classic_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kwmailmerge_classic_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
kwmailmerge_classic_la_LIBADD = $(KOFFICE_LIBS) ../libkwmailmerge_interface.la $(LIB_TDEUI) $(LIB_KOTEXT)
METASOURCES = AUTO
diff --git a/kword/mailmerge/kabc/Makefile.am b/kword/mailmerge/kabc/Makefile.am
index d5a8535a..95b126b1 100644
--- a/kword/mailmerge/kabc/Makefile.am
+++ b/kword/mailmerge/kabc/Makefile.am
@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kwmailmerge_kabc.la
## Plugin encapsulating the QT SQL database interface
kwmailmerge_kabc_la_SOURCES = KWMailMergeKABC.cpp KWMailMergeKABCConfig.cpp addresspicker.ui
-kwmailmerge_kabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kwmailmerge_kabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
kwmailmerge_kabc_la_LIBADD = $(KOFFICE_LIBS) ../../libkwmailmerge_interface.la $(LIB_TDEUI) $(LIB_KABC)
METASOURCES = AUTO
diff --git a/kword/mailmerge/kspread/Makefile.am b/kword/mailmerge/kspread/Makefile.am
index 04bb0b15..65107707 100644
--- a/kword/mailmerge/kspread/Makefile.am
+++ b/kword/mailmerge/kspread/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES) \
kde_module_LTLIBRARIES = kwmailmerge_kspread.la
kwmailmerge_kspread_la_SOURCES = kwmailmerge_kspread.cpp kwmailmerge_kspread_config.cpp
-kwmailmerge_kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kwmailmerge_kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
kwmailmerge_kspread_la_LIBADD = $(KOFFICE_LIBS) ../../libkwmailmerge_interface.la \
$(top_builddir)/kspread/libkspreadcommon.la $(LIB_TDEUI)
diff --git a/kword/mailmerge/sql/Makefile.am b/kword/mailmerge/sql/Makefile.am
index 082ddc38..effde738 100644
--- a/kword/mailmerge/sql/Makefile.am
+++ b/kword/mailmerge/sql/Makefile.am
@@ -6,13 +6,13 @@ kde_module_LTLIBRARIES = kwmailmerge_qtsqldb.la kwmailmerge_qtsqldb_power.la
## Plugin encapsulating the QT SQL database interface
kwmailmerge_qtsqldb_la_SOURCES = KWQtSqlSerialDataSource.cpp qtsqldatasourceeditor.ui \
KWQtSqlEasyFilter.cpp
-kwmailmerge_qtsqldb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kwmailmerge_qtsqldb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
kwmailmerge_qtsqldb_la_LIBADD = $(KOFFICE_LIBS) libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_TDEUI)
kwmailmerge_qtsqldb_la_COMPILE_FIRST = qtsqlopenwidget.h
## 2. Plugin encapsulating the QT SQL database interface
kwmailmerge_qtsqldb_power_la_SOURCES = KWQtSqlPowerSerialDataSource.cpp kwqtsqlpower.ui KWQtSqlPowerSerialDataSource.skel
-kwmailmerge_qtsqldb_power_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kwmailmerge_qtsqldb_power_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
kwmailmerge_qtsqldb_power_la_LIBADD = $(KOFFICE_LIBS) libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_TDEUI)
kwmailmerge_qtsqldb_power_la_COMPILE_FIRST = qtsqlopenwidget.h
diff --git a/kword/tests/FrameTester.cpp b/kword/tests/FrameTester.cpp
index 9486f05d..80848716 100644
--- a/kword/tests/FrameTester.cpp
+++ b/kword/tests/FrameTester.cpp
@@ -19,13 +19,13 @@
#include <KWFrame.h>
#include <KWFrameList.h>
#include <KWDocument.h>
-#include <kunittest/runner.h>
-#include <kunittest/module.h>
+#include <tdeunittest/runner.h>
+#include <tdeunittest/module.h>
#include <tqapplication.h>
using namespace KUnitTest;
-KUNITTEST_MODULE(kunittest_FrameTester, "Frame Tester");
+KUNITTEST_MODULE(tdeunittest_FrameTester, "Frame Tester");
KUNITTEST_MODULE_REGISTER_TESTER(KWFrameTester);
void KWFrameTester::allTests() {
diff --git a/kword/tests/FrameTester.h b/kword/tests/FrameTester.h
index 5f9432f9..2861200a 100644
--- a/kword/tests/FrameTester.h
+++ b/kword/tests/FrameTester.h
@@ -15,7 +15,7 @@
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
#include <KWFrameSet.h>
#include <KWTextFrameSet.h>
diff --git a/kword/tests/FrameViewTester.cpp b/kword/tests/FrameViewTester.cpp
index e3444bd5..e438188d 100644
--- a/kword/tests/FrameViewTester.cpp
+++ b/kword/tests/FrameViewTester.cpp
@@ -15,8 +15,8 @@
* the Free Software 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 <kdebug.h>
#include "FrameViewTester.h"
@@ -30,7 +30,7 @@
using namespace KUnitTest;
-KUNITTEST_MODULE(kunittest_FrameViewTester, "FrameView Tester");
+KUNITTEST_MODULE(tdeunittest_FrameViewTester, "FrameView Tester");
KUNITTEST_MODULE_REGISTER_TESTER(KWFrameViewTester);
void KWFrameViewTester::allTests() {
diff --git a/kword/tests/FrameViewTester.h b/kword/tests/FrameViewTester.h
index dceb3835..beff2396 100644
--- a/kword/tests/FrameViewTester.h
+++ b/kword/tests/FrameViewTester.h
@@ -15,7 +15,7 @@
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
class KWFrameViewTester : public KUnitTest::Tester {
public:
diff --git a/kword/tests/KWPageManagerTester.cpp b/kword/tests/KWPageManagerTester.cpp
index 9b261d90..98a82233 100644
--- a/kword/tests/KWPageManagerTester.cpp
+++ b/kword/tests/KWPageManagerTester.cpp
@@ -15,8 +15,8 @@
* the Free Software 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 <kdebug.h>
#include "KWPageManagerTester.h"
@@ -26,7 +26,7 @@
using namespace KUnitTest;
-KUNITTEST_MODULE(kunittest_KWPageManagerTester, "PageManager Tester");
+KUNITTEST_MODULE(tdeunittest_KWPageManagerTester, "PageManager Tester");
KUNITTEST_MODULE_REGISTER_TESTER(KWPageManagerTester);
void KWPageManagerTester::allTests() {
diff --git a/kword/tests/KWPageManagerTester.h b/kword/tests/KWPageManagerTester.h
index 2136bdc4..3b52bf5e 100644
--- a/kword/tests/KWPageManagerTester.h
+++ b/kword/tests/KWPageManagerTester.h
@@ -15,7 +15,7 @@
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
class KWPageManagerTester : public KUnitTest::Tester {
public:
diff --git a/kword/tests/Makefile.am b/kword/tests/Makefile.am
index 5b316ce7..3a362b3b 100644
--- a/kword/tests/Makefile.am
+++ b/kword/tests/Makefile.am
@@ -4,22 +4,22 @@ INCLUDES = $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES) $(all_includes)
# The check_ target makes sure we don't install the modules,
# $(KDE_CHECK_PLUGIN) assures a shared library is created.
-check_LTLIBRARIES = kunittest_KWPageManagerTester.la \
- kunittest_FrameTester.la \
- kunittest_FrameViewTester.la
+check_LTLIBRARIES = tdeunittest_KWPageManagerTester.la \
+ tdeunittest_FrameTester.la \
+ tdeunittest_FrameViewTester.la
-kunittest_KWPageManagerTester_la_SOURCES = KWPageManagerTester.cpp
-kunittest_KWPageManagerTester_la_LIBADD = -lkunittest ../libkwordprivate.la
-kunittest_KWPageManagerTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+tdeunittest_KWPageManagerTester_la_SOURCES = KWPageManagerTester.cpp
+tdeunittest_KWPageManagerTester_la_LIBADD = -ltdeunittest ../libkwordprivate.la
+tdeunittest_KWPageManagerTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
-kunittest_FrameTester_la_SOURCES = FrameTester.cpp
-kunittest_FrameTester_la_LIBADD = -lkunittest ../libkwordprivate.la
-kunittest_FrameTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+tdeunittest_FrameTester_la_SOURCES = FrameTester.cpp
+tdeunittest_FrameTester_la_LIBADD = -ltdeunittest ../libkwordprivate.la
+tdeunittest_FrameTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
-kunittest_FrameViewTester_la_SOURCES = FrameViewTester.cpp
-kunittest_FrameViewTester_la_LIBADD = -lkunittest ../libkwordprivate.la
-kunittest_FrameViewTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+tdeunittest_FrameViewTester_la_SOURCES = FrameViewTester.cpp
+tdeunittest_FrameViewTester_la_LIBADD = -ltdeunittest ../libkwordprivate.la
+tdeunittest_FrameViewTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
-check-local: kunittest_KWPageManagerTester.la kunittest_FrameTester.la kunittest_FrameViewTester.la
- kunittestmodrunner 2>&1 | perl $(srcdir)/checkFilter.pl
+check-local: tdeunittest_KWPageManagerTester.la tdeunittest_FrameTester.la tdeunittest_FrameViewTester.la
+ tdeunittestmodrunner 2>&1 | perl $(srcdir)/checkFilter.pl