diff --git a/ChangeLog b/ChangeLog index 62c3fdc..e8e3ab4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2333,7 +2333,7 @@ * Updated Dutch translation from Bert Keuter * Added budget forecasting * Added sort options for budgets in GUI - * Renamed kmymoney2.kdevelop into kmymoney2.kdevelop.sample + * Renamed kmymoney2.tdevelop into kmymoney2.tdevelop.sample 2008-04-20 Thomas Baumgart * Added preliminary version of the budget calculation on historic data @@ -6471,7 +6471,7 @@ * 64bit fixes for MyMoneyMoney 2004-12-28 Thomas Baumgart - * Added new admin directory from kdelibs 3.3.0 + * Added new admin directory from tdelibs 3.3.0 2004-12-23 Tony Bloomfield * Gnucash import - Christmas crash fix @@ -7173,7 +7173,7 @@ * Created kMyMoneyAccountCombo widget 2004-05-30 Thomas Baumgart - * Added KDE compatability header file. Should be used instead of kdeversion.h + * Added KDE compatability header file. Should be used instead of tdeversion.h * Added global test container that can be built and run using 'make check' * Added patch for report configuration supplied by Ace Jones @@ -8976,7 +8976,7 @@ 2001-12-17 Michael Edwardes * Fixed bug no 490015. - * Updated admin directory to kdelibs-2.2.2 whilst preserving + * Updated admin directory to tdelibs-2.2.2 whilst preserving the autoconf-2.50 changes so we can use --enable-objprelink. 2001-12-17 Thomas Baumgart @@ -9487,7 +9487,7 @@ 2001-03-08 Javier Campos Morales * Fixed kmymoney2 repository * Remove compile.sh and mkui.sh - * Modify the project to complain with kdevelop 1.4 + * Modify the project to complain with tdevelop 1.4 * Added directory icons with a few icons for the future * Added readConfig and writeConfig to KStartDlg * Delete KMyMoney2App::openDocumentFile(const KURL& ulr) - Method not used diff --git a/ChangeLog.original b/ChangeLog.original index 4de1291..9bda1b2 100644 --- a/ChangeLog.original +++ b/ChangeLog.original @@ -69,13 +69,13 @@ The new program is an applet that will dock on the task bar and monitor your bills and deposits (when they are done !). Tried to modify the configure stuff to support uic. Not trusted to work at this time, I cut and - pasted most of the stuff from kdelibs-1.94. + pasted most of the stuff from tdelibs-1.94. Converted the KNewBillWizard dialog to designer and all seems well. Will create all new dialogs with designer now. The older, already implemented dialogs, will be converted at some point in the future. Added hacked versions of sizePolicy and sizeHint to kMyMoneyDateInput but they don't really work properly. - Completely hand edited the kdevelop project file to compile the new code and to accomodate + Completely hand edited the tdevelop project file to compile the new code and to accomodate the new admin directory. God knows if it will work on other machines, but it does work on mine! PLEASE DO NOT USE KDEVELOP ON THIS PROJECT AS IT WILL PROBABLY OVERWRITE ALL THE HAND EDITED FILES (KDEVELOP DOESN'T ON MINE BUT I CAN'T GUARANTEE IT FOR OTHER @@ -90,13 +90,13 @@ Removed QdbtTabular completely from the source code. All lists now use the KListView class. Moved over to KDevelop 1.3 and am now using the new templates and admin directory. - Made all kdevelop dialogs into designer dialogs and they now look better and the tabs behave as expected. + Made all tdevelop dialogs into designer dialogs and they now look better and the tabs behave as expected. Removed the dock applet from the source, I will release it once kmymoney2 becomes stable again. (most of it isn't implemented anyway!). If the build process fails try running the mk-ui.sh script in the kmymoney2 source directory first. (There are some dependency problems on my machine ?). Use the compile.sh script to build kmymoney2 from now on. - Completely removed all the kdevelop dialogs and turned them into designer dialogs. + Completely removed all the tdevelop dialogs and turned them into designer dialogs. Removed the Quick Start wizard and am thinking of a new interface to wizards/templates, maybe using some kind of scripting so the user can add more if they want to. More streamlining of the engine code to stop using QListIterators. All that needs to be done to diff --git a/Makefile.am b/Makefile.am index 6ad9abe..27506f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## # just make sure, we don't ship the sqlite subdirectory with the tarball SOURCEDIRS = libkgpgfile libkdchart kmymoney2 po doc developer-doc @@ -9,7 +9,7 @@ EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO ChangeLog.original co noinst_HEADERS = kdecompat.h -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # not a GNU package. You can remove this line, if # have all needed files, that a GNU package needs AUTOMAKE_OPTIONS = foreign diff --git a/README b/README index 301fe5d..274b3ac 100644 --- a/README +++ b/README @@ -20,7 +20,7 @@ Also, you will need the compile tools. This includes make and gcc Example for K/Ubuntu: -sudo apt-get install kdelibs4-dev build-essential +sudo apt-get install tdelibs4-dev build-essential --------------------------------- Compiling and installing KMyMoney @@ -128,7 +128,7 @@ AND/OR Get KDevelop and use the supplied kmymoney2.kdevprj located in the base directory. For more information on KDevelop please visit -http://www.kdevelop.org. +http://www.tdevelop.org. --------------------------------- More documentation diff --git a/acinclude.m4 b/acinclude.m4 index c7ac0b4..4f59403 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -23,8 +23,8 @@ dnl IMPORTANT NOTE: dnl Please do not modify this file unless you expect your modifications to be dnl carried into every other module in the repository. dnl -dnl Single-module modifications are best placed in configure.in for kdelibs -dnl and kdebase or configure.in.in if present. +dnl Single-module modifications are best placed in configure.in for tdelibs +dnl and tdebase or configure.in.in if present. # KDE_PATH_X_DIRECT dnl Internal subroutine of AC_PATH_X. @@ -103,41 +103,41 @@ ac_x_libraries=], [LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do dnl Don't even attempt the hair of trying to link an X program! @@ -378,7 +378,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi @@ -937,7 +937,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1418,7 +1418,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), [ ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp AC_MSG_RESULT([$kde_cv_uic_plugins]) if test "$kde_cv_uic_plugins" != yes; then AC_MSG_ERROR([ -you need to install kdelibs first. +you need to install tdelibs first. -If you did install kdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile kdelibs. -The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the +If you did install tdelibs, then the Qt version that is picked up by +this configure is not the same version you used to compile tdelibs. +The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the _same Qt version_, compiled with the _same compiler_ and the same Qt configuration settings. ]) @@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" @@ -1824,7 +1824,7 @@ fi if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1839,7 +1839,7 @@ else ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" fi -else dnl test -z $1, e.g. from kdelibs +else dnl test -z $1, e.g. from tdelibs ac_cv_have_kde="have_kde=no" @@ -3499,16 +3499,16 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config AC_DEFUN([KDE_CHECK_LIB64], [ - kdelibsuff="$kde_libs_suffix" - if test -z "$kdelibsuff"; then - kdelibsuff="no" + tdelibsuff="$kde_libs_suffix" + if test -z "$tdelibsuff"; then + tdelibsuff="no" fi AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval) + tdelibsuff=$enableval) - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include @@ -3516,26 +3516,26 @@ int main() { return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ s,.*/lib\([[^\/]]*\)/.*,\1, p }'` rm -rf conftest.* fi - if test "$kdelibsuff" = "no" -o "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "no" -o "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -4560,7 +4560,7 @@ fi PYTHONINC=-I$python_incdir -python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" +python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) if test ! -r $python_libdir/libpython$version.so; then AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) @@ -4948,7 +4948,7 @@ AC_DEFUN([KDE_CONF_FILES], AC_SUBST(CONF_FILES) ])dnl -dnl This sets the prefix, for arts and kdelibs +dnl This sets the prefix, for arts and tdelibs dnl Do NOT use in any other module. dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde AC_DEFUN([KDE_SET_PREFIX_CORE], @@ -4995,9 +4995,9 @@ AC_DEFUN([KDE_SET_PREFIX], kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` @@ -5663,7 +5663,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$kdelibsuff + ac_ssl_libraries="$withval"/lib$tdelibsuff ]) want_ssl=yes @@ -5683,7 +5683,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" + ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi @@ -5920,9 +5920,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page dnl also defines KSTUFF_PKG_ERRORS on error AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) @@ -12115,7 +12115,7 @@ AC_DEFUN([AC_SQLITE3], [ if test ! $enable_sqlite3 = no; then # determine name and path of sqlite3 plugin library qtlib="" - if test ! "lib${kdelibsuff}" = "lib"; then + if test ! "lib${tdelibsuff}" = "lib"; then qtlib=".lib64" fi if test x$QTDIR = x; then diff --git a/configure.in b/configure.in index 7940c1e..ff6d900 100644 --- a/configure.in +++ b/configure.in @@ -128,10 +128,10 @@ dnl check for sqlite3 support dnl AC_SQLITE3() -dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__ -CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __kdevelop[exc]__ -dnl KDE_NEED_FLEX dnl __kdevelop__ -dnl AC_PROG_YACC dnl __kdevelop__ +dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __tdevelop[noopt]__ +CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __tdevelop[exc]__ +dnl KDE_NEED_FLEX dnl __tdevelop__ +dnl AC_PROG_YACC dnl __tdevelop__ # # make sure the UIC compiler uses our own widget lib diff --git a/configure.in.in b/configure.in.in index fbd4f4a..3f82103 100644 --- a/configure.in.in +++ b/configure.in.in @@ -63,10 +63,10 @@ dnl check for sqlite3 support dnl AC_SQLITE3() -dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__ -CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __kdevelop[exc]__ -dnl KDE_NEED_FLEX dnl __kdevelop__ -dnl AC_PROG_YACC dnl __kdevelop__ +dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __tdevelop[noopt]__ +CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __tdevelop[exc]__ +dnl KDE_NEED_FLEX dnl __tdevelop__ +dnl AC_PROG_YACC dnl __tdevelop__ # # make sure the UIC compiler uses our own widget lib diff --git a/developer-doc/Makefile.am b/developer-doc/Makefile.am index 5b0934b..643c773 100644 --- a/developer-doc/Makefile.am +++ b/developer-doc/Makefile.am @@ -1,7 +1,7 @@ KDE_OPTIONS = noautodist -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## SUBDIRS = phb -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/developer-doc/phb/cvs-examples.docbook b/developer-doc/phb/cvs-examples.docbook index ab34aee..da29be8 100644 --- a/developer-doc/phb/cvs-examples.docbook +++ b/developer-doc/phb/cvs-examples.docbook @@ -618,7 +618,7 @@ development branch. That's it! Of course, a fix to a source code file would be followed by a visual inspection (that's where vi or -kdevelop come into play) and a compile run with further +tdevelop come into play) and a compile run with further testing before the change is checked back into the repository. diff --git a/developer-doc/phb/rpm-example.docbook b/developer-doc/phb/rpm-example.docbook index 5e63a4c..213e1ec 100644 --- a/developer-doc/phb/rpm-example.docbook +++ b/developer-doc/phb/rpm-example.docbook @@ -60,7 +60,7 @@ Packager: %packer Group: Productivity/Office/Finance Source0: %{name}2-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}2-%{version}-%{release}-build -BuildRequires: kdebase3-devel +BuildRequires: tdebase3-devel Prereq: /sbin/ldconfig %description diff --git a/doc/Makefile.am b/doc/Makefile.am index 6063bd6..9f56c25 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## SUBDIRS = en -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/doc/en/index.docbook b/doc/en/index.docbook index 1b85b63..c2dba04 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -5,7 +5,7 @@ KMyMoney"> - diff --git a/kdecompat.h b/kdecompat.h index 11766eb..90f443a 100644 --- a/kdecompat.h +++ b/kdecompat.h @@ -17,7 +17,7 @@ #ifndef _KDECOMPAT_H #define _KDECOMPAT_H -#include +#include #ifndef KDE_MAKE_VERSION #define KDE_MAKE_VERSION(a,b,c) (((a)<<16) | ((b)<<8) | (c)) diff --git a/kmymoney2/Makefile.am b/kmymoney2/Makefile.am index 309346c..5b52d1f 100644 --- a/kmymoney2/Makefile.am +++ b/kmymoney2/Makefile.am @@ -77,7 +77,7 @@ uninstall-local: -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kmymoney2.png -rm -f $(DESTDIR)$(kde_datadir)/kmymoney2/tips -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # this 10 paths are KDE specific. Use them: # kde_htmldir Where your docs should go to. (contains lang subdirs) # kde_appsdir Where your application file (.kdelnk) should go to. diff --git a/kmymoney2/converter/convertertest.cpp b/kmymoney2/converter/convertertest.cpp index 70124ad..739c6f3 100644 --- a/kmymoney2/converter/convertertest.cpp +++ b/kmymoney2/converter/convertertest.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/kmymoney2/export.h b/kmymoney2/export.h index 1e8c3aa..8e912df 100644 --- a/kmymoney2/export.h +++ b/kmymoney2/export.h @@ -21,7 +21,7 @@ #ifndef _KMYMONEY_EXPORT_H #define _KMYMONEY_EXPORT_H -#include +#include #if KDE_IS_VERSION(3,2,90) #ifdef __KDE_HAVE_GCC_VISIBILITY diff --git a/kmymoney2/html/images/Makefile.am b/kmymoney2/html/images/Makefile.am index 94e4531..e2341ed 100644 --- a/kmymoney2/html/images/Makefile.am +++ b/kmymoney2/html/images/Makefile.am @@ -1,4 +1,4 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## KDE_OPTIONS = noautodist @@ -17,4 +17,4 @@ uninstall-local: rm -f $(DESTDIR)$(kde_datadir)/$(LOCAL_DIR)/$$file; \ done -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/kmymoney2/reports/pivotgridtest.cpp b/kmymoney2/reports/pivotgridtest.cpp index 431ef0f..5b8dd54 100644 --- a/kmymoney2/reports/pivotgridtest.cpp +++ b/kmymoney2/reports/pivotgridtest.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/kmymoney2/reports/pivottabletest.cpp b/kmymoney2/reports/pivottabletest.cpp index ddee89e..d1a6586 100644 --- a/kmymoney2/reports/pivottabletest.cpp +++ b/kmymoney2/reports/pivottabletest.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/kmymoney2/reports/querytabletest.cpp b/kmymoney2/reports/querytabletest.cpp index c0a448c..b763276 100644 --- a/kmymoney2/reports/querytabletest.cpp +++ b/kmymoney2/reports/querytabletest.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/kmymoney2/reports/reportstestcommon.cpp b/kmymoney2/reports/reportstestcommon.cpp index 6783b08..eac6193 100644 --- a/kmymoney2/reports/reportstestcommon.cpp +++ b/kmymoney2/reports/reportstestcommon.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/kmymoney2/widgets/kmymoneycalendar.cpp b/kmymoney2/widgets/kmymoneycalendar.cpp index d3ac4b4..664548d 100644 --- a/kmymoney2/widgets/kmymoneycalendar.cpp +++ b/kmymoney2/widgets/kmymoneycalendar.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ /*************************************************************************** - * Contains code from KDatePicker in kdelibs-3.1.2. + * Contains code from KDatePicker in tdelibs-3.1.2. * Original license message: * This file is part of the KDE libraries diff --git a/kmymoney2/widgets/kmymoneycalendar.h b/kmymoney2/widgets/kmymoneycalendar.h index fbcb24f..4b6f32d 100644 --- a/kmymoney2/widgets/kmymoneycalendar.h +++ b/kmymoney2/widgets/kmymoneycalendar.h @@ -21,7 +21,7 @@ ***************************************************************************/ /*************************************************************************** - * Contains code from KDatePicker in kdelibs-3.1.2. + * Contains code from KDatePicker in tdelibs-3.1.2. * Original license message: * This file is part of the KDE libraries diff --git a/kmymoney2/widgets/kmymoneydatetbl.cpp b/kmymoney2/widgets/kmymoneydatetbl.cpp index c2cfc1c..ccff3c6 100644 --- a/kmymoney2/widgets/kmymoneydatetbl.cpp +++ b/kmymoney2/widgets/kmymoneydatetbl.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ /**************************************************************************** - Contains code from the KDateTable class ala kdelibs-3.1.2. Original license: + Contains code from the KDateTable class ala tdelibs-3.1.2. Original license: This file is part of the KDE libraries Copyright (C) 1997 Tim D. Gilman (tdgilman@best.org) diff --git a/kmymoney2/widgets/kmymoneydatetbl.h b/kmymoney2/widgets/kmymoneydatetbl.h index 23da85f..96e57ee 100644 --- a/kmymoney2/widgets/kmymoneydatetbl.h +++ b/kmymoney2/widgets/kmymoneydatetbl.h @@ -12,7 +12,7 @@ ***************************************************************************/ /**************************************************************************** - Contains code from the KDateTable class ala kdelibs-3.1.2. Original license: + Contains code from the KDateTable class ala tdelibs-3.1.2. Original license: This file is part of the KDE libraries Copyright (C) 1997 Tim D. Gilman (tdgilman@best.org) diff --git a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp index 3c484a3..5562d31 100644 --- a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp +++ b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp @@ -11,7 +11,7 @@ Kevin Tambascio ***************************************************************************/ /**************************************************************************** - Contains code from the KDateTable class ala kdelibs-3.1.2. Original license: + Contains code from the KDateTable class ala tdelibs-3.1.2. Original license: This file is part of the KDE libraries Copyright (C) 1997 Tim D. Gilman (tdgilman@best.org) diff --git a/kmymoney2/widgets/registersearchline.h b/kmymoney2/widgets/registersearchline.h index 9f5074d..df28fa4 100644 --- a/kmymoney2/widgets/registersearchline.h +++ b/kmymoney2/widgets/registersearchline.h @@ -38,7 +38,7 @@ namespace KMyMoneyRegister { /** * This class makes it easy to add a search line for filtering the items - * in a register based on simple text. Inspired by the idea of the kdelibs + * in a register based on simple text. Inspired by the idea of the tdelibs * class KListViewSearchLine. * * @author Thomas Baumgart diff --git a/po/Makefile.am b/po/Makefile.am index 23ef5de..f0066e8 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -1,7 +1,7 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ POFILES = AUTO CONFIG_CLEAN_FILES = $(GMOFILES) diff --git a/po/ca.po b/po/ca.po index 42dbbd5..a7eeab9 100644 --- a/po/ca.po +++ b/po/ca.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2009-06-25 19:04+0200\n" "PO-Revision-Date: 2006-08-28 02:34+0200\n" "Last-Translator: Orestes Mas \n" -"Language-Team: Catalan \n" +"Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/de.po b/po/de.po index 0ed3fac..b5a4e42 100644 --- a/po/de.po +++ b/po/de.po @@ -17,7 +17,7 @@ msgstr "" "POT-Creation-Date: 2009-06-25 19:04+0200\n" "PO-Revision-Date: 2009-10-17 11:11+0200\n" "Last-Translator: Markus Drexelius \n" -"Language-Team: Deutsch \n" +"Language-Team: Deutsch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/es.po b/po/es.po index a9ac095..e50bdc9 100644 --- a/po/es.po +++ b/po/es.po @@ -11,7 +11,7 @@ msgstr "" "POT-Creation-Date: 2009-06-25 19:04+0200\n" "PO-Revision-Date: 2009-06-26 07:44-0300\n" "Last-Translator: Alvaro Soliverez \n" -"Language-Team: Spanish \n" +"Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/es_AR.po b/po/es_AR.po index 1e86d64..c4ef3ab 100644 --- a/po/es_AR.po +++ b/po/es_AR.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2009-06-25 19:04+0200\n" "PO-Revision-Date: 2009-06-26 07:45-0300\n" "Last-Translator: Alvaro Soliverez \n" -"Language-Team: Spanish \n" +"Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/fi.po b/po/fi.po index eeec9b8..50d2dba 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11,7 +11,7 @@ msgstr "" "POT-Creation-Date: 2009-06-25 19:04+0200\n" "PO-Revision-Date: 2010-03-28 22:43+0300\n" "Last-Translator: Mikael Kujanpää \n" -"Language-Team: Suomi \n" +"Language-Team: Suomi \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/fr.po b/po/fr.po index 8d4333f..6957130 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,7 +10,7 @@ msgstr "" "POT-Creation-Date: 2009-06-25 19:04+0200\n" "PO-Revision-Date: 2009-07-04 08:35+0200\n" "Last-Translator: Patrick PETIT \n" -"Language-Team: Français \n" +"Language-Team: Français \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/it.po b/po/it.po index 4f5e743..ca26a3e 100644 --- a/po/it.po +++ b/po/it.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2009-06-25 19:04+0200\n" "PO-Revision-Date: 2009-08-17 08:39+0100\n" "Last-Translator: Sandro Bonazzola \n" -"Language-Team: Italian \n" +"Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/lt.po b/po/lt.po index 8cc9d20..856886c 100644 --- a/po/lt.po +++ b/po/lt.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2009-06-25 19:04+0200\n" "PO-Revision-Date: 2006-02-03 08:43+0200\n" "Last-Translator: Donatas Glodenis \n" -"Language-Team: Lithuanian \n" +"Language-Team: Lithuanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/nl.po b/po/nl.po index 7c7a6d5..49d2f74 100644 --- a/po/nl.po +++ b/po/nl.po @@ -15,7 +15,7 @@ msgstr "" "POT-Creation-Date: 2009-06-25 19:04+0200\n" "PO-Revision-Date: 2009-08-30 16:01+0200\n" "Last-Translator: \n" -"Language-Team: Nederlands \n" +"Language-Team: Nederlands \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index e5ee6de..9b72b17 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -14,7 +14,7 @@ msgstr "" "POT-Creation-Date: 2009-06-25 19:04+0200\n" "PO-Revision-Date: 2009-06-26 19:21-0300\n" "Last-Translator: Marcus Gama \n" -"Language-Team: Brazilian Portuguese \n" +"Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/ro.po b/po/ro.po index dc1e809..2e9ce47 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8,7 +8,7 @@ msgstr "" "POT-Creation-Date: 2009-06-25 19:04+0200\n" "PO-Revision-Date: 2009-06-25 20:43+0300\n" "Last-Translator: Cristian Oneţ \n" -"Language-Team: Romanian \n" +"Language-Team: Romanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/tr.po b/po/tr.po index 39f671f..1190a8b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7,7 +7,7 @@ msgstr "" "POT-Creation-Date: 2009-06-25 19:04+0200\n" "PO-Revision-Date: 2008-07-05 22:56+0300\n" "Last-Translator: Serdar Soytetir \n" -"Language-Team: Turkish \n" +"Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 8413c76..0f90f0d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10,7 +10,7 @@ msgstr "" "POT-Creation-Date: 2009-06-25 19:04+0200\n" "PO-Revision-Date: 2008-11-12 09:14+0800\n" "Last-Translator: Roy Qu \n" -"Language-Team: Chinese Simplified \n" +"Language-Team: Chinese Simplified \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"