diff --git a/README b/README index afc10e0..30192c6 100644 --- a/README +++ b/README @@ -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.tdevelop.org. +http://www.kdevelop.org. --------------------------------- More documentation diff --git a/acinclude.m4 b/acinclude.m4 index 027e025..469e25b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2070,35 +2070,35 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDEIO, "-ltdeio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-ltdednssd") - AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") + AC_SUBST(LIB_TDEDNSSD, "-ltdednssd") + AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") diff --git a/admin b/admin index b4d585c..6b7f722 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360 +Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461 diff --git a/kmymoney2/Makefile.am b/kmymoney2/Makefile.am index df53831..2a83358 100644 --- a/kmymoney2/Makefile.am +++ b/kmymoney2/Makefile.am @@ -4,7 +4,7 @@ bin_PROGRAMS = kmymoney2 kmymoney2_SOURCES = kmymoneyutils.cpp kstartuplogo.cpp kmymoney2.cpp main.cpp kmymoney2.stub kmymoney2.skel kmymoneysettings.kcfgc kmymoneyglobalsettings.cpp -kmymoney2_LDADD = $(top_builddir)/kmymoney2/views/libviews.a $(top_builddir)/kmymoney2/reports/libreports.a $(top_builddir)/kmymoney2/wizards/newuserwizard/libnewuserwizard.a $(top_builddir)/kmymoney2/wizards/newaccountwizard/libnewaccountwizard.a $(top_builddir)/kmymoney2/wizards/wizardpages/libwizardpages.a $(top_builddir)/kmymoney2/dialogs/libdialogs.a $(top_builddir)/kmymoney2/dialogs/settings/libsettings.a $(top_builddir)/kmymoney2/widgets/libwidgets.a $(top_builddir)/kmymoney2/converter/libconverter.a $(top_builddir)/kmymoney2/mymoney/storage/libstorage.a $(top_builddir)/kmymoney2/mymoney/libkmm_mymoney.la $(top_builddir)/libkgpgfile/libkgpgfile.la $(top_builddir)/kmymoney2/plugins/interfaces/libinterfaces.a $(top_builddir)/kmymoney2/plugins/libkmm_plugin.la $(top_builddir)/libkdchart/libkmm_kdchart.la dialogs/libdialogs.a $(LIB_TDEABC) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIB_KUTILS) +kmymoney2_LDADD = $(top_builddir)/kmymoney2/views/libviews.a $(top_builddir)/kmymoney2/reports/libreports.a $(top_builddir)/kmymoney2/wizards/newuserwizard/libnewuserwizard.a $(top_builddir)/kmymoney2/wizards/newaccountwizard/libnewaccountwizard.a $(top_builddir)/kmymoney2/wizards/wizardpages/libwizardpages.a $(top_builddir)/kmymoney2/dialogs/libdialogs.a $(top_builddir)/kmymoney2/dialogs/settings/libsettings.a $(top_builddir)/kmymoney2/widgets/libwidgets.a $(top_builddir)/kmymoney2/converter/libconverter.a $(top_builddir)/kmymoney2/mymoney/storage/libstorage.a $(top_builddir)/kmymoney2/mymoney/libkmm_mymoney.la $(top_builddir)/libkgpgfile/libkgpgfile.la $(top_builddir)/kmymoney2/plugins/interfaces/libinterfaces.a $(top_builddir)/kmymoney2/plugins/libkmm_plugin.la $(top_builddir)/libkdchart/libkmm_kdchart.la dialogs/libdialogs.a $(LIB_TDEABC) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEUTILS) SUBDIRS = mymoney widgets dialogs wizards views converter pics icons html templates plugins reports misc @@ -99,7 +99,7 @@ INCLUDES= $(all_includes) -I$(top_srcdir) -I. -I$(top_builddir)/kmymoney2/dialog METASOURCES = AUTO # the library search path. -kmymoney2_LDFLAGS = $(all_libraries) $(kde_RPATH) -export-dynamic $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KUTILS) +kmymoney2_LDFLAGS = $(all_libraries) $(kde_RPATH) -export-dynamic $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEUTILS) # Uncomment the following two lines if you add a ui.rc file for your application to make use of # KDE @@ -166,6 +166,6 @@ kmymoneytest_SOURCES = kmymoneytest.cpp kmymoneyutils.cpp kmymoneyglobalsettings kmymoneytest_LDADD = ./mymoney/storage/libstoragetest.a ./mymoney/libmymoneytest.a ./converter/libconvertertest.a ./reports/libreportstest.a $(kmymoney2_LDADD) kmymoneysettings.$(OBJEXT) # the library search path. -kmymoneytest_LDFLAGS = $(all_libraries) $(kde_RPATH) $(CPPUNIT_LIBS) $(LIB_KUTILS) +kmymoneytest_LDFLAGS = $(all_libraries) $(kde_RPATH) $(CPPUNIT_LIBS) $(LIB_TDEUTILS) endif diff --git a/kmymoney2/dialogs/knewfiledlg.cpp b/kmymoney2/dialogs/knewfiledlg.cpp index f9ec0a7..454fe2f 100644 --- a/kmymoney2/dialogs/knewfiledlg.cpp +++ b/kmymoney2/dialogs/knewfiledlg.cpp @@ -82,13 +82,13 @@ void KNewFileDlg::init(const TQString& title) #endif if(!showLoadButton) - kabcBtn->hide(); + tdeabcBtn->hide(); userNameEdit->setFocus(); connect(cancelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); connect(okBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(okClicked())); - connect(kabcBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadFromKABC())); + connect(tdeabcBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadFromKABC())); } KNewFileDlg::~KNewFileDlg(){ diff --git a/kmymoney2/dialogs/knewfiledlgdecl.ui b/kmymoney2/dialogs/knewfiledlgdecl.ui index b9f39da..0cfa81a 100644 --- a/kmymoney2/dialogs/knewfiledlgdecl.ui +++ b/kmymoney2/dialogs/knewfiledlgdecl.ui @@ -219,7 +219,7 @@ your KMyMoney file. - kabcBtn + tdeabcBtn Load from Addressbook @@ -320,7 +320,7 @@ your KMyMoney file. postcodeEdit telephoneEdit emailEdit - kabcBtn + tdeabcBtn okBtn cancelBtn diff --git a/kmymoney2/dialogs/tdeconfirmmanualenterdlg.h b/kmymoney2/dialogs/tdeconfirmmanualenterdlg.h index 2e878a3..107936d 100644 --- a/kmymoney2/dialogs/tdeconfirmmanualenterdlg.h +++ b/kmymoney2/dialogs/tdeconfirmmanualenterdlg.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KCONFIRMMANUALENTERDLG_H -#define KCONFIRMMANUALENTERDLG_H +#ifndef TDECONFIRMMANUALENTERDLG_H +#define TDECONFIRMMANUALENTERDLG_H // ---------------------------------------------------------------------------- // QT Includes @@ -58,4 +58,4 @@ public: Action action(void) const; }; -#endif // KCONFIRMMANUALENTERDLG_H +#endif // TDECONFIRMMANUALENTERDLG_H diff --git a/kmymoney2/dialogs/tderecentfileitem.h b/kmymoney2/dialogs/tderecentfileitem.h index 5a7cfb5..cbd521b 100644 --- a/kmymoney2/dialogs/tderecentfileitem.h +++ b/kmymoney2/dialogs/tderecentfileitem.h @@ -19,8 +19,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef KRECENTFILEITEM_H -#define KRECENTFILEITEM_H +#ifndef TDERECENTFILEITEM_H +#define TDERECENTFILEITEM_H // ---------------------------------------------------------------------------- // QT Includes diff --git a/kmymoney2/dialogs/tdeselectdatabasedlg.h b/kmymoney2/dialogs/tdeselectdatabasedlg.h index be06308..af52408 100644 --- a/kmymoney2/dialogs/tdeselectdatabasedlg.h +++ b/kmymoney2/dialogs/tdeselectdatabasedlg.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KSELECTDATABASEDLG_H -#define KSELECTDATABASEDLG_H +#ifndef TDESELECTDATABASEDLG_H +#define TDESELECTDATABASEDLG_H // ---------------------------------------------------------------------------- // QT Includes diff --git a/kmymoney2/dialogs/tdeselecttransactionsdlg.h b/kmymoney2/dialogs/tdeselecttransactionsdlg.h index a6cd4ca..c12202e 100644 --- a/kmymoney2/dialogs/tdeselecttransactionsdlg.h +++ b/kmymoney2/dialogs/tdeselecttransactionsdlg.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KSELECTTRANSACTIONSDLG_H -#define KSELECTTRANSACTIONSDLG_H +#ifndef TDESELECTTRANSACTIONSDLG_H +#define TDESELECTTRANSACTIONSDLG_H // ---------------------------------------------------------------------------- // QT Includes diff --git a/kmymoney2/plugins/ofximport/Makefile.am b/kmymoney2/plugins/ofximport/Makefile.am index 66b7f6a..2d8ee90 100644 --- a/kmymoney2/plugins/ofximport/Makefile.am +++ b/kmymoney2/plugins/ofximport/Makefile.am @@ -16,7 +16,7 @@ kmm_ofximport_la_LIBADD = @OFX_LIBS@ dialogs/libdialogs.la ../libkmm_plugin.la . # LD flags for the plugin # -module says: this is a module, i.e. something you're going to dlopen # so e.g. it has no version number like a normal shared lib would have. -kmm_ofximport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TDEHTML) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_QT) -L../.libs +kmm_ofximport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TDEHTML) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_QT) -L../.libs # rc file containing the GUI for the plugin pluginsdir = $(kde_datadir)/kmm_ofximport diff --git a/kmymoney2/widgets/tdelistviewsearchline.h b/kmymoney2/widgets/tdelistviewsearchline.h index 2ffad3c..0bd5cd2 100644 --- a/kmymoney2/widgets/tdelistviewsearchline.h +++ b/kmymoney2/widgets/tdelistviewsearchline.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KLISTVIEWSEARCHLINE_H -#define KLISTVIEWSEARCHLINE_H +#ifndef TDELISTVIEWSEARCHLINE_H +#define TDELISTVIEWSEARCHLINE_H #include #include diff --git a/libkgpgfile/Makefile.am b/libkgpgfile/Makefile.am index b7b2529..155c8a2 100644 --- a/libkgpgfile/Makefile.am +++ b/libkgpgfile/Makefile.am @@ -5,7 +5,7 @@ METASOURCES = AUTO noinst_LTLIBRARIES = libkgpgfile.la libkgpgfile_la_SOURCES = kgpgfile.cpp -libkgpgfile_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libkgpgfile_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor #libkgpgfile_la_LIBADD = $(top_builddir)/libtdepim/libtdepim.la instdir=$(includedir)/kmymoney diff --git a/po/ca.po b/po/ca.po index 44e3632..ae1fb7f 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 849157e..98de7a0 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 7529a94..6ee7945 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 e21b1f9..2b4a201 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 b6fd026..adf7512 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 bd5a678..311412a 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 bd23c01..e320989 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 f01dce1..b88e9f1 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 e610c96..2c3613e 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 9c51838..dfe0151 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 1b87f15..ec14b74 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 f45b044..1982079 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 5fcbed0..9e85f86 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"