diff options
Diffstat (limited to 'kexi')
28 files changed, 40 insertions, 40 deletions
diff --git a/kexi/core/kexiaboutdata.cpp b/kexi/core/kexiaboutdata.cpp index 0f06a156..51265bdb 100644 --- a/kexi/core/kexiaboutdata.cpp +++ b/kexi/core/kexiaboutdata.cpp @@ -21,7 +21,7 @@ #include "kexiaboutdata.h" #include <kexi_version.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kofficeversion.h> //only for KOFFICE_VERSION_STRING #include <klocale.h> diff --git a/kexi/debian/control b/kexi/debian/control index 8f0159dd..6defe77d 100644 --- a/kexi/debian/control +++ b/kexi/debian/control @@ -2,7 +2,7 @@ Source: kexi Section: kde Priority: optional Maintainer: Igor Genibel <igenibel@debian.org> -Build-Depends: automake1.7, debhelper (>= 4.2.0), kdelibs4-dev (>= 4:3.2.0), flex, libpqxx-dev, libmysqlclient-dev, libreadline5-dev, cdbs +Build-Depends: automake1.7, debhelper (>= 4.2.0), tdelibs4-dev (>= 4:3.2.0), flex, libpqxx-dev, libmysqlclient-dev, libreadline5-dev, cdbs Standards-Version: 3.6.1.0 Package: kexi diff --git a/kexi/doc/common/doxygen.css b/kexi/doc/common/doxygen.css index a8be4adc..f3e5ed91 100644 --- a/kexi/doc/common/doxygen.css +++ b/kexi/doc/common/doxygen.css @@ -1,6 +1,6 @@ /******************************************************************************* - Style sheet for kdelibs doxygen documentation. + Style sheet for tdelibs doxygen documentation. Copyright (c) Anders Lund <anders@alweb.dk> 2002 This script is made available under the terms of the General Public Licence. diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js index 7114d65b..e78c9df2 100644 --- a/kexi/doc/dev/TODO-Kexi-js +++ b/kexi/doc/dev/TODO-Kexi-js @@ -428,7 +428,7 @@ HINT: removing Qt::WStaticContents from KexiTableView ctor fixed repaint problem Workaround: removed most of apps/katepart/syntax/*.xml files - win32: fix freeze on 1st char entering - win32: fix mmap for win9x (InterlockedCompareExchange() replacement is needed - -> see kdelibs/win/mmap.c) + -> see tdelibs/win/mmap.c) - call qApp->processEvents() on highlighting schema loading, so 'wait' cursor can be visible on 1st loading. - allow saving invalid queries (KexiQueryDesignerSQLView::storeNewData()) @@ -645,10 +645,10 @@ for blobs...The client has to read the _entire_ blob into memory."; use: application/x-vnd.kexi.connections.shortcut application/x-vnd.kexi.table.shortcut application/x-vnd.kexi.query.shortcut -- remove x-vnd.kexi.desktop in kdelibs -- copy mimetypes and magic def. to kdelibs (keep it within Kexi for compat.) +- remove x-vnd.kexi.desktop in tdelibs +- copy mimetypes and magic def. to tdelibs (keep it within Kexi for compat.) - remake kexi mime type svg icons -- copy kexi mime icons to kdelibs, remove old one +- copy kexi mime icons to tdelibs, remove old one ** Ask SQLite devs for a possibility for adding a field to indicate kexi-sqlite format without opening database @@ -1091,7 +1091,7 @@ TODO: PqxxMigrate::drv_copyTable(): we've switched from BLOBs to LongText Startup templates - TODO: : use main/startup/TemplateItem.ui and main/startup/TemplateWidget.h - http://lxr.kde.org/source/KDE/kdebase/kicker/kicker/ui/addapplet.cpp?v=3.5-branch#188 + http://lxr.kde.org/source/KDE/tdebase/kicker/kicker/ui/addapplet.cpp?v=3.5-branch#188 - TODO look at schemas at http://www.databaseanswers.org/data_models/index.htm Find/Replace REPLACE diff --git a/kexi/formeditor/Makefile.am b/kexi/formeditor/Makefile.am index 8f8aacbe..5295c223 100644 --- a/kexi/formeditor/Makefile.am +++ b/kexi/formeditor/Makefile.am @@ -27,7 +27,7 @@ libkformdesigner_la_LIBADD = \ servicetypesdir = $(kde_servicetypesdir) servicetypes_DATA=widgetfactory.desktop -SUBDIRS = . factories #test #scripting #kdevelop_plugin +SUBDIRS = . factories #test #scripting #tdevelop_plugin messages: rc.cpp $(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui"` >> rc.cpp diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp index a7fa5d3e..acc72c24 100644 --- a/kexi/formeditor/factories/containerfactory.cpp +++ b/kexi/formeditor/factories/containerfactory.cpp @@ -44,7 +44,7 @@ #include <klineedit.h> #include <klocale.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include "containerfactory.h" #include "container.h" diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index b9e85b9c..24827e13 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -33,7 +33,7 @@ #include <kgenericfactory.h> #include <klocale.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #if TDE_VERSION < KDE_MAKE_VERSION(3,1,9) # include <tqdatetimeedit.h> diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index 6ec87fc0..a2ed0dac 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -50,7 +50,7 @@ #include <ktabwidget.h> #include <kfontdialog.h> -#include <kdeversion.h> +#include <tdeversion.h> #if TDE_VERSION >= KDE_MAKE_VERSION(3,1,9) && !defined(TQ_WS_WIN) # include <kactioncollection.h> #endif diff --git a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp index 7166e7cc..0cfe0483 100644 --- a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp +++ b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp @@ -25,7 +25,7 @@ #include <tqevent.h> #include <tqobjectlist.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kaction.h> #include <kinstance.h> #include <klocale.h> diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp index f309283f..cd51817a 100644 --- a/kexi/formeditor/test/kfd_part.cpp +++ b/kexi/formeditor/test/kfd_part.cpp @@ -25,7 +25,7 @@ #include <tqevent.h> #include <tqobjectlist.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kaction.h> #include <kinstance.h> #include <klocale.h> diff --git a/kexi/kexidb/drivers/configure.in.in b/kexi/kexidb/drivers/configure.in.in index 01d426b6..051bf07d 100644 --- a/kexi/kexidb/drivers/configure.in.in +++ b/kexi/kexidb/drivers/configure.in.in @@ -53,7 +53,7 @@ dnl *** Check that the paths given to configure are valid *** fi AC_MSG_CHECKING([for MySQL libraries]) - mysql_libdirs="$ac_mysql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff" + mysql_libdirs="$ac_mysql_libdir /usr/local/lib$tdelibsuff /usr/lib$tdelibsuff" AC_FIND_FILE(mysql/libmysqlclient.so, $mysql_libdirs, mysql_libdir) if test -r $mysql_libdir/mysql/libmysqlclient.so; then MYSQL_LIBS=$mysql_libdir @@ -149,7 +149,7 @@ dnl *** Check that the paths given to configure are valid *** fi AC_MSG_CHECKING([for PostgreSQL C API libraries]) - pgsql_libdirs="$ac_pgsql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff" + pgsql_libdirs="$ac_pgsql_libdir /usr/local/lib$tdelibsuff /usr/lib$tdelibsuff" AC_FIND_FILE(libpq.so, $pgsql_libdirs, pgsql_libdir) if test -r $pgsql_libdir/libpq.so; then PG_LIBDIR=$pgsql_libdir @@ -229,7 +229,7 @@ dnl libpqxx libraries dnl ======================================== if test "$compile_pgsql_plugin" = "yes"; then AC_MSG_CHECKING([for PostgreSQL C++ libraries]) - pqxx_libdirs="$ac_pqxx_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff" + pqxx_libdirs="$ac_pqxx_libdir /usr/local/lib$tdelibsuff /usr/lib$tdelibsuff" AC_FIND_FILE(libpqxx.so, $pqxx_libdirs, pqxx_libdir) if test -r $pqxx_libdir/libpqxx.so; then PQXX_LIBDIR=$pqxx_libdir diff --git a/kexi/kexidb/kexidb_export.h b/kexi/kexidb/kexidb_export.h index 2a908b66..cd18539f 100644 --- a/kexi/kexidb/kexidb_export.h +++ b/kexi/kexidb/kexidb_export.h @@ -21,9 +21,9 @@ #define _KEXIDB_EXPORT_H_ #ifdef __cplusplus -# include <kdeversion.h> /* this will also include <kdelibs_export.h>, if available */ +# include <tdeversion.h> /* this will also include <tdelibs_export.h>, if available */ #endif -/* KDE_EXPORT will be defined multiple times without this on kdelibs 3.3 (tested on 3.3.1) */ +/* KDE_EXPORT will be defined multiple times without this on tdelibs 3.3 (tested on 3.3.1) */ #include <kdemacros.h> /* workaround for KDElibs < 3.2 on !win32 */ diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 37ff1c83..5594d577 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -46,7 +46,7 @@ #include <kdebug.h> #include <kkeydialog.h> #include <kedittoolbar.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kglobalsettings.h> #include <kparts/componentfactory.h> #include <ktip.h> diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp index 6f1fc51d..9beffbf5 100644 --- a/kexi/main/kexinewstuff.cpp +++ b/kexi/main/kexinewstuff.cpp @@ -26,7 +26,7 @@ #include <kapplication.h> #include <kfiledialog.h> #include <klocale.h> -#include <kdeversion.h> +#include <tdeversion.h> #include "kexinewstuff.h" diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp index e2240e5c..e4bfd580 100644 --- a/kexi/main/kexistatusbar.cpp +++ b/kexi/main/kexistatusbar.cpp @@ -16,8 +16,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. - Loosely based on kdevelop/src/statusbar.cpp - Copyright (C) 2001 by Bernd Gehrmann <bernd@kdevelop.org> + Loosely based on tdevelop/src/statusbar.cpp + Copyright (C) 2001 by Bernd Gehrmann <bernd@tdevelop.org> */ #include "kexistatusbar.h" diff --git a/kexi/main/kexistatusbar.h b/kexi/main/kexistatusbar.h index 15b8f583..bab1277a 100644 --- a/kexi/main/kexistatusbar.h +++ b/kexi/main/kexistatusbar.h @@ -16,8 +16,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. - Loosely based on kdevelop/src/statusbar.h - Copyright (C) 2001 by Bernd Gehrmann <bernd@kdevelop.org> + Loosely based on tdevelop/src/statusbar.h + Copyright (C) 2001 by Bernd Gehrmann <bernd@tdevelop.org> */ #ifndef KEXISTATUSBAR_H @@ -26,7 +26,7 @@ //temporary #define KexiStatusBar_KTEXTEDITOR_USED 0 -#include <kdeversion.h> +#include <tdeversion.h> #include <kstatusbar.h> #include <tqmap.h> diff --git a/kexi/main/ksplitter.h b/kexi/main/ksplitter.h index 3fe7b28d..f3feafc4 100644 --- a/kexi/main/ksplitter.h +++ b/kexi/main/ksplitter.h @@ -27,7 +27,7 @@ #include <tqwidget.h> #include <tqpushbutton.h> -#include <kdeversion.h> +#include <tdeversion.h> #ifndef NO_KDE2 #include <netwm_def.h> diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp index f8634e82..476f924a 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp +++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp @@ -34,7 +34,7 @@ #include <klineedit.h> #include <kprinter.h> #include <kpushbutton.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <tqlabel.h> #include <tqtimer.h> diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp index 61746d5c..c479a4e0 100644 --- a/kexi/main/startup/KexiStartup.cpp +++ b/kexi/main/startup/KexiStartup.cpp @@ -44,7 +44,7 @@ #include <kmimetype.h> #include <kmessagebox.h> #include <kcmdlineargs.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kprogress.h> #include <ktextedit.h> #include <kstaticdeleter.h> diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp index 43666706..7f67bc76 100644 --- a/kexi/main/startup/KexiStartupDialog.cpp +++ b/kexi/main/startup/KexiStartupDialog.cpp @@ -37,7 +37,7 @@ #include <tqwidgetstack.h> #include <klocale.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kinstance.h> #include <kdebug.h> #include <kpushbutton.h> diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp index 0fc3525c..2d09429e 100644 --- a/kexi/plugins/forms/widgets/kexidblabel.cpp +++ b/kexi/plugins/forms/widgets/kexidblabel.cpp @@ -88,7 +88,7 @@ KexiDBInternalLabel::~KexiDBInternalLabel() } /*! -* This method is copied from kdebase/kdesktop/kshadowengine.cpp +* This method is copied from tdebase/kdesktop/kshadowengine.cpp * Some modifactions were made. * -- * Christian Nitschkowski @@ -140,7 +140,7 @@ TQImage KexiDBInternalLabel::makeShadow( const TQImage& textImage, for ( int i = startX; i < effectWidth; i++ ) { for ( int j = startY; j < effectHeight; j++ ) { /*! - * This method is copied from kdebase/kdesktop/kshadowengine.cpp + * This method is copied from tdebase/kdesktop/kshadowengine.cpp * Some modifactions were made. * -- * Christian Nitschkowski diff --git a/kexi/plugins/macros/lib/komacro_export.h b/kexi/plugins/macros/lib/komacro_export.h index cc4b41a8..d3174235 100644 --- a/kexi/plugins/macros/lib/komacro_export.h +++ b/kexi/plugins/macros/lib/komacro_export.h @@ -21,10 +21,10 @@ #define KOMACRO_EXPORT_H_ #ifdef __cplusplus -# include <kdeversion.h> /* this will also include <kdelibs_export.h>, if available */ +# include <tdeversion.h> /* this will also include <tdelibs_export.h>, if available */ #endif -/* KDE_EXPORT will be defined multiple times without this on kdelibs 3.3 (tested on 3.3.1) */ +/* KDE_EXPORT will be defined multiple times without this on tdelibs 3.3 (tested on 3.3.1) */ #include <kdemacros.h> /* workaround for KDElibs < 3.2 on !win32 */ diff --git a/kexi/tools/feedback/create_kexifeedback.sh b/kexi/tools/feedback/create_kexifeedback.sh index 074b5e3f..130626d7 100644 --- a/kexi/tools/feedback/create_kexifeedback.sh +++ b/kexi/tools/feedback/create_kexifeedback.sh @@ -27,7 +27,7 @@ mv Makefile.am.tmp Makefile.am rm po/kfeedbackwizard.pot rm -rf src rm -rf templates -rm kfeedbackwizard.kdevelop +rm kfeedbackwizard.tdevelop rm Doxyfile rm INSTALL rm NEWS diff --git a/kexi/widget/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp index b07dc997..88b72596 100644 --- a/kexi/widget/kexidswelcome.cpp +++ b/kexi/widget/kexidswelcome.cpp @@ -25,7 +25,7 @@ #include <kiconloader.h> #include <kglobalsettings.h> #include <kstdguiitem.h> -#include <kdeversion.h> +#include <tdeversion.h> #include "kexidatasourcewizard.h" #include "kexidswelcome.h" diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp index e1afd1f8..31795049 100644 --- a/kexi/widget/kexifieldcombobox.cpp +++ b/kexi/widget/kexifieldcombobox.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kconfig.h> #include <kglobalsettings.h> #include <klocale.h> diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp index 521b1ce3..532ec057 100644 --- a/kexi/widget/kexifieldlistview.cpp +++ b/kexi/widget/kexifieldlistview.cpp @@ -31,7 +31,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kconfig.h> #include <kglobalsettings.h> #include <klocale.h> diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index 94a17f4d..55440da4 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kconfig.h> #include <kglobalsettings.h> diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp index 8ea7ddac..718fcbf6 100644 --- a/kexi/widget/utils/kexidatetimeformatter.cpp +++ b/kexi/widget/utils/kexidatetimeformatter.cpp @@ -46,7 +46,7 @@ KexiDateFormatter::KexiDateFormatter() int yearpos, monthpos, daypos; //result of df.find() if (ok) {//look at % variables //! @todo more variables are possible here, see void KLocale::setDateFormatShort() docs -//! http://developer.kde.org/documentation/library/3.5-api/kdelibs-apidocs/tdecore/html/classKLocale.html#a59 +//! http://developer.kde.org/documentation/library/3.5-api/tdelibs-apidocs/tdecore/html/classKLocale.html#a59 yearpos = df.find("%y", 0, false); //&y or %y m_longYear = !(yearpos>=0 && df.mid(yearpos+1, 1)=="y"); if (!m_longYear) { |