diff options
Diffstat (limited to 'kexi')
58 files changed, 95 insertions, 95 deletions
diff --git a/kexi/configure.in.in b/kexi/configure.in.in index 9e74cf35..4930b78d 100644 --- a/kexi/configure.in.in +++ b/kexi/configure.in.in @@ -1,5 +1,5 @@ #KEXI_VERSION= -AC_SUBST(LIB_KEXI_KMDI, '-lkmdi') +AC_SUBST(LIB_KEXI_KMDI, '-ltdemdi') AC_SUBST(LIB_KEXI_KMDI_INCLUDES, '') diff --git a/kexi/core/kexidialogbase.h b/kexi/core/kexidialogbase.h index e9bc8018..cf455885 100644 --- a/kexi/core/kexidialogbase.h +++ b/kexi/core/kexidialogbase.h @@ -28,7 +28,7 @@ #include <tqguardedptr.h> -#include <kmdichildview.h> +#include <tdemdichildview.h> #include <kxmlguiclient.h> class TQWidgetStack; diff --git a/kexi/core/kexiinternalpart.cpp b/kexi/core/kexiinternalpart.cpp index 49b3c46d..0cfce53b 100644 --- a/kexi/core/kexiinternalpart.cpp +++ b/kexi/core/kexiinternalpart.cpp @@ -31,7 +31,7 @@ #include <klibloader.h> #include <klocale.h> #include <ktrader.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kexidb/msghandler.h> //! @internal diff --git a/kexi/core/keximainwindow.h b/kexi/core/keximainwindow.h index e03fa328..4dbb6b18 100644 --- a/kexi/core/keximainwindow.h +++ b/kexi/core/keximainwindow.h @@ -24,7 +24,7 @@ #include <tqmap.h> #include <tqintdict.h> -#include <kmdimainfrm.h> +#include <tdemdimainfrm.h> #include <kexiutils/tristate.h> #include "kexisharedactionhost.h" diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp index 1247c9c0..ce9dcbe1 100644 --- a/kexi/core/kexipartmanager.cpp +++ b/kexi/core/kexipartmanager.cpp @@ -22,7 +22,7 @@ #include <ktrader.h> #include <kdebug.h> #include <kconfig.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include "kexipartmanager.h" #include "kexipart.h" diff --git a/kexi/doc/dev/CHANGELOG-Kexi-js b/kexi/doc/dev/CHANGELOG-Kexi-js index 8654e145..301da925 100755 --- a/kexi/doc/dev/CHANGELOG-Kexi-js +++ b/kexi/doc/dev/CHANGELOG-Kexi-js @@ -4653,7 +4653,7 @@ Property Editor: ===================== Kexi 0.1 Beta 2 "Warsaw By Night" ===================== 2004-01-20 -- kmdi captions fix backported to kexi_compat +- tdemdi captions fix backported to kexi_compat - kexistartupfiledialog: we're using paths unstead urls now for better compat. 2004-01-19 @@ -4994,7 +4994,7 @@ doesn't work) 2003-12-10 - KexiMainWindow: - * "show navigator" action is auto-handled by kmdi + * "show navigator" action is auto-handled by tdemdi * fixed : pointer to current xmlgui is now cleared before closing kexidialog - KexiTableView::paintRow() fixed crash when col number was ==-1 diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js index 4a07191d..90cdebc7 100644 --- a/kexi/doc/dev/TODO-Kexi-js +++ b/kexi/doc/dev/TODO-Kexi-js @@ -723,7 +723,7 @@ TODO::::::: jstaniek dipesh: it's only within your example project... dipesh therefore column( col )->readOnly() crashes... -reuse KWallet http://events.kde.org/info/kastle/presentations/kwallet-kastle-2003.ps +reuse KWallet http://events.kde.org/info/kastle/presentations/tdewallet-kastle-2003.ps === Interesting features === - Add random names/surnames generator: http://www.ruf.rice.edu/~pound/ diff --git a/kexi/formeditor/factories/Makefile.am b/kexi/formeditor/factories/Makefile.am index dd87e8bb..ee96575b 100644 --- a/kexi/formeditor/factories/Makefile.am +++ b/kexi/formeditor/factories/Makefile.am @@ -4,12 +4,12 @@ INCLUDES = -I$(top_srcdir)/kexi -I$(top_srcdir)/kexi/formeditor \ -I$(top_srcdir)/kexi/core \ -I$(top_srcdir)/lib -I$(top_srcdir)/lib/koproperty -I$(top_srcdir)/lib/kofficecore $(all_includes) kde_module_LTLIBRARIES = kformdesigner_containers.la kformdesigner_stdwidgets.la -kformdesigner_containers_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kformdesigner_containers_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kformdesigner_containers_la_SOURCES = containerfactory.cpp kformdesigner_containers_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/formeditor/libkformdesigner.la \ ../../../lib/koproperty/libkoproperty.la -kformdesigner_stdwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kformdesigner_stdwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kformdesigner_stdwidgets_la_SOURCES = stdwidgetfactory.cpp kformdesigner_stdwidgets_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/formeditor/libkformdesigner.la \ ../../../lib/koproperty/libkoproperty.la diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h index f9899043..397afd26 100644 --- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h +++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h @@ -24,7 +24,7 @@ #include <tqpixmap.h> #include <kinterfacedesigner/designer.h> -#include <kparts/factory.h> +#include <tdeparts/factory.h> #include "form.h" diff --git a/kexi/formeditor/test/Makefile.am b/kexi/formeditor/test/Makefile.am index 53348ac6..1c022c2d 100644 --- a/kexi/formeditor/test/Makefile.am +++ b/kexi/formeditor/test/Makefile.am @@ -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) -lktexteditor +kformdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kformdesigner_LDADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la diff --git a/kexi/formeditor/test/kfd_mainwindow.h b/kexi/formeditor/test/kfd_mainwindow.h index 4d0e2f5f..5ce138df 100644 --- a/kexi/formeditor/test/kfd_mainwindow.h +++ b/kexi/formeditor/test/kfd_mainwindow.h @@ -20,7 +20,7 @@ #ifndef KFORMDESIGNER_MAINWINDOW_H #define KFORMDESIGNER_MAINWINDOW_H -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> class KFDMainWindow : public KParts::MainWindow { diff --git a/kexi/formeditor/test/kfd_part.h b/kexi/formeditor/test/kfd_part.h index b0d358ed..5ed8c8e9 100644 --- a/kexi/formeditor/test/kfd_part.h +++ b/kexi/formeditor/test/kfd_part.h @@ -23,8 +23,8 @@ #include <tqwidget.h> #include <tqpixmap.h> -#include <kparts/part.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/factory.h> #include "form.h" diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp index 559b72ff..ddbc1718 100644 --- a/kexi/formeditor/widgetlibrary.cpp +++ b/kexi/formeditor/widgetlibrary.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> #include <klocale.h> #include <klibloader.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <ktrader.h> #include <kiconloader.h> #include <kpopupmenu.h> diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp index 512bf8ad..c8c432e2 100644 --- a/kexi/kexidb/drivermanager.cpp +++ b/kexi/kexidb/drivermanager.cpp @@ -27,7 +27,7 @@ #include <kexidb/error.h> #include <klibloader.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <ktrader.h> #include <kdebug.h> #include <klocale.h> diff --git a/kexi/kexidb/drivers/mySQL/Makefile.am b/kexi/kexidb/drivers/mySQL/Makefile.am index 1678d52b..664e52b2 100644 --- a/kexi/kexidb/drivers/mySQL/Makefile.am +++ b/kexi/kexidb/drivers/mySQL/Makefile.am @@ -22,7 +22,7 @@ kexidb_mysqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) \ -lmysqlclient \ ../../libkexidb.la -kexidb_mysqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kexidb_mysqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kde_services_DATA = kexidb_mysqldriver.desktop diff --git a/kexi/kexidb/drivers/pqxx/Makefile.am b/kexi/kexidb/drivers/pqxx/Makefile.am index 38fef647..19141edf 100644 --- a/kexi/kexidb/drivers/pqxx/Makefile.am +++ b/kexi/kexidb/drivers/pqxx/Makefile.am @@ -13,7 +13,7 @@ kexidb_pqxxsqldriver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) -lpqxx kexidb_pqxxsqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) \ -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined \ - -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts + -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kde_services_DATA = kexidb_pqxxsqldriver.desktop diff --git a/kexi/kexidb/drivers/sqlite/Makefile.am b/kexi/kexidb/drivers/sqlite/Makefile.am index 2722ea1c..6b0e4875 100644 --- a/kexi/kexidb/drivers/sqlite/Makefile.am +++ b/kexi/kexidb/drivers/sqlite/Makefile.am @@ -17,7 +17,7 @@ kexidb_sqlite3driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) \ $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \ ../../../../kexi/kexiutils/libkexiutils.la -kexidb_sqlite3driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kexidb_sqlite3driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kde_services_DATA = kexidb_sqlite3driver.desktop diff --git a/kexi/kexidb/drivers/sqlite2/Makefile.am b/kexi/kexidb/drivers/sqlite2/Makefile.am index 7484a278..89dd9123 100644 --- a/kexi/kexidb/drivers/sqlite2/Makefile.am +++ b/kexi/kexidb/drivers/sqlite2/Makefile.am @@ -21,7 +21,7 @@ kexidb_sqlite2driver_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) \ $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \ ../../../../kexi/kexiutils/libkexiutils.la -kexidb_sqlite2driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kexidb_sqlite2driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kde_services_DATA = kexidb_sqlite2driver.desktop diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 4135421d..b3d36240 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -48,7 +48,7 @@ #include <kedittoolbar.h> #include <tdeversion.h> #include <kglobalsettings.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <ktip.h> #include <kstandarddirs.h> #include <kpushbutton.h> @@ -250,7 +250,7 @@ KexiMainWindowImpl::KexiMainWindowImpl() resize (kMin (s.width(), desk.width()), kMin(s.height(), desk.height())); } - setManagedDockPositionModeEnabled(true);//TODO(js): remove this if will be default in kmdi :) + setManagedDockPositionModeEnabled(true);//TODO(js): remove this if will be default in tdemdi :) manager()->setSplitterHighResolution(true); manager()->setSplitterKeepSize(true); setStandardMDIMenuEnabled(false); @@ -316,9 +316,9 @@ KexiMainWindowImpl::KexiMainWindowImpl() //disabled (possible crash) d->hideMenuItem("file", i18n("&Import"), true); //disabled (possible crash) d->hideMenuItem("help", i18n( "&Report Bug..." ), true); #endif - KAction *kmdi_tooldock_menu_action = childClients()->getFirst() ? childClients()->getFirst()->actionCollection()->action("kmdi_tooldock_menu") : 0; - if (kmdi_tooldock_menu_action) { - kmdi_tooldock_menu_action->setEnabled(false); + KAction *tdemdi_tooldock_menu_action = childClients()->getFirst() ? childClients()->getFirst()->actionCollection()->action("tdemdi_tooldock_menu") : 0; + if (tdemdi_tooldock_menu_action) { + tdemdi_tooldock_menu_action->setEnabled(false); } if (!isFakingSDIApplication()/* && !userMode()*/) { @@ -2235,7 +2235,7 @@ KexiMainWindowImpl::registerChild(KexiDialogBase *dlg) } kdDebug() << "KexiMainWindowImpl::registerChild() ID = " << dlg->id() << endl; - if (m_mdiMode==KMdi::ToplevelMode || m_mdiMode==KMdi::ChildframeMode) {//kmdi fix + if (m_mdiMode==KMdi::ToplevelMode || m_mdiMode==KMdi::ChildframeMode) {//tdemdi fix //js TODO: check if taskbar is switched in menu if (m_pTaskBar && !m_pTaskBar->isSwitchedOn()) m_pTaskBar->switchOn(true); diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp index 2245f23c..85468e1d 100644 --- a/kexi/main/kexistatusbar.cpp +++ b/kexi/main/kexistatusbar.cpp @@ -31,11 +31,11 @@ #include <kdebug.h> #include <kglobalsettings.h> #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #if KexitStatusBar_KTEXTEDITOR_USED -#include <ktexteditor/viewcursorinterface.h> -#include <ktexteditor/viewstatusmsginterface.h> +#include <tdetexteditor/viewcursorinterface.h> +#include <tdetexteditor/viewstatusmsginterface.h> #endif KexitStatusBar::KexitStatusBar(TQWidget *parent, const char *name) diff --git a/kexi/migration/Makefile.am b/kexi/migration/Makefile.am index b122af83..9f8f386d 100644 --- a/kexi/migration/Makefile.am +++ b/kexi/migration/Makefile.am @@ -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) -lktexteditor +keximigratetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp index 0cd52b4b..876a9631 100644 --- a/kexi/migration/migratemanager.cpp +++ b/kexi/migration/migratemanager.cpp @@ -24,7 +24,7 @@ #include "keximigrate.h" #include <klibloader.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <ktrader.h> #include <kdebug.h> #include <klocale.h> diff --git a/kexi/migration/mysql/Makefile.am b/kexi/migration/mysql/Makefile.am index 63b96268..9a5e38a8 100644 --- a/kexi/migration/mysql/Makefile.am +++ b/kexi/migration/mysql/Makefile.am @@ -12,7 +12,7 @@ keximigrate_mysql_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) ../libkexi ../../../kexi/kexidb/libkexidb.la \ ../../../kexi/kexiutils/libkexiutils.la -keximigrate_mysql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +keximigrate_mysql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kde_services_DATA = keximigrate_mysql.desktop diff --git a/kexi/migration/pqxx/Makefile.am b/kexi/migration/pqxx/Makefile.am index bdf76305..109ac687 100644 --- a/kexi/migration/pqxx/Makefile.am +++ b/kexi/migration/pqxx/Makefile.am @@ -14,7 +14,7 @@ keximigrate_pqxx_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KPARTS) $(LIB_QT) -lpqxx ../l ../../../kexi/kexidb/libkexidb.la \ ../../../kexi/kexiutils/libkexiutils.la -keximigrate_pqxx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +keximigrate_pqxx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts kde_services_DATA = keximigrate_pqxx.desktop 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 \ diff --git a/kexi/tests/altertable/Makefile.am b/kexi/tests/altertable/Makefile.am index 6f3d47df..4de0b396 100644 --- a/kexi/tests/altertable/Makefile.am +++ b/kexi/tests/altertable/Makefile.am @@ -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) -lktexteditor +kexialtertabletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor diff --git a/kexi/tests/newapi/Makefile.am b/kexi/tests/newapi/Makefile.am index 85eeab32..75b0c615 100644 --- a/kexi/tests/newapi/Makefile.am +++ b/kexi/tests/newapi/Makefile.am @@ -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) -lktexteditor +kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +#kexidbmysqlcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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) -lktexteditor +#kexidbfirebirdcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor diff --git a/kexi/tests/newapi/mysqlcursortest_expectedoutput b/kexi/tests/newapi/mysqlcursortest_expectedoutput index 2bd29b7a..dbdfef2d 100644 --- a/kexi/tests/newapi/mysqlcursortest_expectedoutput +++ b/kexi/tests/newapi/mysqlcursortest_expectedoutput @@ -1,6 +1,6 @@ KexiDB: DriverManagerInternal::incRefCount(): 1 kio (KTrader): KServiceTypeProfile::offers( Kexi/DBDriver, ) -kio (KSycoca): Trying to open ksycoca from /var/tmp/tdecache-jowenn/ksycoca +kio (KSycoca): Trying to open tdesycoca from /var/tmp/tdecache-jowenn/tdesycoca kio (KTrader): Returning 2 offers KexiDB: KexiDB::DriverManager::lookupDrivers(): registered driver: mySQL(kexidb_mysqldriver) KexiDB: KexiDB::DriverManager::lookupDrivers(): registered driver: SQLite(kexidb_sqlitedriver) diff --git a/kexi/tests/widgets/Makefile.am b/kexi/tests/widgets/Makefile.am index bfdd4f6b..6c15c5cd 100644 --- a/kexi/tests/widgets/Makefile.am +++ b/kexi/tests/widgets/Makefile.am @@ -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) -lktexteditor +kexidbdrivercombotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO diff --git a/kexi/widget/Makefile.am b/kexi/widget/Makefile.am index 70c75203..9d4856fd 100644 --- a/kexi/widget/Makefile.am +++ b/kexi/widget/Makefile.am @@ -15,7 +15,7 @@ libkexiextendedwidgets_la_SOURCES = kexidataawareview.cpp \ kexiprjtypeselectorbase.ui kexiprjtypeselector.cpp libkexiextendedwidgets_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved -libkexiextendedwidgets_la_LIBADD = $(LIB_TDEUI) ./utils/libkexiguiutils.la tableview/libkexidatatable.la ../core/libkexicore.la -lktexteditor +libkexiextendedwidgets_la_LIBADD = $(LIB_TDEUI) ./utils/libkexiguiutils.la tableview/libkexidatatable.la ../core/libkexicore.la -ltdetexteditor SUBDIRS = utils tableview . relations diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp index 121ee8dd..05115b69 100644 --- a/kexi/widget/kexieditor.cpp +++ b/kexi/widget/kexieditor.cpp @@ -34,15 +34,15 @@ #ifdef KTEXTEDIT_BASED_SQL_EDITOR # include <ktextedit.h> #else -# include <ktexteditor/document.h> -# include <ktexteditor/view.h> -# include <ktexteditor/editorchooser.h> -# include <ktexteditor/editinterface.h> -# include <ktexteditor/viewcursorinterface.h> -# include <ktexteditor/popupmenuinterface.h> -# include <ktexteditor/undointerface.h> -# include <ktexteditor/configinterface.h> -# include <ktexteditor/highlightinginterface.h> +# include <tdetexteditor/document.h> +# include <tdetexteditor/view.h> +# include <tdetexteditor/editorchooser.h> +# include <tdetexteditor/editinterface.h> +# include <tdetexteditor/viewcursorinterface.h> +# include <tdetexteditor/popupmenuinterface.h> +# include <tdetexteditor/undointerface.h> +# include <tdetexteditor/configinterface.h> +# include <tdetexteditor/highlightinginterface.h> #endif /** Used for the shared action framework to redirect shared actions like |