From fe50f29e05b1318b520a33179ea50c88b6e2c89a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 00:53:39 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kmymoney2/converter/mymoneygncreader.cpp | 2 +- kmymoney2/converter/mymoneyqifprofile.cpp | 2 +- kmymoney2/converter/mymoneyqifreader.cpp | 4 +- kmymoney2/converter/mymoneystatementreader.cpp | 2 +- kmymoney2/converter/mymoneytemplate.cpp | 2 +- kmymoney2/converter/webpricequote.cpp | 78 ++++---- kmymoney2/dialogs/Makefile.am | 8 +- kmymoney2/dialogs/kaccountselectdlg.cpp | 2 +- kmymoney2/dialogs/kbackupdlg.cpp | 2 +- kmymoney2/dialogs/kchooseimportexportdlg.cpp | 2 +- kmymoney2/dialogs/kconfirmmanualenterdlg.cpp | 202 --------------------- kmymoney2/dialogs/kconfirmmanualenterdlg.h | 61 ------- kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui | 160 ---------------- kmymoney2/dialogs/kcsvprogressdlg.cpp | 26 +-- kmymoney2/dialogs/kequitypriceupdatedlg.cpp | 2 +- kmymoney2/dialogs/kexportdlg.cpp | 34 ++-- kmymoney2/dialogs/kimportdlg.cpp | 20 +- kmymoney2/dialogs/ksplittransactiondlg.cpp | 2 +- kmymoney2/dialogs/kstartdlg.cpp | 8 +- kmymoney2/dialogs/mymoneyqifprofileeditor.cpp | 2 +- .../dialogs/settings/ksettingsonlinequotes.cpp | 2 +- kmymoney2/dialogs/tdeconfirmmanualenterdlg.cpp | 202 +++++++++++++++++++++ kmymoney2/dialogs/tdeconfirmmanualenterdlg.h | 61 +++++++ kmymoney2/dialogs/tdeconfirmmanualenterdlgdecl.ui | 160 ++++++++++++++++ kmymoney2/kmymoney2.cpp | 68 +++---- kmymoney2/kmymoney2.h | 2 +- kmymoney2/kmymoneyutils.cpp | 2 +- kmymoney2/plugins/importinterface.h | 2 +- kmymoney2/plugins/interfaces/kmmimportinterface.h | 2 +- .../ofximport/dialogs/kofxdirectconnectdlg.cpp | 4 +- kmymoney2/plugins/ofximport/ofximporterplugin.cpp | 2 +- kmymoney2/plugins/ofximport/ofxpartner.cpp | 2 +- kmymoney2/plugins/pluginloader.cpp | 2 +- kmymoney2/views/kbudgetview.cpp | 2 +- kmymoney2/views/khomeview.cpp | 2 +- kmymoney2/views/kmymoneyview.cpp | 6 +- kmymoney2/views/kreportsview.cpp | 4 +- kmymoney2/views/kscheduledlistitem.cpp | 2 +- kmymoney2/views/kscheduledview.cpp | 2 +- kmymoney2/widgets/kmymoneycombo.cpp | 2 +- kmymoney2/widgets/kmymoneyedit.cpp | 8 +- kmymoney2/widgets/kmymoneygpgconfig.cpp | 2 +- kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp | 2 +- kmymoney2/widgets/kmymoneypriceview.cpp | 8 +- kmymoney2/wizards/newuserwizard/Makefile.am | 6 +- kmymoney2/wizards/newuserwizard/kfilepagedecl.ui | 86 --------- kmymoney2/wizards/newuserwizard/knewuserwizard.cpp | 2 +- kmymoney2/wizards/newuserwizard/knewuserwizard_p.h | 2 +- kmymoney2/wizards/newuserwizard/tdefilepagedecl.ui | 86 +++++++++ 49 files changed, 677 insertions(+), 677 deletions(-) delete mode 100644 kmymoney2/dialogs/kconfirmmanualenterdlg.cpp delete mode 100644 kmymoney2/dialogs/kconfirmmanualenterdlg.h delete mode 100644 kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui create mode 100644 kmymoney2/dialogs/tdeconfirmmanualenterdlg.cpp create mode 100644 kmymoney2/dialogs/tdeconfirmmanualenterdlg.h create mode 100644 kmymoney2/dialogs/tdeconfirmmanualenterdlgdecl.ui delete mode 100644 kmymoney2/wizards/newuserwizard/kfilepagedecl.ui create mode 100644 kmymoney2/wizards/newuserwizard/tdefilepagedecl.ui (limited to 'kmymoney2') diff --git a/kmymoney2/converter/mymoneygncreader.cpp b/kmymoney2/converter/mymoneygncreader.cpp index 4211ed9..d617bb0 100644 --- a/kmymoney2/converter/mymoneygncreader.cpp +++ b/kmymoney2/converter/mymoneygncreader.cpp @@ -33,7 +33,7 @@ email : mte@users.sourceforge.net // KDE Includes #ifndef _GNCFILEANON #include - #include + #include #include #endif diff --git a/kmymoney2/converter/mymoneyqifprofile.cpp b/kmymoney2/converter/mymoneyqifprofile.cpp index d65a384..a40685f 100644 --- a/kmymoney2/converter/mymoneyqifprofile.cpp +++ b/kmymoney2/converter/mymoneyqifprofile.cpp @@ -25,7 +25,7 @@ // KDE Includes #include -#include +#include #include #include diff --git a/kmymoney2/converter/mymoneyqifreader.cpp b/kmymoney2/converter/mymoneyqifreader.cpp index 2e7266b..33c844b 100644 --- a/kmymoney2/converter/mymoneyqifreader.cpp +++ b/kmymoney2/converter/mymoneyqifreader.cpp @@ -38,11 +38,11 @@ #include #include -#include +#include #include #include #include -#include +#include // ---------------------------------------------------------------------------- // Project Headers diff --git a/kmymoney2/converter/mymoneystatementreader.cpp b/kmymoney2/converter/mymoneystatementreader.cpp index 8bef60e..87fa409 100644 --- a/kmymoney2/converter/mymoneystatementreader.cpp +++ b/kmymoney2/converter/mymoneystatementreader.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/kmymoney2/converter/mymoneytemplate.cpp b/kmymoney2/converter/mymoneytemplate.cpp index 191474f..721e96a 100644 --- a/kmymoney2/converter/mymoneytemplate.cpp +++ b/kmymoney2/converter/mymoneytemplate.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include // ---------------------------------------------------------------------------- diff --git a/kmymoney2/converter/webpricequote.cpp b/kmymoney2/converter/webpricequote.cpp index b614dcc..14db612 100644 --- a/kmymoney2/converter/webpricequote.cpp +++ b/kmymoney2/converter/webpricequote.cpp @@ -26,13 +26,13 @@ // ---------------------------------------------------------------------------- // KDE Headers -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include #include @@ -598,8 +598,8 @@ TQStringList WebPriceQuote::quoteSources (const _quoteSystemE _system) { TQStringList WebPriceQuote::quoteSourcesNative() { - TDEConfig *kconfig = TDEGlobal::config(); - TQStringList groups = kconfig->groupList(); + TDEConfig *tdeconfig = TDEGlobal::config(); + TQStringList groups = tdeconfig->groupList(); TQStringList::Iterator it; TQRegExp onlineQuoteSource(TQString("^Online-Quote-Source-(.*)$")); @@ -614,23 +614,23 @@ TQStringList WebPriceQuote::quoteSourcesNative() // if the user has the OLD quote source defined, now is the // time to remove that entry and convert it to the new system. - if ( ! groups.count() && kconfig->hasGroup("Online Quotes Options") ) + if ( ! groups.count() && tdeconfig->hasGroup("Online Quotes Options") ) { - kconfig->setGroup("Online Quotes Options"); - TQString url(kconfig->readEntry("URL","http://finance.yahoo.com/d/quotes.csv?s=%1&f=sl1d1")); - TQString symbolRegExp(kconfig->readEntry("SymbolRegex","\"([^,\"]*)\",.*")); - TQString priceRegExp(kconfig->readEntry("PriceRegex","[^,]*,([^,]*),.*")); - TQString dateRegExp(kconfig->readEntry("DateRegex","[^,]*,[^,]*,\"([^\"]*)\"")); - kconfig->deleteGroup("Online Quotes Options"); + tdeconfig->setGroup("Online Quotes Options"); + TQString url(tdeconfig->readEntry("URL","http://finance.yahoo.com/d/quotes.csv?s=%1&f=sl1d1")); + TQString symbolRegExp(tdeconfig->readEntry("SymbolRegex","\"([^,\"]*)\",.*")); + TQString priceRegExp(tdeconfig->readEntry("PriceRegex","[^,]*,([^,]*),.*")); + TQString dateRegExp(tdeconfig->readEntry("DateRegex","[^,]*,[^,]*,\"([^\"]*)\"")); + tdeconfig->deleteGroup("Online Quotes Options"); groups += "Old Source"; - kconfig->setGroup(TQString("Online-Quote-Source-%1").arg("Old Source")); - kconfig->writeEntry("URL", url); - kconfig->writeEntry("SymbolRegex", symbolRegExp); - kconfig->writeEntry("PriceRegex",priceRegExp); - kconfig->writeEntry("DateRegex", dateRegExp); - kconfig->writeEntry("DateFormatRegex", "%m %d %y"); - kconfig->sync(); + tdeconfig->setGroup(TQString("Online-Quote-Source-%1").arg("Old Source")); + tdeconfig->writeEntry("URL", url); + tdeconfig->writeEntry("SymbolRegex", symbolRegExp); + tdeconfig->writeEntry("PriceRegex",priceRegExp); + tdeconfig->writeEntry("DateRegex", dateRegExp); + tdeconfig->writeEntry("DateFormatRegex", "%m %d %y"); + tdeconfig->sync(); } // Set up each of the default sources. These are done piecemeal so that @@ -643,7 +643,7 @@ TQStringList WebPriceQuote::quoteSourcesNative() { groups += (*it_source).m_name; (*it_source).write(); - kconfig->sync(); + tdeconfig->sync(); } ++it_source; } @@ -683,29 +683,29 @@ WebPriceQuoteSource::WebPriceQuoteSource(const TQString& name, const TQString& u WebPriceQuoteSource::WebPriceQuoteSource(const TQString& name) { m_name = name; - TDEConfig *kconfig = TDEGlobal::config(); - kconfig->setGroup(TQString("Online-Quote-Source-%1").arg(m_name)); - m_sym = kconfig->readEntry("SymbolRegex"); - m_date = kconfig->readEntry("DateRegex"); - m_dateformat = kconfig->readEntry("DateFormatRegex","%m %d %y"); - m_price = kconfig->readEntry("PriceRegex"); - m_url = kconfig->readEntry("URL"); - m_skipStripping = kconfig->readBoolEntry("SkipStripping", false); + TDEConfig *tdeconfig = TDEGlobal::config(); + tdeconfig->setGroup(TQString("Online-Quote-Source-%1").arg(m_name)); + m_sym = tdeconfig->readEntry("SymbolRegex"); + m_date = tdeconfig->readEntry("DateRegex"); + m_dateformat = tdeconfig->readEntry("DateFormatRegex","%m %d %y"); + m_price = tdeconfig->readEntry("PriceRegex"); + m_url = tdeconfig->readEntry("URL"); + m_skipStripping = tdeconfig->readBoolEntry("SkipStripping", false); } void WebPriceQuoteSource::write(void) const { - TDEConfig *kconfig = TDEGlobal::config(); - kconfig->setGroup(TQString("Online-Quote-Source-%1").arg(m_name)); - kconfig->writeEntry("URL", m_url); - kconfig->writeEntry("PriceRegex", m_price); - kconfig->writeEntry("DateRegex", m_date); - kconfig->writeEntry("DateFormatRegex", m_dateformat); - kconfig->writeEntry("SymbolRegex", m_sym); + TDEConfig *tdeconfig = TDEGlobal::config(); + tdeconfig->setGroup(TQString("Online-Quote-Source-%1").arg(m_name)); + tdeconfig->writeEntry("URL", m_url); + tdeconfig->writeEntry("PriceRegex", m_price); + tdeconfig->writeEntry("DateRegex", m_date); + tdeconfig->writeEntry("DateFormatRegex", m_dateformat); + tdeconfig->writeEntry("SymbolRegex", m_sym); if(m_skipStripping) - kconfig->writeEntry("SkipStripping", m_skipStripping); + tdeconfig->writeEntry("SkipStripping", m_skipStripping); else - kconfig->deleteEntry("SkipStripping"); + tdeconfig->deleteEntry("SkipStripping"); } void WebPriceQuoteSource::rename(const TQString& name) @@ -717,8 +717,8 @@ void WebPriceQuoteSource::rename(const TQString& name) void WebPriceQuoteSource::remove(void) const { - TDEConfig *kconfig = TDEGlobal::config(); - kconfig->deleteGroup(TQString("Online-Quote-Source-%1").arg(m_name)); + TDEConfig *tdeconfig = TDEGlobal::config(); + tdeconfig->deleteGroup(TQString("Online-Quote-Source-%1").arg(m_name)); } // diff --git a/kmymoney2/dialogs/Makefile.am b/kmymoney2/dialogs/Makefile.am index ad9be80..e2fe204 100644 --- a/kmymoney2/dialogs/Makefile.am +++ b/kmymoney2/dialogs/Makefile.am @@ -5,14 +5,14 @@ INCLUDES = $(all_includes) -I$(top_srcdir) -I. -I$(top_srcdir)/libkdchart -I$(t libdialogs_a_METASOURCES = AUTO -libdialogs_a_SOURCES = kreportconfigurationfilterdlg.cpp kcurrencycalculator.cpp kcurrencyeditdlg.cpp keditequityentrydlg.cpp keditloanwizard.cpp knewloanwizard.cpp kenterscheduledlg.cpp krecentfileitem.cpp keditscheduledlg.cpp mymoneyqifprofileeditor.cpp kaccountselectdlg.cpp kupdatestockpricedlg.cpp knewequityentrydlg.cpp kstartdlg.cpp kreconciledlg.cpp knewfiledlg.cpp knewbankdlg.cpp knewaccountdlg.cpp kfindtransactiondlg.cpp kendingbalancedlg.cpp ksplittransactiondlg.cpp kimportdlg.cpp kexportdlg.cpp kcsvprogressdlg.cpp kchooseimportexportdlg.cpp kbackupdlg.cpp kequitypriceupdatedlg.cpp kmymoneypricedlg.cpp knewinvestmentwizard.cpp knewinvestmentwizard.h ksecuritylisteditor.cpp kgncimportoptionsdlg.cpp konlinequoteconfigurationdlg.cpp kgncpricesourcedlg.cpp kmymoneyfileinfodlg.cpp kselectdatabasedlg.cpp kpayeereassigndlg.cpp kcategoryreassigndlg.cpp kconfirmmanualenterdlg.cpp kaccountselectdlgdecl.ui kbackupdlgdecl.ui kchooseimportexportdlgdecl.ui kconfirmmanualenterdlgdecl.ui kcsvprogressdlgdecl.ui kcurrencycalculatordecl.ui kcurrencyeditdlgdecl.ui keditequityentrydecl.ui keditscheduledlgdecl.ui kendingbalancedlgdecl.ui kenterscheduledlgdecl.ui kequitypriceupdatedlgdecl.ui kexportdlgdecl.ui kfindtransactiondlgdecl.ui kgncimportoptionsdlgdecl.ui kimportdlgdecl.ui kmymoneypricedlgdecl.ui knewaccountdlgdecl.ui knewbankdlgdecl.ui knewequityentrydecl.ui knewfiledlgdecl.ui knewinvestmentwizarddecl.ui knewloanwizarddecl.ui konlinequoteconfigurationdecl.ui kreconciledlgdecl.ui ksecuritylisteditordecl.ui ksplitcorrectiondlg.ui ksplittransactiondlgdecl.ui kupdatestockpricedlgdecl.ui mymoneyqifprofileeditordecl.ui kgncpricesourcedlgdecl.ui kmymoneyfileinfodlgdecl.ui kselectdatabasedlgdecl.ui kpayeereassigndlgdecl.ui kcategoryreassigndlgdecl.ui transactioneditor.cpp investtransactioneditor.cpp investactivities.cpp kbalancechartdlg.cpp kplugindlg.ui kgpgkeyselectiondlg.cpp transactionmatcher.cpp kbalancewarning.cpp \ +libdialogs_a_SOURCES = kreportconfigurationfilterdlg.cpp kcurrencycalculator.cpp kcurrencyeditdlg.cpp keditequityentrydlg.cpp keditloanwizard.cpp knewloanwizard.cpp kenterscheduledlg.cpp krecentfileitem.cpp keditscheduledlg.cpp mymoneyqifprofileeditor.cpp kaccountselectdlg.cpp kupdatestockpricedlg.cpp knewequityentrydlg.cpp kstartdlg.cpp kreconciledlg.cpp knewfiledlg.cpp knewbankdlg.cpp knewaccountdlg.cpp kfindtransactiondlg.cpp kendingbalancedlg.cpp ksplittransactiondlg.cpp kimportdlg.cpp kexportdlg.cpp kcsvprogressdlg.cpp kchooseimportexportdlg.cpp kbackupdlg.cpp kequitypriceupdatedlg.cpp kmymoneypricedlg.cpp knewinvestmentwizard.cpp knewinvestmentwizard.h ksecuritylisteditor.cpp kgncimportoptionsdlg.cpp konlinequoteconfigurationdlg.cpp kgncpricesourcedlg.cpp kmymoneyfileinfodlg.cpp kselectdatabasedlg.cpp kpayeereassigndlg.cpp kcategoryreassigndlg.cpp tdeconfirmmanualenterdlg.cpp kaccountselectdlgdecl.ui kbackupdlgdecl.ui kchooseimportexportdlgdecl.ui tdeconfirmmanualenterdlgdecl.ui kcsvprogressdlgdecl.ui kcurrencycalculatordecl.ui kcurrencyeditdlgdecl.ui keditequityentrydecl.ui keditscheduledlgdecl.ui kendingbalancedlgdecl.ui kenterscheduledlgdecl.ui kequitypriceupdatedlgdecl.ui kexportdlgdecl.ui kfindtransactiondlgdecl.ui kgncimportoptionsdlgdecl.ui kimportdlgdecl.ui kmymoneypricedlgdecl.ui knewaccountdlgdecl.ui knewbankdlgdecl.ui knewequityentrydecl.ui knewfiledlgdecl.ui knewinvestmentwizarddecl.ui knewloanwizarddecl.ui konlinequoteconfigurationdecl.ui kreconciledlgdecl.ui ksecuritylisteditordecl.ui ksplitcorrectiondlg.ui ksplittransactiondlgdecl.ui kupdatestockpricedlgdecl.ui mymoneyqifprofileeditordecl.ui kgncpricesourcedlgdecl.ui kmymoneyfileinfodlgdecl.ui kselectdatabasedlgdecl.ui kpayeereassigndlgdecl.ui kcategoryreassigndlgdecl.ui transactioneditor.cpp investtransactioneditor.cpp investactivities.cpp kbalancechartdlg.cpp kplugindlg.ui kgpgkeyselectiondlg.cpp transactionmatcher.cpp kbalancewarning.cpp \ knewbudgetdlgdecl.ui knewbudgetdlg.cpp kselecttransactionsdlgdecl.ui kselecttransactionsdlg.cpp kmergetransactionsdlg.cpp ksortoptiondlg.ui kloadtemplatedlgdecl.ui kloadtemplatedlg.cpp kmymoneysplittable.cpp -EXTRA_DIST = kaccountselectdlgdecl.ui kbackupdlgdecl.ui kchooseimportexportdlgdecl.ui kconfirmmanualenterdlgdecl.ui kcsvprogressdlgdecl.ui kcurrencycalculatordecl.ui kcurrencyeditdlgdecl.ui keditequityentrydecl.ui keditscheduledlgdecl.ui kendingbalancedlgdecl.ui kenterscheduledlgdecl.ui kequitypriceupdatedlgdecl.ui kexportdlgdecl.ui kfindtransactiondlgdecl.ui kgncimportoptionsdlgdecl.ui kimportdlgdecl.ui kmymoneypricedlgdecl.ui knewaccountdlgdecl.ui knewbankdlgdecl.ui knewequityentrydecl.ui knewfiledlgdecl.ui knewinvestmentwizarddecl.ui knewloanwizarddecl.ui konlinequoteconfigurationdecl.ui kreconciledlgdecl.ui ksecuritylisteditordecl.ui ksplitcorrectiondlg.ui ksplittransactiondlgdecl.ui kupdatestockpricedlgdecl.ui mymoneyqifprofileeditordecl.ui kgncpricesourcedlgdecl.ui kmymoneyfileinfodlgdecl.ui kselectdatabasedlgdecl.ui kpayeereassigndlgdecl.ui kcategoryreassigndlgdecl.ui knewbudgetdlgdecl.ui kselecttransactionsdlgdecl.ui ksortoptiondlg.ui ksortoptiondlg.ui.h kplugindlg.ui kloadtemplatedlgdecl.ui +EXTRA_DIST = kaccountselectdlgdecl.ui kbackupdlgdecl.ui kchooseimportexportdlgdecl.ui tdeconfirmmanualenterdlgdecl.ui kcsvprogressdlgdecl.ui kcurrencycalculatordecl.ui kcurrencyeditdlgdecl.ui keditequityentrydecl.ui keditscheduledlgdecl.ui kendingbalancedlgdecl.ui kenterscheduledlgdecl.ui kequitypriceupdatedlgdecl.ui kexportdlgdecl.ui kfindtransactiondlgdecl.ui kgncimportoptionsdlgdecl.ui kimportdlgdecl.ui kmymoneypricedlgdecl.ui knewaccountdlgdecl.ui knewbankdlgdecl.ui knewequityentrydecl.ui knewfiledlgdecl.ui knewinvestmentwizarddecl.ui knewloanwizarddecl.ui konlinequoteconfigurationdecl.ui kreconciledlgdecl.ui ksecuritylisteditordecl.ui ksplitcorrectiondlg.ui ksplittransactiondlgdecl.ui kupdatestockpricedlgdecl.ui mymoneyqifprofileeditordecl.ui kgncpricesourcedlgdecl.ui kmymoneyfileinfodlgdecl.ui kselectdatabasedlgdecl.ui kpayeereassigndlgdecl.ui kcategoryreassigndlgdecl.ui knewbudgetdlgdecl.ui kselecttransactionsdlgdecl.ui ksortoptiondlg.ui ksortoptiondlg.ui.h kplugindlg.ui kloadtemplatedlgdecl.ui -DISTCLEANFILES= kaccountselectdlgdecl.cpp kbackupdlgdecl.cpp kchooseimportexportdlgdecl.cpp kcsvprogressdlgdecl.cpp kcurrencycalculatordecl.cpp kcurrencyeditdlgdecl.cpp keditequityentrydecl.cpp keditscheduledlgdecl.cpp kendingbalancedlgdecl.cpp kenterscheduledlgdecl.cpp kequitypriceupdatedlgdecl.cpp kexportdlgdecl.cpp kfindtransactiondlgdecl.cpp kgncimportoptionsdlgdecl.cpp kimportdlgdecl.cpp kmymoneypricedlgdecl.cpp knewaccountdlgdecl.cpp knewbankdlgdecl.cpp knewequityentrydecl.cpp knewfiledlgdecl.cpp knewinvestmentwizarddecl.cpp knewloanwizarddecl.cpp konlinequoteconfigurationdecl.cpp kreconciledlgdecl.cpp kreportconfigurationdecl.cpp ksecuritylisteditordecl.cpp ksplittransactiondlgdecl.cpp kupdatestockpricedlgdecl.cpp mymoneyqifprofileeditordecl.cpp kpayeereassigndlgdecl.cpp kcategoryreassigndlgdecl.cpp kconfirmmanualenterdlgdecl.cpp kaccountselectdlgdecl.h kbackupdlgdecl.h kchooseimportexportdlgdecl.h kcsvprogressdlgdecl.h kcurrencycalculatordecl.h kcurrencyeditdlgdecl.h keditequityentrydecl.h keditscheduledlgdecl.h kendingbalancedlgdecl.h kenterscheduledlgdecl.h kequitypriceupdatedlgdecl.h kexportdlgdecl.h kfindtransactiondlgdecl.h kgncimportoptionsdlgdecl.h kimportdlgdecl.h kmymoneypricedlgdecl.h knewaccountdlgdecl.h knewbankdlgdecl.h knewequityentrydecl.h knewfiledlgdecl.h knewinvestmentwizarddecl.h knewloanwizarddecl.h konlinequoteconfigurationdecl.h kreconciledlgdecl.h kreportconfigurationdecl.h ksecuritylisteditordecl.h ksplittransactiondlgdecl.h kupdatestockpricedlgdecl.h mymoneyqifprofileeditordecl.h kmymoneyfileinfodlgdecl.h kselectdatabasedlgdecl.h kpayeereassigndlgdecl.h kcategoryreassigndlgdecl.h knewbudgetdlgdecl.cpp knewbudgetdlgdecl.h kselecttransactionsdlgdecl.cpp kselecttransactionsdlgdecl.h kconfirmmanualenterdlgdecl.h kloadtemplatedlgdecl.cpp kloadtemplatedlgdecl.h +DISTCLEANFILES= kaccountselectdlgdecl.cpp kbackupdlgdecl.cpp kchooseimportexportdlgdecl.cpp kcsvprogressdlgdecl.cpp kcurrencycalculatordecl.cpp kcurrencyeditdlgdecl.cpp keditequityentrydecl.cpp keditscheduledlgdecl.cpp kendingbalancedlgdecl.cpp kenterscheduledlgdecl.cpp kequitypriceupdatedlgdecl.cpp kexportdlgdecl.cpp kfindtransactiondlgdecl.cpp kgncimportoptionsdlgdecl.cpp kimportdlgdecl.cpp kmymoneypricedlgdecl.cpp knewaccountdlgdecl.cpp knewbankdlgdecl.cpp knewequityentrydecl.cpp knewfiledlgdecl.cpp knewinvestmentwizarddecl.cpp knewloanwizarddecl.cpp konlinequoteconfigurationdecl.cpp kreconciledlgdecl.cpp kreportconfigurationdecl.cpp ksecuritylisteditordecl.cpp ksplittransactiondlgdecl.cpp kupdatestockpricedlgdecl.cpp mymoneyqifprofileeditordecl.cpp kpayeereassigndlgdecl.cpp kcategoryreassigndlgdecl.cpp tdeconfirmmanualenterdlgdecl.cpp kaccountselectdlgdecl.h kbackupdlgdecl.h kchooseimportexportdlgdecl.h kcsvprogressdlgdecl.h kcurrencycalculatordecl.h kcurrencyeditdlgdecl.h keditequityentrydecl.h keditscheduledlgdecl.h kendingbalancedlgdecl.h kenterscheduledlgdecl.h kequitypriceupdatedlgdecl.h kexportdlgdecl.h kfindtransactiondlgdecl.h kgncimportoptionsdlgdecl.h kimportdlgdecl.h kmymoneypricedlgdecl.h knewaccountdlgdecl.h knewbankdlgdecl.h knewequityentrydecl.h knewfiledlgdecl.h knewinvestmentwizarddecl.h knewloanwizarddecl.h konlinequoteconfigurationdecl.h kreconciledlgdecl.h kreportconfigurationdecl.h ksecuritylisteditordecl.h ksplittransactiondlgdecl.h kupdatestockpricedlgdecl.h mymoneyqifprofileeditordecl.h kmymoneyfileinfodlgdecl.h kselectdatabasedlgdecl.h kpayeereassigndlgdecl.h kcategoryreassigndlgdecl.h knewbudgetdlgdecl.cpp knewbudgetdlgdecl.h kselecttransactionsdlgdecl.cpp kselecttransactionsdlgdecl.h tdeconfirmmanualenterdlgdecl.h kloadtemplatedlgdecl.cpp kloadtemplatedlgdecl.h -noinst_HEADERS = keditscheduledlg.h kaccountselectdlg.h kbackupdlg.h kchooseimportexportdlg.h kcsvprogressdlg.h kcurrencyeditdlg.h keditequityentrydlg.h keditloanwizard.h kendingbalancedlg.h kenterscheduledlg.h kequitypriceupdatedlg.h kexportdlg.h kfindtransactiondlg.h kgncimportoptionsdlg.h kimportdlg.h kmymoneypricedlg.h knewaccountdlg.h knewbankdlg.h knewequityentrydlg.h knewfiledlg.h knewinvestmentwizard.h knewloanwizard.h konlinequoteconfigurationdlg.h krecentfileitem.h kreconciledlg.h kreportconfigurationfilterdlg.h ksecuritylisteditor.h ksplittransactiondlg.h kstartdlg.h kupdatestockpricedlg.h mymoneyqifprofileeditor.h kgncpricesourcedlg.h kmymoneyfileinfodlg.h kselectdatabasedlg.h kpayeereassigndlg.h kcategoryreassigndlg.h knewbudgetdlg.h kselecttransactionsdlg.h kmergetransactionsdlg.h kconfirmmanualenterdlg.h investactivities.h kbalancechartdlg.h kloadtemplatedlg.h kmymoneysplittable.h kgpgkeyselectiondlg.h transactionmatcher.h kbalancewarning.h +noinst_HEADERS = keditscheduledlg.h kaccountselectdlg.h kbackupdlg.h kchooseimportexportdlg.h kcsvprogressdlg.h kcurrencyeditdlg.h keditequityentrydlg.h keditloanwizard.h kendingbalancedlg.h kenterscheduledlg.h kequitypriceupdatedlg.h kexportdlg.h kfindtransactiondlg.h kgncimportoptionsdlg.h kimportdlg.h kmymoneypricedlg.h knewaccountdlg.h knewbankdlg.h knewequityentrydlg.h knewfiledlg.h knewinvestmentwizard.h knewloanwizard.h konlinequoteconfigurationdlg.h krecentfileitem.h kreconciledlg.h kreportconfigurationfilterdlg.h ksecuritylisteditor.h ksplittransactiondlg.h kstartdlg.h kupdatestockpricedlg.h mymoneyqifprofileeditor.h kgncpricesourcedlg.h kmymoneyfileinfodlg.h kselectdatabasedlg.h kpayeereassigndlg.h kcategoryreassigndlg.h knewbudgetdlg.h kselecttransactionsdlg.h kmergetransactionsdlg.h tdeconfirmmanualenterdlg.h investactivities.h kbalancechartdlg.h kloadtemplatedlg.h kmymoneysplittable.h kgpgkeyselectiondlg.h transactionmatcher.h kbalancewarning.h instdir=$(includedir)/kmymoney inst_HEADERS = transactioneditor.h investtransactioneditor.h kcurrencycalculator.h diff --git a/kmymoney2/dialogs/kaccountselectdlg.cpp b/kmymoney2/dialogs/kaccountselectdlg.cpp index 4b04752..42987ba 100644 --- a/kmymoney2/dialogs/kaccountselectdlg.cpp +++ b/kmymoney2/dialogs/kaccountselectdlg.cpp @@ -29,7 +29,7 @@ // KDE Includes #include -#include +#include #include #include #include diff --git a/kmymoney2/dialogs/kbackupdlg.cpp b/kmymoney2/dialogs/kbackupdlg.cpp index 0dadbe6..d931f90 100644 --- a/kmymoney2/dialogs/kbackupdlg.cpp +++ b/kmymoney2/dialogs/kbackupdlg.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include diff --git a/kmymoney2/dialogs/kchooseimportexportdlg.cpp b/kmymoney2/dialogs/kchooseimportexportdlg.cpp index 5674205..69741ae 100644 --- a/kmymoney2/dialogs/kchooseimportexportdlg.cpp +++ b/kmymoney2/dialogs/kchooseimportexportdlg.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include "kchooseimportexportdlg.h" diff --git a/kmymoney2/dialogs/kconfirmmanualenterdlg.cpp b/kmymoney2/dialogs/kconfirmmanualenterdlg.cpp deleted file mode 100644 index 966ed55..0000000 --- a/kmymoney2/dialogs/kconfirmmanualenterdlg.cpp +++ /dev/null @@ -1,202 +0,0 @@ -/*************************************************************************** - kconfirmmanualenterdlg.cpp - ------------------- - begin : Mon Apr 9 2007 - copyright : (C) 2007 by Thomas Baumgart - email : Thomas Baumgart - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -// ---------------------------------------------------------------------------- -// QT Includes - -#include - -// ---------------------------------------------------------------------------- -// KDE Includes - -#include -#include -#include -#include -#include - -// ---------------------------------------------------------------------------- -// Project Includes - -#include -#include -#include "kconfirmmanualenterdlg.h" - -KConfirmManualEnterDlg::KConfirmManualEnterDlg(const MyMoneySchedule& schedule, TQWidget* parent, const char* name) : - KConfirmManualEnterDlgDecl(parent, name) -{ - buttonOk->setGuiItem(KStdGuiItem::ok()); - buttonCancel->setGuiItem(KStdGuiItem::cancel()); - m_onceRadio->setChecked(true); - m_onceRadio->setFocus(); - - if(schedule.type() == MyMoneySchedule::TYPE_LOANPAYMENT) { - m_setRadio->setEnabled(false); - m_discardRadio->setEnabled(false); - } - -} - -void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, const MyMoneyTransaction& tn) -{ - TQString messageDetail(""); - MyMoneyFile* file = MyMoneyFile::instance(); - int noItemsChanged=0; - -#if 0 - // if no schedule is present, we cannot enter it - if(m_schedule.id().isEmpty()) - return false; - - if (m_fromAccountId == m_toAccountId) - { - KMessageBox::error(this, i18n("Account and transfer account are the same. Please change one.")); - m_from->setFocus(); - return false; - } - - if (!checkDateInPeriod(m_date->date())) - return false; -#endif - - try - { - TQString po, pn; - if(to.splits()[0].payeeId()) - po = file->payee(to.splits()[0].payeeId()).name(); - if(tn.splits()[0].payeeId()) - pn = file->payee(tn.splits()[0].payeeId()).name(); - - if (po != pn) { - noItemsChanged++; - messageDetail += i18n("Payee changed.
   Old: %1, New: %2

").arg(po).arg(pn); - } -#if 0 - if ( (m_schedule.type() == MyMoneySchedule::TYPE_TRANSFER || - m_schedule.type() == MyMoneySchedule::TYPE_BILL) && - m_from->currentText() != m_schedule.account().name()) - { - noItemsChanged++; - messageDetail += i18n("Account changed. Old: \"%1\", New: \"%2\"") - .arg(m_schedule.account().name()).arg(m_from->currentText()) + TQString("\n"); - } - - if ( m_schedule.type() == MyMoneySchedule::TYPE_DEPOSIT && - m_to->currentText() != m_schedule.account().name()) - { - noItemsChanged++; - messageDetail += i18n("Account changed. Old: \"%1\", New: \"%2\"") - .arg(m_schedule.account().name()).arg(m_to->currentText()) + TQString("\n"); - } -#endif - - if(to.splits()[0].accountId() != tn.splits()[0].accountId()) { - noItemsChanged++; - messageDetail += i18n("Account changed.
   Old: %1, New: %2

") - .arg(file->account(to.splits()[0].accountId()).name()) - .arg(file->account(tn.splits()[0].accountId()).name()); - } - - if(file->isTransfer(to) && file->isTransfer(tn)) { - if(to.splits()[1].accountId() != tn.splits()[1].accountId()) { - noItemsChanged++; - messageDetail += i18n("Transfer account changed.
   Old: %1, New: %2

") - .arg(file->account(to.splits()[1].accountId()).name()) - .arg(file->account(tn.splits()[1].accountId()).name()); - } - } else { - TQString co, cn; - switch(to.splitCount()) { - default: - co = i18n("Split transaction (category replacement)", "Split transaction"); - break; - case 2: - co = file->accountToCategory(to.splits()[1].accountId()); - case 1: - break; - } - - switch(tn.splitCount()) { - default: - cn = i18n("Split transaction (category replacement)", "Split transaction"); - break; - case 2: - cn = file->accountToCategory(tn.splits()[1].accountId()); - case 1: - break; - } - if (co != cn) - { - noItemsChanged++; - messageDetail += i18n("Category changed.
   Old: %1, New: %2

").arg(co).arg(cn); - } - } - - TQString mo, mn; - mo = to.splits()[0].memo(); - mn = tn.splits()[0].memo(); - if(mo.isEmpty()) - mo = TQString("")+i18n("empty")+TQString(""); - if(mn.isEmpty()) - mn = TQString("")+i18n("empty")+TQString(""); - if (mo != mn) - { - noItemsChanged++; - messageDetail += i18n("Memo changed.
   Old: %1, New: %2

").arg(mo).arg(mn); - } - - const MyMoneySecurity& sec = MyMoneyFile::instance()->security(to.commodity()); - MyMoneyMoney ao, an; - ao = to.splits()[0].value(); - an = tn.splits()[0].value(); - if (ao != an) { - noItemsChanged++; - messageDetail += i18n("Amount changed.
   Old: %1, New: %2

") - .arg(ao.formatMoney(sec.smallestAccountFraction())).arg(an.formatMoney(sec.smallestAccountFraction())); - } - - MyMoneySplit::reconcileFlagE fo, fn; - fo = to.splits()[0].reconcileFlag(); - fn = tn.splits()[0].reconcileFlag(); - if(fo != fn) { - noItemsChanged++; - messageDetail += i18n("Reconciliation flag changed.
   Old: %1, New: %2

") - .arg(KMyMoneyUtils::reconcileStateToString(fo, true)) - .arg(KMyMoneyUtils::reconcileStateToString(fn, true)); - } - } - catch (MyMoneyException *e) - { - KMessageBox::error(this, i18n("Fatal error in determining data: ") + e->what()); - delete e; - } - - messageDetail += ""; - m_details->setText(messageDetail); - return; -} - -KConfirmManualEnterDlg::Action KConfirmManualEnterDlg::action(void) const -{ - if(m_discardRadio->isChecked()) - return UseOriginal; - if(m_setRadio->isChecked()) - return ModifyAlways; - return ModifyOnce; -} - -#include "kconfirmmanualenterdlg.moc" diff --git a/kmymoney2/dialogs/kconfirmmanualenterdlg.h b/kmymoney2/dialogs/kconfirmmanualenterdlg.h deleted file mode 100644 index 2a668b3..0000000 --- a/kmymoney2/dialogs/kconfirmmanualenterdlg.h +++ /dev/null @@ -1,61 +0,0 @@ -/*************************************************************************** - kconfirmmanualenterdlg.h - ------------------- - begin : Mon Apr 9 2007 - copyright : (C) 2007 by Thomas Baumgart - email : Thomas Baumgart - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef KCONFIRMMANUALENTERDLG_H -#define KCONFIRMMANUALENTERDLG_H - -// ---------------------------------------------------------------------------- -// QT Includes - -// ---------------------------------------------------------------------------- -// KDE Includes - -// ---------------------------------------------------------------------------- -// Project Includes - -// ---------------------------------------------------------------------------- -// Project Includes - -#include -#include "../dialogs/kconfirmmanualenterdlgdecl.h" - -class KConfirmManualEnterDlg : public KConfirmManualEnterDlgDecl -{ - Q_OBJECT - -public: - KConfirmManualEnterDlg(const MyMoneySchedule& schedule, TQWidget* parent = 0, const char* name = 0); - - typedef enum { - UseOriginal = 0, - ModifyOnce, - ModifyAlways - } Action; - - /** - * setup the dialog for the difference between the original transaction - * @a to and the transaction to be entered @a tn. - */ - void loadTransactions(const MyMoneyTransaction& to, const MyMoneyTransaction& tn); - - /** - * Returns information about what to do with the transaction - */ - Action action(void) const; -}; - -#endif // KCONFIRMMANUALENTERDLG_H diff --git a/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui b/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui deleted file mode 100644 index a605fdb..0000000 --- a/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui +++ /dev/null @@ -1,160 +0,0 @@ - -KConfirmManualEnterDlgDecl - - - KConfirmManualEnterDlgDecl - - - - 0 - 0 - 578 - 384 - - - - Confirm Manual Enter - - - true - - - - unnamed - - - 11 - - - 6 - - - - m_message - - - The following changes have been made to the transaction data: - - - RichText - - - - - m_details - - - true - - - - - buttonGroup1 - - - - - - - Please choose what you wish to do with the above changes - - - 1 - - - - unnamed - - - - m_discardRadio - - - Discard the changes and enter the original transaction into the register. - - - - - m_onceRadio - - - Enter these new values this one time, for this occurence only. - - - - - m_setRadio - - - Set all further occurences in this schedule to be these values. - - - - - - - layout3 - - - - unnamed - - - - Horizontal Spacing2 - - - Horizontal - - - Expanding - - - - 180 - 16 - - - - - - buttonOk - - - OK - - - true - - - true - - - - - buttonCancel - - - Cancel - - - - - - - - - buttonOk - clicked() - KConfirmManualEnterDlgDecl - accept() - - - buttonCancel - clicked() - KConfirmManualEnterDlgDecl - reject() - - - - diff --git a/kmymoney2/dialogs/kcsvprogressdlg.cpp b/kmymoney2/dialogs/kcsvprogressdlg.cpp index 05d8f55..1337715 100644 --- a/kmymoney2/dialogs/kcsvprogressdlg.cpp +++ b/kmymoney2/dialogs/kcsvprogressdlg.cpp @@ -34,11 +34,11 @@ // ---------------------------------------------------------------------------- // KDE Includes -#include +#include #include #include #include -#include +#include // ---------------------------------------------------------------------------- // Project Includes @@ -214,11 +214,11 @@ void KCsvProgressDlg::slotFileTextChanged(const TQString& text) void KCsvProgressDlg::readConfig(void) { - TDEConfig *kconfig = TDEGlobal::config(); - kconfig->setGroup("Last Use Settings"); - m_kmymoneydateStart->setDate(kconfig->readDateTimeEntry("KCsvProgressDlg_StartDate").date()); - m_kmymoneydateEnd->setDate(kconfig->readDateTimeEntry("KCsvProgressDlg_EndDate").date()); - m_qlineeditFile->setText(kconfig->readEntry("KCsvProgressDlg_LastFile", "")); + TDEConfig *tdeconfig = TDEGlobal::config(); + tdeconfig->setGroup("Last Use Settings"); + m_kmymoneydateStart->setDate(tdeconfig->readDateTimeEntry("KCsvProgressDlg_StartDate").date()); + m_kmymoneydateEnd->setDate(tdeconfig->readDateTimeEntry("KCsvProgressDlg_EndDate").date()); + m_qlineeditFile->setText(tdeconfig->readEntry("KCsvProgressDlg_LastFile", "")); if (m_qlineeditFile->text().length()>=1) m_qbuttonRun->setEnabled(true); else @@ -227,12 +227,12 @@ void KCsvProgressDlg::readConfig(void) void KCsvProgressDlg::writeConfig(void) { - TDEConfig *kconfig = TDEGlobal::config(); - kconfig->setGroup("Last Use Settings"); - kconfig->writeEntry("KCsvProgressDlg_LastFile", m_qlineeditFile->text()); - kconfig->writeEntry("KCsvProgressDlg_StartDate", TQDateTime(m_kmymoneydateStart->date())); - kconfig->writeEntry("KCsvProgressDlg_EndDate", TQDateTime(m_kmymoneydateEnd->date())); - kconfig->sync(); + TDEConfig *tdeconfig = TDEGlobal::config(); + tdeconfig->setGroup("Last Use Settings"); + tdeconfig->writeEntry("KCsvProgressDlg_LastFile", m_qlineeditFile->text()); + tdeconfig->writeEntry("KCsvProgressDlg_StartDate", TQDateTime(m_kmymoneydateStart->date())); + tdeconfig->writeEntry("KCsvProgressDlg_EndDate", TQDateTime(m_kmymoneydateEnd->date())); + tdeconfig->sync(); } /** Update the progress bar, and update the transaction count indicator. */ diff --git a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp index 409c15e..3af2912 100644 --- a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp +++ b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include // ---------------------------------------------------------------------------- // Project Includes diff --git a/kmymoney2/dialogs/kexportdlg.cpp b/kmymoney2/dialogs/kexportdlg.cpp index 51ce250..9a89a95 100644 --- a/kmymoney2/dialogs/kexportdlg.cpp +++ b/kmymoney2/dialogs/kexportdlg.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include @@ -156,28 +156,28 @@ void KExportDlg::slotOkClicked() void KExportDlg::readConfig(void) { - TDEConfig *kconfig = TDEGlobal::config(); - kconfig->setGroup("Last Use Settings"); - m_qlineeditFile->setText(kconfig->readEntry("KExportDlg_LastFile")); - m_qcheckboxAccount->setChecked(kconfig->readBoolEntry("KExportDlg_AccountOpt", true)); - m_qcheckboxCategories->setChecked(kconfig->readBoolEntry("KExportDlg_CatOpt", true)); - m_kmymoneydateStart->setDate(kconfig->readDateTimeEntry("KExportDlg_StartDate").date()); - m_kmymoneydateEnd->setDate(kconfig->readDateTimeEntry("KExportDlg_EndDate").date()); + TDEConfig *tdeconfig = TDEGlobal::config(); + tdeconfig->setGroup("Last Use Settings"); + m_qlineeditFile->setText(tdeconfig->readEntry("KExportDlg_LastFile")); + m_qcheckboxAccount->setChecked(tdeconfig->readBoolEntry("KExportDlg_AccountOpt", true)); + m_qcheckboxCategories->setChecked(tdeconfig->readBoolEntry("KExportDlg_CatOpt", true)); + m_kmymoneydateStart->setDate(tdeconfig->readDateTimeEntry("KExportDlg_StartDate").date()); + m_kmymoneydateEnd->setDate(tdeconfig->readDateTimeEntry("KExportDlg_EndDate").date()); // m_profileComboBox is loaded in loadProfiles(), so we don't worry here // m_accountComboBox is loaded in loadAccounts(), so we don't worry here } void KExportDlg::writeConfig(void) { - TDEConfig *kconfig = TDEGlobal::config(); - kconfig->setGroup("Last Use Settings"); - kconfig->writeEntry("KExportDlg_LastFile", m_qlineeditFile->text()); - kconfig->writeEntry("KExportDlg_AccountOpt", m_qcheckboxAccount->isChecked()); - kconfig->writeEntry("KExportDlg_CatOpt", m_qcheckboxCategories->isChecked()); - kconfig->writeEntry("KExportDlg_StartDate", TQDateTime(m_kmymoneydateStart->date())); - kconfig->writeEntry("KExportDlg_EndDate", TQDateTime(m_kmymoneydateEnd->date())); - kconfig->writeEntry("KExportDlg_LastProfile", m_profileComboBox->currentText()); - kconfig->sync(); + TDEConfig *tdeconfig = TDEGlobal::config(); + tdeconfig->setGroup("Last Use Settings"); + tdeconfig->writeEntry("KExportDlg_LastFile", m_qlineeditFile->text()); + tdeconfig->writeEntry("KExportDlg_AccountOpt", m_qcheckboxAccount->isChecked()); + tdeconfig->writeEntry("KExportDlg_CatOpt", m_qcheckboxCategories->isChecked()); + tdeconfig->writeEntry("KExportDlg_StartDate", TQDateTime(m_kmymoneydateStart->date())); + tdeconfig->writeEntry("KExportDlg_EndDate", TQDateTime(m_kmymoneydateEnd->date())); + tdeconfig->writeEntry("KExportDlg_LastProfile", m_profileComboBox->currentText()); + tdeconfig->sync(); } void KExportDlg::checkData(const TQString& accountId) diff --git a/kmymoney2/dialogs/kimportdlg.cpp b/kmymoney2/dialogs/kimportdlg.cpp index bfa44be..874469f 100644 --- a/kmymoney2/dialogs/kimportdlg.cpp +++ b/kmymoney2/dialogs/kimportdlg.cpp @@ -36,11 +36,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include // ---------------------------------------------------------------------------- @@ -130,18 +130,18 @@ void KImportDlg::slotOkClicked() void KImportDlg::readConfig(void) { - TDEConfig *kconfig = TDEGlobal::config(); - kconfig->setGroup("Last Use Settings"); - m_qlineeditFile->setText(kconfig->readEntry("KImportDlg_LastFile")); + TDEConfig *tdeconfig = TDEGlobal::config(); + tdeconfig->setGroup("Last Use Settings"); + m_qlineeditFile->setText(tdeconfig->readEntry("KImportDlg_LastFile")); } void KImportDlg::writeConfig(void) { - TDEConfig *kconfig = TDEGlobal::config(); - kconfig->setGroup("Last Use Settings"); - kconfig->writeEntry("KImportDlg_LastFile", m_qlineeditFile->text()); - kconfig->writeEntry("KImportDlg_LastProfile", m_profileComboBox->currentText()); - kconfig->sync(); + TDEConfig *tdeconfig = TDEGlobal::config(); + tdeconfig->setGroup("Last Use Settings"); + tdeconfig->writeEntry("KImportDlg_LastFile", m_qlineeditFile->text()); + tdeconfig->writeEntry("KImportDlg_LastProfile", m_profileComboBox->currentText()); + tdeconfig->sync(); } /** Make sure the text input is ok */ diff --git a/kmymoney2/dialogs/ksplittransactiondlg.cpp b/kmymoney2/dialogs/ksplittransactiondlg.cpp index d8c4f67..bf30d61 100644 --- a/kmymoney2/dialogs/ksplittransactiondlg.cpp +++ b/kmymoney2/dialogs/ksplittransactiondlg.cpp @@ -36,7 +36,7 @@ // KDE Includes #include -#include +#include #include #include #include diff --git a/kmymoney2/dialogs/kstartdlg.cpp b/kmymoney2/dialogs/kstartdlg.cpp index c4dc756..f6f1460 100644 --- a/kmymoney2/dialogs/kstartdlg.cpp +++ b/kmymoney2/dialogs/kstartdlg.cpp @@ -34,13 +34,13 @@ #include #include -#include +#include #include -#include +#include #include #include -#include -#include +#include +#include #include // ---------------------------------------------------------------------------- diff --git a/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp b/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp index 347a7f7..742b32c 100644 --- a/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp +++ b/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp @@ -30,7 +30,7 @@ #include "kdecompat.h" #include #include -#include +#include #include #include #include diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp b/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp index e3efec6..efb197d 100644 --- a/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp +++ b/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp @@ -24,7 +24,7 @@ // ---------------------------------------------------------------------------- // KDE Includes -#include +#include #include #include #include diff --git a/kmymoney2/dialogs/tdeconfirmmanualenterdlg.cpp b/kmymoney2/dialogs/tdeconfirmmanualenterdlg.cpp new file mode 100644 index 0000000..a420de5 --- /dev/null +++ b/kmymoney2/dialogs/tdeconfirmmanualenterdlg.cpp @@ -0,0 +1,202 @@ +/*************************************************************************** + tdeconfirmmanualenterdlg.cpp + ------------------- + begin : Mon Apr 9 2007 + copyright : (C) 2007 by Thomas Baumgart + email : Thomas Baumgart + ***************************************************************************/ + +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + +// ---------------------------------------------------------------------------- +// QT Includes + +#include + +// ---------------------------------------------------------------------------- +// KDE Includes + +#include +#include +#include +#include +#include + +// ---------------------------------------------------------------------------- +// Project Includes + +#include +#include +#include "tdeconfirmmanualenterdlg.h" + +KConfirmManualEnterDlg::KConfirmManualEnterDlg(const MyMoneySchedule& schedule, TQWidget* parent, const char* name) : + KConfirmManualEnterDlgDecl(parent, name) +{ + buttonOk->setGuiItem(KStdGuiItem::ok()); + buttonCancel->setGuiItem(KStdGuiItem::cancel()); + m_onceRadio->setChecked(true); + m_onceRadio->setFocus(); + + if(schedule.type() == MyMoneySchedule::TYPE_LOANPAYMENT) { + m_setRadio->setEnabled(false); + m_discardRadio->setEnabled(false); + } + +} + +void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, const MyMoneyTransaction& tn) +{ + TQString messageDetail(""); + MyMoneyFile* file = MyMoneyFile::instance(); + int noItemsChanged=0; + +#if 0 + // if no schedule is present, we cannot enter it + if(m_schedule.id().isEmpty()) + return false; + + if (m_fromAccountId == m_toAccountId) + { + KMessageBox::error(this, i18n("Account and transfer account are the same. Please change one.")); + m_from->setFocus(); + return false; + } + + if (!checkDateInPeriod(m_date->date())) + return false; +#endif + + try + { + TQString po, pn; + if(to.splits()[0].payeeId()) + po = file->payee(to.splits()[0].payeeId()).name(); + if(tn.splits()[0].payeeId()) + pn = file->payee(tn.splits()[0].payeeId()).name(); + + if (po != pn) { + noItemsChanged++; + messageDetail += i18n("Payee changed.
   Old: %1, New: %2

").arg(po).arg(pn); + } +#if 0 + if ( (m_schedule.type() == MyMoneySchedule::TYPE_TRANSFER || + m_schedule.type() == MyMoneySchedule::TYPE_BILL) && + m_from->currentText() != m_schedule.account().name()) + { + noItemsChanged++; + messageDetail += i18n("Account changed. Old: \"%1\", New: \"%2\"") + .arg(m_schedule.account().name()).arg(m_from->currentText()) + TQString("\n"); + } + + if ( m_schedule.type() == MyMoneySchedule::TYPE_DEPOSIT && + m_to->currentText() != m_schedule.account().name()) + { + noItemsChanged++; + messageDetail += i18n("Account changed. Old: \"%1\", New: \"%2\"") + .arg(m_schedule.account().name()).arg(m_to->currentText()) + TQString("\n"); + } +#endif + + if(to.splits()[0].accountId() != tn.splits()[0].accountId()) { + noItemsChanged++; + messageDetail += i18n("Account changed.
   Old: %1, New: %2

") + .arg(file->account(to.splits()[0].accountId()).name()) + .arg(file->account(tn.splits()[0].accountId()).name()); + } + + if(file->isTransfer(to) && file->isTransfer(tn)) { + if(to.splits()[1].accountId() != tn.splits()[1].accountId()) { + noItemsChanged++; + messageDetail += i18n("Transfer account changed.
   Old: %1, New: %2

") + .arg(file->account(to.splits()[1].accountId()).name()) + .arg(file->account(tn.splits()[1].accountId()).name()); + } + } else { + TQString co, cn; + switch(to.splitCount()) { + default: + co = i18n("Split transaction (category replacement)", "Split transaction"); + break; + case 2: + co = file->accountToCategory(to.splits()[1].accountId()); + case 1: + break; + } + + switch(tn.splitCount()) { + default: + cn = i18n("Split transaction (category replacement)", "Split transaction"); + break; + case 2: + cn = file->accountToCategory(tn.splits()[1].accountId()); + case 1: + break; + } + if (co != cn) + { + noItemsChanged++; + messageDetail += i18n("Category changed.
   Old: %1, New: %2

").arg(co).arg(cn); + } + } + + TQString mo, mn; + mo = to.splits()[0].memo(); + mn = tn.splits()[0].memo(); + if(mo.isEmpty()) + mo = TQString("")+i18n("empty")+TQString(""); + if(mn.isEmpty()) + mn = TQString("")+i18n("empty")+TQString(""); + if (mo != mn) + { + noItemsChanged++; + messageDetail += i18n("Memo changed.
   Old: %1, New: %2

").arg(mo).arg(mn); + } + + const MyMoneySecurity& sec = MyMoneyFile::instance()->security(to.commodity()); + MyMoneyMoney ao, an; + ao = to.splits()[0].value(); + an = tn.splits()[0].value(); + if (ao != an) { + noItemsChanged++; + messageDetail += i18n("Amount changed.
   Old: %1, New: %2

") + .arg(ao.formatMoney(sec.smallestAccountFraction())).arg(an.formatMoney(sec.smallestAccountFraction())); + } + + MyMoneySplit::reconcileFlagE fo, fn; + fo = to.splits()[0].reconcileFlag(); + fn = tn.splits()[0].reconcileFlag(); + if(fo != fn) { + noItemsChanged++; + messageDetail += i18n("Reconciliation flag changed.
   Old: %1, New: %2

") + .arg(KMyMoneyUtils::reconcileStateToString(fo, true)) + .arg(KMyMoneyUtils::reconcileStateToString(fn, true)); + } + } + catch (MyMoneyException *e) + { + KMessageBox::error(this, i18n("Fatal error in determining data: ") + e->what()); + delete e; + } + + messageDetail += ""; + m_details->setText(messageDetail); + return; +} + +KConfirmManualEnterDlg::Action KConfirmManualEnterDlg::action(void) const +{ + if(m_discardRadio->isChecked()) + return UseOriginal; + if(m_setRadio->isChecked()) + return ModifyAlways; + return ModifyOnce; +} + +#include "tdeconfirmmanualenterdlg.moc" diff --git a/kmymoney2/dialogs/tdeconfirmmanualenterdlg.h b/kmymoney2/dialogs/tdeconfirmmanualenterdlg.h new file mode 100644 index 0000000..2e878a3 --- /dev/null +++ b/kmymoney2/dialogs/tdeconfirmmanualenterdlg.h @@ -0,0 +1,61 @@ +/*************************************************************************** + tdeconfirmmanualenterdlg.h + ------------------- + begin : Mon Apr 9 2007 + copyright : (C) 2007 by Thomas Baumgart + email : Thomas Baumgart + ***************************************************************************/ + +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + +#ifndef KCONFIRMMANUALENTERDLG_H +#define KCONFIRMMANUALENTERDLG_H + +// ---------------------------------------------------------------------------- +// QT Includes + +// ---------------------------------------------------------------------------- +// KDE Includes + +// ---------------------------------------------------------------------------- +// Project Includes + +// ---------------------------------------------------------------------------- +// Project Includes + +#include +#include "../dialogs/tdeconfirmmanualenterdlgdecl.h" + +class KConfirmManualEnterDlg : public KConfirmManualEnterDlgDecl +{ + Q_OBJECT + +public: + KConfirmManualEnterDlg(const MyMoneySchedule& schedule, TQWidget* parent = 0, const char* name = 0); + + typedef enum { + UseOriginal = 0, + ModifyOnce, + ModifyAlways + } Action; + + /** + * setup the dialog for the difference between the original transaction + * @a to and the transaction to be entered @a tn. + */ + void loadTransactions(const MyMoneyTransaction& to, const MyMoneyTransaction& tn); + + /** + * Returns information about what to do with the transaction + */ + Action action(void) const; +}; + +#endif // KCONFIRMMANUALENTERDLG_H diff --git a/kmymoney2/dialogs/tdeconfirmmanualenterdlgdecl.ui b/kmymoney2/dialogs/tdeconfirmmanualenterdlgdecl.ui new file mode 100644 index 0000000..a605fdb --- /dev/null +++ b/kmymoney2/dialogs/tdeconfirmmanualenterdlgdecl.ui @@ -0,0 +1,160 @@ + +KConfirmManualEnterDlgDecl + + + KConfirmManualEnterDlgDecl + + + + 0 + 0 + 578 + 384 + + + + Confirm Manual Enter + + + true + + + + unnamed + + + 11 + + + 6 + + + + m_message + + + The following changes have been made to the transaction data: + + + RichText + + + + + m_details + + + true + + + + + buttonGroup1 + + + + + + + Please choose what you wish to do with the above changes + + + 1 + + + + unnamed + + + + m_discardRadio + + + Discard the changes and enter the original transaction into the register. + + + + + m_onceRadio + + + Enter these new values this one time, for this occurence only. + + + + + m_setRadio + + + Set all further occurences in this schedule to be these values. + + + + + + + layout3 + + + + unnamed + + + + Horizontal Spacing2 + + + Horizontal + + + Expanding + + + + 180 + 16 + + + + + + buttonOk + + + OK + + + true + + + true + + + + + buttonCancel + + + Cancel + + + + + + + + + buttonOk + clicked() + KConfirmManualEnterDlgDecl + accept() + + + buttonCancel + clicked() + KConfirmManualEnterDlgDecl + reject() + + + + diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp index 721dfab..8c58101 100644 --- a/kmymoney2/kmymoney2.cpp +++ b/kmymoney2/kmymoney2.cpp @@ -51,10 +51,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include @@ -62,12 +62,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include // ---------------------------------------------------------------------------- @@ -93,7 +93,7 @@ #include "dialogs/kimportdlg.h" #include "dialogs/mymoneyqifprofileeditor.h" #include "dialogs/kenterscheduledlg.h" -#include "dialogs/kconfirmmanualenterdlg.h" +#include "dialogs/tdeconfirmmanualenterdlg.h" #include "dialogs/kmymoneypricedlg.h" #include "dialogs/kcurrencyeditdlg.h" #include "dialogs/kequitypriceupdatedlg.h" @@ -2408,10 +2408,10 @@ void KMyMoney2App::slotCategoryNew(MyMoneyAccount& account, const MyMoneyAccount } else { // we should not keep the 'no' setting because that can confuse people like // I have seen in some usability tests. So we just delete it right away. - TDEConfig *kconfig = TDEGlobal::config(); - if(kconfig) { - kconfig->setGroup(TQString::fromLatin1("Notification Messages")); - kconfig->deleteEntry(TQString::fromLatin1("CreateNewCategories")); + TDEConfig *tdeconfig = TDEGlobal::config(); + if(tdeconfig) { + tdeconfig->setGroup(TQString::fromLatin1("Notification Messages")); + tdeconfig->deleteEntry(TQString::fromLatin1("CreateNewCategories")); } } } @@ -2582,10 +2582,10 @@ void KMyMoney2App::slotInvestmentDelete(void) } else { // we should not keep the 'no' setting because that can confuse people like // I have seen in some usability tests. So we just delete it right away. - TDEConfig *kconfig = TDEGlobal::config(); - if(kconfig) { - kconfig->setGroup(TQString::fromLatin1("Notification Messages")); - kconfig->deleteEntry(TQString::fromLatin1("DeleteInvestment")); + TDEConfig *tdeconfig = TDEGlobal::config(); + if(tdeconfig) { + tdeconfig->setGroup(TQString::fromLatin1("Notification Messages")); + tdeconfig->deleteEntry(TQString::fromLatin1("DeleteInvestment")); } } } @@ -3777,10 +3777,10 @@ void KMyMoney2App::slotPayeeNew(const TQString& newnameBase, TQString& id) doit = false; // we should not keep the 'no' setting because that can confuse people like // I have seen in some usability tests. So we just delete it right away. - TDEConfig *kconfig = TDEGlobal::config(); - if(kconfig) { - kconfig->setGroup(TQString::fromLatin1("Notification Messages")); - kconfig->deleteEntry(dontAskAgain); + TDEConfig *tdeconfig = TDEGlobal::config(); + if(tdeconfig) { + tdeconfig->setGroup(TQString::fromLatin1("Notification Messages")); + tdeconfig->deleteEntry(dontAskAgain); } } } @@ -4263,7 +4263,7 @@ void KMyMoney2App::slotKDELanguageSettings(void) TQString error; int pid; - TDEApplication::tdeinitExec("kcmshell", args, &error, &pid); + TDEApplication::tdeinitExec("tdecmshell", args, &error, &pid); } void KMyMoney2App::slotNewFeature(void) @@ -5751,28 +5751,28 @@ void KMyMoney2App::slotCheckSchedules(void) void KMyMoney2App::writeLastUsedDir(const TQString& directory) { //get global config object for our app. - TDEConfig *kconfig = TDEGlobal::config(); - if(kconfig) + TDEConfig *tdeconfig = TDEGlobal::config(); + if(tdeconfig) { - kconfig->setGroup("General Options"); + tdeconfig->setGroup("General Options"); //write path entry, no error handling since its void. - kconfig->writePathEntry("LastUsedDirectory", directory); + tdeconfig->writePathEntry("LastUsedDirectory", directory); } } void KMyMoney2App::writeLastUsedFile(const TQString& fileName) { //get global config object for our app. - TDEConfig *kconfig = TDEGlobal::config(); - if(kconfig) + TDEConfig *tdeconfig = TDEGlobal::config(); + if(tdeconfig) { - kconfig->setGroup("General Options"); + tdeconfig->setGroup("General Options"); // write path entry, no error handling since its void. // use a standard string, as fileName could contain a protocol // e.g. file:/home/thb/.... - kconfig->writeEntry("LastUsedFile", fileName); + tdeconfig->writeEntry("LastUsedFile", fileName); } } @@ -5781,13 +5781,13 @@ TQString KMyMoney2App::readLastUsedDir(void) const TQString str; //get global config object for our app. - TDEConfig *kconfig = TDEGlobal::config(); - if(kconfig) + TDEConfig *tdeconfig = TDEGlobal::config(); + if(tdeconfig) { - kconfig->setGroup("General Options"); + tdeconfig->setGroup("General Options"); //read path entry. Second parameter is the default if the setting is not found, which will be the default document path. - str = kconfig->readPathEntry("LastUsedDirectory", TDEGlobalSettings::documentPath()); + str = tdeconfig->readPathEntry("LastUsedDirectory", TDEGlobalSettings::documentPath()); // if the path stored is empty, we use the default nevertheless if(str.isEmpty()) str = TDEGlobalSettings::documentPath(); @@ -5801,13 +5801,13 @@ TQString KMyMoney2App::readLastUsedFile(void) const TQString str; // get global config object for our app. - TDEConfig *kconfig = TDEGlobal::config(); - if(kconfig) + TDEConfig *tdeconfig = TDEGlobal::config(); + if(tdeconfig) { - kconfig->setGroup("General Options"); + tdeconfig->setGroup("General Options"); // read filename entry. - str = kconfig->readEntry("LastUsedFile", ""); + str = tdeconfig->readEntry("LastUsedFile", ""); } return str; diff --git a/kmymoney2/kmymoney2.h b/kmymoney2/kmymoney2.h index 8f714a0..c714ea0 100644 --- a/kmymoney2/kmymoney2.h +++ b/kmymoney2/kmymoney2.h @@ -36,7 +36,7 @@ class TQLabel; #include #include #include -#include +#include #include class KComboBox; class KPushButton; diff --git a/kmymoney2/kmymoneyutils.cpp b/kmymoney2/kmymoneyutils.cpp index b9bac34..67782ec 100644 --- a/kmymoney2/kmymoneyutils.cpp +++ b/kmymoney2/kmymoneyutils.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include // ---------------------------------------------------------------------------- diff --git a/kmymoney2/plugins/importinterface.h b/kmymoney2/plugins/importinterface.h index 7ad0261..8249ed0 100644 --- a/kmymoney2/plugins/importinterface.h +++ b/kmymoney2/plugins/importinterface.h @@ -31,7 +31,7 @@ // ---------------------------------------------------------------------------- // KDE Includes -#include +#include #include class KPopupMenu; diff --git a/kmymoney2/plugins/interfaces/kmmimportinterface.h b/kmymoney2/plugins/interfaces/kmmimportinterface.h index bc88932..0e2cacc 100644 --- a/kmymoney2/plugins/interfaces/kmmimportinterface.h +++ b/kmymoney2/plugins/interfaces/kmmimportinterface.h @@ -28,7 +28,7 @@ // ---------------------------------------------------------------------------- // KDE Includes -#include +#include #include class KMyMoney2App; diff --git a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp index 4fb8ede..a875135 100644 --- a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp +++ b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp @@ -31,8 +31,8 @@ // KDE Includes #include -#include -#include +#include +#include #include #include #include diff --git a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp index b9c4f5e..d5d9a85 100644 --- a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp +++ b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include #include diff --git a/kmymoney2/plugins/ofximport/ofxpartner.cpp b/kmymoney2/plugins/ofximport/ofxpartner.cpp index c91b2cc..d6fed01 100644 --- a/kmymoney2/plugins/ofximport/ofxpartner.cpp +++ b/kmymoney2/plugins/ofximport/ofxpartner.cpp @@ -39,7 +39,7 @@ // KDE Includes -#include +#include #include #include diff --git a/kmymoney2/plugins/pluginloader.cpp b/kmymoney2/plugins/pluginloader.cpp index 3213781..b2305ac 100644 --- a/kmymoney2/plugins/pluginloader.cpp +++ b/kmymoney2/plugins/pluginloader.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/kmymoney2/views/kbudgetview.cpp b/kmymoney2/views/kbudgetview.cpp index 2fd5ec0..8656970 100644 --- a/kmymoney2/views/kbudgetview.cpp +++ b/kmymoney2/views/kbudgetview.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp index 680b384..1a78cac 100644 --- a/kmymoney2/views/khomeview.cpp +++ b/kmymoney2/views/khomeview.cpp @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kmymoney2/views/kmymoneyview.cpp b/kmymoney2/views/kmymoneyview.cpp index 1a4136c..48c676f 100644 --- a/kmymoney2/views/kmymoneyview.cpp +++ b/kmymoney2/views/kmymoneyview.cpp @@ -42,7 +42,7 @@ #include "kdecompat.h" -#include +#include #include #include #include @@ -50,12 +50,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/kmymoney2/views/kreportsview.cpp b/kmymoney2/views/kreportsview.cpp index 90ca8a3..daaf1c3 100755 --- a/kmymoney2/views/kreportsview.cpp +++ b/kmymoney2/views/kreportsview.cpp @@ -54,9 +54,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/kmymoney2/views/kscheduledlistitem.cpp b/kmymoney2/views/kscheduledlistitem.cpp index dc44b46..8829a7a 100644 --- a/kmymoney2/views/kscheduledlistitem.cpp +++ b/kmymoney2/views/kscheduledlistitem.cpp @@ -29,7 +29,7 @@ // ---------------------------------------------------------------------------- // KDE Includes -#include +#include #include #include #include diff --git a/kmymoney2/views/kscheduledview.cpp b/kmymoney2/views/kscheduledview.cpp index 26df1ac..768a9c4 100644 --- a/kmymoney2/views/kscheduledview.cpp +++ b/kmymoney2/views/kscheduledview.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include diff --git a/kmymoney2/widgets/kmymoneycombo.cpp b/kmymoney2/widgets/kmymoneycombo.cpp index d637808..56c7e31 100644 --- a/kmymoney2/widgets/kmymoneycombo.cpp +++ b/kmymoney2/widgets/kmymoneycombo.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include // ---------------------------------------------------------------------------- // Project Includes diff --git a/kmymoney2/widgets/kmymoneyedit.cpp b/kmymoney2/widgets/kmymoneyedit.cpp index fe086b9..032c3f5 100644 --- a/kmymoney2/widgets/kmymoneyedit.cpp +++ b/kmymoney2/widgets/kmymoneyedit.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include // ---------------------------------------------------------------------------- // Project Includes @@ -235,9 +235,9 @@ void kMyMoneyEdit::init(void) m_resetButton->setEnabled(false); m_resetButton->setFocusProxy(m_edit); - TDEConfig *kconfig = TDEGlobal::config(); - kconfig->setGroup("General Options"); - if(kconfig->readBoolEntry("DontShowCalculatorButton", false) == true) + TDEConfig *tdeconfig = TDEGlobal::config(); + tdeconfig->setGroup("General Options"); + if(tdeconfig->readBoolEntry("DontShowCalculatorButton", false) == true) setCalculatorButtonVisible(false); setSpacing(0); diff --git a/kmymoney2/widgets/kmymoneygpgconfig.cpp b/kmymoney2/widgets/kmymoneygpgconfig.cpp index df67d27..afc7d6b 100644 --- a/kmymoney2/widgets/kmymoneygpgconfig.cpp +++ b/kmymoney2/widgets/kmymoneygpgconfig.cpp @@ -24,7 +24,7 @@ // ---------------------------------------------------------------------------- // KDE Includes -#include +#include #include #include #include diff --git a/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp b/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp index 738749f..dbc6b35 100644 --- a/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp +++ b/kmymoney2/widgets/kmymoneyonlinequoteconfig.cpp @@ -23,7 +23,7 @@ // ---------------------------------------------------------------------------- // KDE Includes -#include +#include #include #include #include diff --git a/kmymoney2/widgets/kmymoneypriceview.cpp b/kmymoney2/widgets/kmymoneypriceview.cpp index f9c922c..e1dd25e 100644 --- a/kmymoney2/widgets/kmymoneypriceview.cpp +++ b/kmymoney2/widgets/kmymoneypriceview.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include // ---------------------------------------------------------------------------- @@ -66,9 +66,9 @@ KMyMoneyPriceItem::KMyMoneyPriceItem(KListView *view, const MyMoneyPrice& pr) : m_pr(pr) { MyMoneySecurity from, to; - TDEConfig *kconfig = TDEGlobal::config(); - kconfig->setGroup("General Options"); - int prec = kconfig->readNumEntry("PricePrecision", 4); + TDEConfig *tdeconfig = TDEGlobal::config(); + tdeconfig->setGroup("General Options"); + int prec = tdeconfig->readNumEntry("PricePrecision", 4); if(!m_pr.isValid()) m_pr = MyMoneyFile::instance()->price(m_pr.from(), m_pr.to(), m_pr.date()); diff --git a/kmymoney2/wizards/newuserwizard/Makefile.am b/kmymoney2/wizards/newuserwizard/Makefile.am index 36b9fdd..82becfb 100644 --- a/kmymoney2/wizards/newuserwizard/Makefile.am +++ b/kmymoney2/wizards/newuserwizard/Makefile.am @@ -5,11 +5,11 @@ INCLUDES = $(all_includes) -I../wizardpages -I$(top_srcdir) -I. libnewuserwizard_a_METASOURCES = AUTO -libnewuserwizard_a_SOURCES = knewuserwizard.cpp kgeneralpagedecl.ui kcurrencypagedecl.ui kpasswordpagedecl.ui kaccountpagedecl.ui kpreferencepagedecl.ui kfilepagedecl.ui kintropagedecl.ui +libnewuserwizard_a_SOURCES = knewuserwizard.cpp kgeneralpagedecl.ui kcurrencypagedecl.ui kpasswordpagedecl.ui kaccountpagedecl.ui kpreferencepagedecl.ui tdefilepagedecl.ui kintropagedecl.ui -EXTRA_DIST = kgeneralpagedecl.ui kcurrencypagedecl.ui kpasswordpagedecl.ui kaccountpagedecl.ui kpreferencepagedecl.ui kfilepagedecl.ui kintropagedecl.ui +EXTRA_DIST = kgeneralpagedecl.ui kcurrencypagedecl.ui kpasswordpagedecl.ui kaccountpagedecl.ui kpreferencepagedecl.ui tdefilepagedecl.ui kintropagedecl.ui -DISTCLEANFILES= kgeneralpagedecl.cpp kgeneralpagedecl.h kcurrencypagedecl.cpp kcurrencypagedecl.h kpasswordpagedecl.cpp kpasswordpagedecl.h kaccountpagedecl.cpp kaccountpagedecl.h kpreferencepagedecl.cpp kpreferencepagedecl.h kfilepagedecl.cpp kfilepagedecl.h kintropagedecl.cpp kintropagedecl.h +DISTCLEANFILES= kgeneralpagedecl.cpp kgeneralpagedecl.h kcurrencypagedecl.cpp kcurrencypagedecl.h kpasswordpagedecl.cpp kpasswordpagedecl.h kaccountpagedecl.cpp kaccountpagedecl.h kpreferencepagedecl.cpp kpreferencepagedecl.h tdefilepagedecl.cpp tdefilepagedecl.h kintropagedecl.cpp kintropagedecl.h noinst_HEADERS = knewuserwizard.h knewuserwizard_p.h diff --git a/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui b/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui deleted file mode 100644 index 316902a..0000000 --- a/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui +++ /dev/null @@ -1,86 +0,0 @@ - -KFilePageDecl - - - KFilePageDecl - - - - 0 - 0 - 600 - 350 - - - - - unnamed - - - - kActiveLabel1 - - - NoFocus - - - KMyMoney will store your financial data in a file on the disk. A standard filename within your KDE user environment will be the default. This is just provided for convenience and you can choose any other location here. - - - - - m_dataFileEdit - - - - - spacer1 - - - Vertical - - - Expanding - - - - 20 - 30 - - - - - - m_existingFileLabel - - - - 255 - 0 - 0 - - - - Either the currently selected file exists or the selected directory does not exist. Please make sure, that - -<ul> -<li>the selected directory exists and</li> -<li>the filename is not currently used in this directory.</li> -</ul> - - - - - m_finishLabel - - - NoFocus - - - This finishes the setup of your KMyMoney environment. You can now press the Finish button and start using KMyMoney to record your financial transactions. - - - - - - diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp index e9dd204..050e5fd 100644 --- a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp +++ b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard_p.h b/kmymoney2/wizards/newuserwizard/knewuserwizard_p.h index 8431f06..9542c07 100644 --- a/kmymoney2/wizards/newuserwizard/knewuserwizard_p.h +++ b/kmymoney2/wizards/newuserwizard/knewuserwizard_p.h @@ -29,7 +29,7 @@ #include "kintropagedecl.h" #include "kaccountpagedecl.h" #include "kpreferencepagedecl.h" -#include "kfilepagedecl.h" +#include "tdefilepagedecl.h" #include "../wizardpages/userinfo.h" #include "../wizardpages/currency.h" diff --git a/kmymoney2/wizards/newuserwizard/tdefilepagedecl.ui b/kmymoney2/wizards/newuserwizard/tdefilepagedecl.ui new file mode 100644 index 0000000..316902a --- /dev/null +++ b/kmymoney2/wizards/newuserwizard/tdefilepagedecl.ui @@ -0,0 +1,86 @@ + +KFilePageDecl + + + KFilePageDecl + + + + 0 + 0 + 600 + 350 + + + + + unnamed + + + + kActiveLabel1 + + + NoFocus + + + KMyMoney will store your financial data in a file on the disk. A standard filename within your KDE user environment will be the default. This is just provided for convenience and you can choose any other location here. + + + + + m_dataFileEdit + + + + + spacer1 + + + Vertical + + + Expanding + + + + 20 + 30 + + + + + + m_existingFileLabel + + + + 255 + 0 + 0 + + + + Either the currently selected file exists or the selected directory does not exist. Please make sure, that + +<ul> +<li>the selected directory exists and</li> +<li>the filename is not currently used in this directory.</li> +</ul> + + + + + m_finishLabel + + + NoFocus + + + This finishes the setup of your KMyMoney environment. You can now press the Finish button and start using KMyMoney to record your financial transactions. + + + + + + -- cgit v1.2.1