summaryrefslogtreecommitdiffstats
path: root/kexi/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/plugins')
-rw-r--r--kexi/plugins/forms/Makefile.am6
-rw-r--r--kexi/plugins/importexport/csv/Makefile.am2
-rw-r--r--kexi/plugins/macros/Makefile.am2
-rw-r--r--kexi/plugins/macros/configure.in.in16
-rw-r--r--kexi/plugins/macros/tests/Makefile.am16
-rw-r--r--kexi/plugins/macros/tests/actiontests.cpp2
-rw-r--r--kexi/plugins/macros/tests/actiontests.h2
-rw-r--r--kexi/plugins/macros/tests/commontests.cpp2
-rw-r--r--kexi/plugins/macros/tests/commontests.h2
-rw-r--r--kexi/plugins/macros/tests/komacrotest.cpp2
-rw-r--r--kexi/plugins/macros/tests/komacrotestgui.cpp2
-rw-r--r--kexi/plugins/macros/tests/macroitemtests.cpp2
-rw-r--r--kexi/plugins/macros/tests/macroitemtests.h2
-rw-r--r--kexi/plugins/macros/tests/macrotests.cpp2
-rw-r--r--kexi/plugins/macros/tests/macrotests.h2
-rw-r--r--kexi/plugins/macros/tests/testobject.h2
-rw-r--r--kexi/plugins/macros/tests/variabletests.cpp2
-rw-r--r--kexi/plugins/macros/tests/variabletests.h2
-rw-r--r--kexi/plugins/macros/tests/xmlhandlertests.cpp2
-rw-r--r--kexi/plugins/macros/tests/xmlhandlertests.h2
-rw-r--r--kexi/plugins/macros/tests/xmlhandlertests2.cpp2
-rw-r--r--kexi/plugins/macros/tests/xmlhandlertests2.h2
-rw-r--r--kexi/plugins/migration/Makefile.am2
-rw-r--r--kexi/plugins/queries/Makefile.am2
-rw-r--r--kexi/plugins/relations/Makefile.am2
-rw-r--r--kexi/plugins/scripting/kexiscripting/Makefile.am2
-rw-r--r--kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp4
-rw-r--r--kexi/plugins/tables/Makefile.am2
28 files changed, 45 insertions, 45 deletions
diff --git a/kexi/plugins/forms/Makefile.am b/kexi/plugins/forms/Makefile.am
index 7d6d0777..c9db7000 100644
--- a/kexi/plugins/forms/Makefile.am
+++ b/kexi/plugins/forms/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kexihandler_form.la kformdesigner_kexidbwidgets.la
kexihandler_form_la_SOURCES = kexiforms.cpp
-kexihandler_form_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kexihandler_form_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
kexihandler_form_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexicore.la \
$(top_builddir)/kexi/widget/utils/libkexiguiutils.la \
$(top_builddir)/kexi/widget/tableview/libkexidatatable.la \
@@ -18,7 +18,7 @@ kexihandler_form_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexico
../../../kexi/widget/utils/libkexiguiutils.la
-kformdesigner_kexidbwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kformdesigner_kexidbwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
kformdesigner_kexidbwidgets_la_SOURCES = kexidbfactory.cpp
kformdesigner_kexidbwidgets_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/formeditor/libkformdesigner.la \
$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
@@ -34,7 +34,7 @@ libkexiformutils_la_SOURCES = kexiformdataiteminterface.cpp kexidataawarewidgeti
kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \
kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \
kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp
-libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
libkexiformutils_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexicore.la \
$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
$(top_builddir)/kexi/formeditor/libkformdesigner.la \
diff --git a/kexi/plugins/importexport/csv/Makefile.am b/kexi/plugins/importexport/csv/Makefile.am
index dba9018b..d9c73cd3 100644
--- a/kexi/plugins/importexport/csv/Makefile.am
+++ b/kexi/plugins/importexport/csv/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kexihandler_csv_importexport.la
kexihandler_csv_importexport_la_SOURCES = kexicsv_importexportpart.cpp kexicsvimportdialog.cpp \
kexicsvimportoptionsdlg.cpp kexicsvwidgets.cpp kexicsvexport.cpp kexicsvexportwizard.cpp
-kexihandler_csv_importexport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kexihandler_csv_importexport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
kexihandler_csv_importexport_la_LIBADD = $(KOFFICE_LIBS) ../../../core/libkexicore.la \
../../../migration/libkeximigrate.la \
../../../../kexi/kexidb/libkexidb.la \
diff --git a/kexi/plugins/macros/Makefile.am b/kexi/plugins/macros/Makefile.am
index cf5fb0d4..b8fcc25d 100644
--- a/kexi/plugins/macros/Makefile.am
+++ b/kexi/plugins/macros/Makefile.am
@@ -1,4 +1,4 @@
-if include_kunittest
+if include_tdeunittest
# Unittest is disabled per default.
# TESTSDIR = tests
diff --git a/kexi/plugins/macros/configure.in.in b/kexi/plugins/macros/configure.in.in
index 52fb9f5a..44d348b8 100644
--- a/kexi/plugins/macros/configure.in.in
+++ b/kexi/plugins/macros/configure.in.in
@@ -1,13 +1,13 @@
-# Check for kunittest
-AC_MSG_CHECKING([for kunittest])
+# Check for tdeunittest
+AC_MSG_CHECKING([for tdeunittest])
# First we check if the console unittester could be compiled
-have_kunittest_header="no"
-KDE_CHECK_HEADER(kunittest/tester.h, have_kunittest_header="yes", , )
-AM_CONDITIONAL(include_kunittest, test "$have_kunittest_header" = "yes")
+have_tdeunittest_header="no"
+KDE_CHECK_HEADER(tdeunittest/tester.h, have_tdeunittest_header="yes", , )
+AM_CONDITIONAL(include_tdeunittest, test "$have_tdeunittest_header" = "yes")
# Second we check if the GUI-unittester could be compiled
-have_kunittestgui_header="no"
-KDE_CHECK_HEADER(kunittest/runnergui.h, have_kunittestgui_header="yes", , )
-AM_CONDITIONAL(include_kunittestgui, test "$have_kunittestgui_header" = "yes")
+have_tdeunittestgui_header="no"
+KDE_CHECK_HEADER(tdeunittest/runnergui.h, have_tdeunittestgui_header="yes", , )
+AM_CONDITIONAL(include_tdeunittestgui, test "$have_tdeunittestgui_header" = "yes")
diff --git a/kexi/plugins/macros/tests/Makefile.am b/kexi/plugins/macros/tests/Makefile.am
index adb6a4d3..0206386a 100644
--- a/kexi/plugins/macros/tests/Makefile.am
+++ b/kexi/plugins/macros/tests/Makefile.am
@@ -1,4 +1,4 @@
-if include_kunittestgui
+if include_tdeunittestgui
GUIBINPROGRAM = komacrotestgui
else
GUIBINPROGRAM =
@@ -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) -lktexteditor
-komacrotest_LDADD = -lkunittest ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_KPARTS)
+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)
-if include_kunittestgui
+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) -lktexteditor
- komacrotestgui_LDADD = -lkunittestgui ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_KPARTS)
+ 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)
endif
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
@@ -21,8 +21,8 @@ INCLUDES = -I$(srcdir)/tests -I$(srcdir)../ $(all_includes)
METASOURCES = AUTO
guicheck: komacrotestgui
- kunittest ./komacrotestgui
+ tdeunittest ./komacrotestgui
check: komacrotest
echo $(srcdir)
- kunittest ./komacrotest
+ tdeunittest ./komacrotest
diff --git a/kexi/plugins/macros/tests/actiontests.cpp b/kexi/plugins/macros/tests/actiontests.cpp
index 65bebe66..26e38b32 100644
--- a/kexi/plugins/macros/tests/actiontests.cpp
+++ b/kexi/plugins/macros/tests/actiontests.cpp
@@ -38,7 +38,7 @@
#include <tqdom.h>
#include <kdebug.h>
-#include <kunittest/runner.h>
+#include <tdeunittest/runner.h>
#include <kxmlguiclient.h>
using namespace KUnitTest;
diff --git a/kexi/plugins/macros/tests/actiontests.h b/kexi/plugins/macros/tests/actiontests.h
index fe3fb21d..91576ea3 100644
--- a/kexi/plugins/macros/tests/actiontests.h
+++ b/kexi/plugins/macros/tests/actiontests.h
@@ -20,7 +20,7 @@
#ifndef KOMACROTEST_ACTIONTESTS_H
#define KOMACROTEST_ACTIONTESTS_H
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
namespace KoMacroTest {
diff --git a/kexi/plugins/macros/tests/commontests.cpp b/kexi/plugins/macros/tests/commontests.cpp
index bdc2e6ad..41234eca 100644
--- a/kexi/plugins/macros/tests/commontests.cpp
+++ b/kexi/plugins/macros/tests/commontests.cpp
@@ -40,7 +40,7 @@
#include <tqdom.h>
#include <kdebug.h>
-#include <kunittest/runner.h>
+#include <tdeunittest/runner.h>
#include <kxmlguiclient.h>
using namespace KUnitTest;
diff --git a/kexi/plugins/macros/tests/commontests.h b/kexi/plugins/macros/tests/commontests.h
index e72408b7..170974bc 100644
--- a/kexi/plugins/macros/tests/commontests.h
+++ b/kexi/plugins/macros/tests/commontests.h
@@ -20,7 +20,7 @@
#ifndef KOMACROTEST_COMMONTESTS_H
#define KOMACROTEST_COMMONTESTS_H
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
namespace KoMacroTest {
diff --git a/kexi/plugins/macros/tests/komacrotest.cpp b/kexi/plugins/macros/tests/komacrotest.cpp
index 33e53eb8..15fc9db1 100644
--- a/kexi/plugins/macros/tests/komacrotest.cpp
+++ b/kexi/plugins/macros/tests/komacrotest.cpp
@@ -20,7 +20,7 @@
#include <kapplication.h>
#include <kcmdlineargs.h>
#include <klocale.h>
-#include <kunittest/runner.h>
+#include <tdeunittest/runner.h>
static const char description[] =
I18N_NOOP("KoMacroTester");
diff --git a/kexi/plugins/macros/tests/komacrotestgui.cpp b/kexi/plugins/macros/tests/komacrotestgui.cpp
index 95c019f8..d651aa01 100644
--- a/kexi/plugins/macros/tests/komacrotestgui.cpp
+++ b/kexi/plugins/macros/tests/komacrotestgui.cpp
@@ -21,7 +21,7 @@
#include <kcmdlineargs.h>
#include <klocale.h>
-#include "kunittest/runnergui.h"
+#include "tdeunittest/runnergui.h"
static const char description[] =
I18N_NOOP("KoMacroTestgui.");
diff --git a/kexi/plugins/macros/tests/macroitemtests.cpp b/kexi/plugins/macros/tests/macroitemtests.cpp
index 47b93b0f..0ac780b0 100644
--- a/kexi/plugins/macros/tests/macroitemtests.cpp
+++ b/kexi/plugins/macros/tests/macroitemtests.cpp
@@ -36,7 +36,7 @@
#include <tqdom.h>
#include <kdebug.h>
-#include <kunittest/runner.h>
+#include <tdeunittest/runner.h>
#include <kxmlguiclient.h>
using namespace KUnitTest;
diff --git a/kexi/plugins/macros/tests/macroitemtests.h b/kexi/plugins/macros/tests/macroitemtests.h
index 902ef91e..6cd6cf8f 100644
--- a/kexi/plugins/macros/tests/macroitemtests.h
+++ b/kexi/plugins/macros/tests/macroitemtests.h
@@ -20,7 +20,7 @@
#ifndef KOMACROTEST_ACTIONTESTS_H
#define KOMACROTEST_ACTIONTESTS_H
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
namespace KoMacroTest {
diff --git a/kexi/plugins/macros/tests/macrotests.cpp b/kexi/plugins/macros/tests/macrotests.cpp
index 45f77efd..d5d2c2af 100644
--- a/kexi/plugins/macros/tests/macrotests.cpp
+++ b/kexi/plugins/macros/tests/macrotests.cpp
@@ -38,7 +38,7 @@
#include <tqdom.h>
#include <kdebug.h>
-#include <kunittest/runner.h>
+#include <tdeunittest/runner.h>
#include <kxmlguiclient.h>
using namespace KUnitTest;
diff --git a/kexi/plugins/macros/tests/macrotests.h b/kexi/plugins/macros/tests/macrotests.h
index 49d50ad5..e1a61ba5 100644
--- a/kexi/plugins/macros/tests/macrotests.h
+++ b/kexi/plugins/macros/tests/macrotests.h
@@ -20,7 +20,7 @@
#ifndef KOMACROTEST_MACROTESTS_H
#define KOMACROTEST_MACROTESTS_H
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
namespace KoMacroTest {
diff --git a/kexi/plugins/macros/tests/testobject.h b/kexi/plugins/macros/tests/testobject.h
index 99b59da2..81309d99 100644
--- a/kexi/plugins/macros/tests/testobject.h
+++ b/kexi/plugins/macros/tests/testobject.h
@@ -21,7 +21,7 @@
#define KOMACROTEST_TESTOBJECT_H
#include <tqobject.h>
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
namespace KoMacroTest {
diff --git a/kexi/plugins/macros/tests/variabletests.cpp b/kexi/plugins/macros/tests/variabletests.cpp
index 5035f929..c9724639 100644
--- a/kexi/plugins/macros/tests/variabletests.cpp
+++ b/kexi/plugins/macros/tests/variabletests.cpp
@@ -38,7 +38,7 @@
#include <tqdom.h>
#include <kdebug.h>
-#include <kunittest/runner.h>
+#include <tdeunittest/runner.h>
#include <kxmlguiclient.h>
using namespace KUnitTest;
diff --git a/kexi/plugins/macros/tests/variabletests.h b/kexi/plugins/macros/tests/variabletests.h
index e6474a5a..65c07f77 100644
--- a/kexi/plugins/macros/tests/variabletests.h
+++ b/kexi/plugins/macros/tests/variabletests.h
@@ -20,7 +20,7 @@
#ifndef KOMACROTEST_VARIABLETESTS_H
#define KOMACROTEST_VARIABLETESTS_H
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
namespace KoMacroTest {
diff --git a/kexi/plugins/macros/tests/xmlhandlertests.cpp b/kexi/plugins/macros/tests/xmlhandlertests.cpp
index 90454d35..9627a00b 100644
--- a/kexi/plugins/macros/tests/xmlhandlertests.cpp
+++ b/kexi/plugins/macros/tests/xmlhandlertests.cpp
@@ -32,7 +32,7 @@
#include <tqdom.h>
#include <kdebug.h>
-#include <kunittest/runner.h>
+#include <tdeunittest/runner.h>
#include <kxmlguiclient.h>
using namespace KUnitTest;
diff --git a/kexi/plugins/macros/tests/xmlhandlertests.h b/kexi/plugins/macros/tests/xmlhandlertests.h
index 12d2d057..521f9ee5 100644
--- a/kexi/plugins/macros/tests/xmlhandlertests.h
+++ b/kexi/plugins/macros/tests/xmlhandlertests.h
@@ -19,7 +19,7 @@
#ifndef KOMACROTEST_XMLHandlerTests_H
#define KOMACROTEST_XMLHandlerTests_H
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
#include "../lib/macro.h"
namespace KoMacroTest {
diff --git a/kexi/plugins/macros/tests/xmlhandlertests2.cpp b/kexi/plugins/macros/tests/xmlhandlertests2.cpp
index f32416c0..cc38c077 100644
--- a/kexi/plugins/macros/tests/xmlhandlertests2.cpp
+++ b/kexi/plugins/macros/tests/xmlhandlertests2.cpp
@@ -32,7 +32,7 @@
#include <tqdom.h>
#include <kdebug.h>
-#include <kunittest/runner.h>
+#include <tdeunittest/runner.h>
#include <kxmlguiclient.h>
using namespace KUnitTest;
diff --git a/kexi/plugins/macros/tests/xmlhandlertests2.h b/kexi/plugins/macros/tests/xmlhandlertests2.h
index 49431b73..376d7b08 100644
--- a/kexi/plugins/macros/tests/xmlhandlertests2.h
+++ b/kexi/plugins/macros/tests/xmlhandlertests2.h
@@ -19,7 +19,7 @@
#ifndef KOMACROTEST_XMLHandlerTests2_H
#define KOMACROTEST_XMLHandlerTests2_H
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
#include "../lib/macro.h"
namespace KoMacroTest {
diff --git a/kexi/plugins/migration/Makefile.am b/kexi/plugins/migration/Makefile.am
index 2d92873d..525b5925 100644
--- a/kexi/plugins/migration/Makefile.am
+++ b/kexi/plugins/migration/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kexihandler_migration.la
kexihandler_migration_la_SOURCES = keximigrationpart.cpp
-kexihandler_migration_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kexihandler_migration_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
kexihandler_migration_la_LIBADD = $(KOFFICE_LIBS) ../../core/libkexicore.la \
../../migration/libkeximigrate.la \
../../../kexi/kexidb/libkexidb.la \
diff --git a/kexi/plugins/queries/Makefile.am b/kexi/plugins/queries/Makefile.am
index 5dbb14f6..48328f08 100644
--- a/kexi/plugins/queries/Makefile.am
+++ b/kexi/plugins/queries/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kexihandler_query.la
kexihandler_query_la_SOURCES = kexiquerypart.cpp kexiquerydesignersql.cpp \
kexiquerydesignersqlhistory.cpp kexiquerydesignerguieditor.cpp \
kexiqueryview.cpp
-kexihandler_query_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kexihandler_query_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
kexihandler_query_la_LIBADD = $(KOFFICE_LIBS) ../../core/libkexicore.la \
$(top_builddir)/kexi/kexidb/libkexidb.la \
$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
diff --git a/kexi/plugins/relations/Makefile.am b/kexi/plugins/relations/Makefile.am
index 779b47e3..f39f43b3 100644
--- a/kexi/plugins/relations/Makefile.am
+++ b/kexi/plugins/relations/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kexihandler_relation.la
kexihandler_relation_la_SOURCES = kexirelationpartimpl.cpp \
kexirelationmaindlg.cpp
-kexihandler_relation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kexihandler_relation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
kexihandler_relation_la_LIBADD = $(KOFFICE_LIBS) ../../core/libkexicore.la \
../../widget/relations/libkexirelationsview.la \
../../../kexi/kexidb/libkexidb.la \
diff --git a/kexi/plugins/scripting/kexiscripting/Makefile.am b/kexi/plugins/scripting/kexiscripting/Makefile.am
index 6b857e74..79fadf34 100644
--- a/kexi/plugins/scripting/kexiscripting/Makefile.am
+++ b/kexi/plugins/scripting/kexiscripting/Makefile.am
@@ -7,7 +7,7 @@ kexihandler_script_la_SOURCES = \
kexihandler_script_la_LDFLAGS = \
$(KDE_PLUGIN) -module -no-undefined -Wnounresolved $(all_libraries) $(VER_INFO) \
- -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+ -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
kexihandler_script_la_LIBADD = $(KOFFICE_LIBS) \
$(top_builddir)/lib/kross/main/libkrossmain.la \
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
index 08820522..110000aa 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
@@ -25,9 +25,9 @@
#include <kross/main/scriptaction.h>
#include <kdebug.h>
-//#include <kparts/factory.h>
+//#include <tdeparts/factory.h>
//#include <klibloader.h>
-//#include <kmdimainfrm.h>
+//#include <tdemdimainfrm.h>
//#include <kmainwindow.h>
#include <kpopupmenu.h>
diff --git a/kexi/plugins/tables/Makefile.am b/kexi/plugins/tables/Makefile.am
index eb388397..4fdedb34 100644
--- a/kexi/plugins/tables/Makefile.am
+++ b/kexi/plugins/tables/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kexihandler_table.la
kexihandler_table_la_SOURCES = kexitablepart.cpp kexitabledesignerview.cpp kexitabledesignerview_p.cpp \
kexitabledesigner_dataview.cpp kexitabledesignercommands.cpp kexilookupcolumnpage.cpp
-kexihandler_table_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lkmdi
+kexihandler_table_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -ltdemdi
kexihandler_table_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexicore.la \
$(top_builddir)/kexi/kexidb/libkexidb.la \
$(top_builddir)/kexi/widget/tableview/libkexidatatable.la \