[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [skrooge/Feature] /: Better performances
From: Stephane Mankowski <stephane () mankowski ! fr>
Date: 2013-01-01 8:23:29
Message-ID: 20130101082329.C8B58A6091 () git ! kde ! org
[Download RAW message or body]
Git commit 369ab18f60e4c76447c8a910a5cb0ca600dccfff by Stephane Mankowski.
Committed on 01/01/2013 at 09:23.
Pushed by smankowski into branch 'Feature'.
Better performances
M +1 -1 plugins/generic/skg_file/skgfileplugin.cpp
M +1 -1 plugins/generic/skg_file/skgfileplugin.h
M +1 -1 plugins/generic/skg_monthly/skgmonthlyplugin.cpp
M +1 -1 plugins/generic/skg_monthly/skgmonthlypluginwidget.cpp
M +2 -2 plugins/generic/skg_undoredo/skgundoredoplugin.cpp
M +2 -2 plugins/generic/skg_undoredo/skgundoredoplugin.h
M +2 -2 plugins/skrooge/skrooge_bank/skgbankplugin.cpp
M +2 -2 plugins/skrooge/skrooge_bank/skgbankplugin.h
M +2 -2 plugins/skrooge/skrooge_budget/skgbudgetplugin.cpp
M +2 -2 plugins/skrooge/skrooge_budget/skgbudgetplugin.h
M +2 -2 plugins/skrooge/skrooge_calculator/skgcalculatorplugin.cpp
M +2 -2 plugins/skrooge/skrooge_calculator/skgcalculatorplugin.h
M +5 -3 plugins/skrooge/skrooge_categories/skgcategoriesplugin.cpp
M +2 -2 plugins/skrooge/skrooge_categories/skgcategoriesplugin.h
M +2 -2 plugins/skrooge/skrooge_importexport/skgimportexportplugin.cpp
M +2 -2 plugins/skrooge/skrooge_importexport/skgimportexportplugin.h
M +12 -2 plugins/skrooge/skrooge_operation/skgoperationplugin.cpp
M +2 -2 plugins/skrooge/skrooge_operation/skgoperationplugin.h
M +1 -1 plugins/skrooge/skrooge_payee/skgpayeeplugin.cpp
M +1 -1 plugins/skrooge/skrooge_payee/skgpayeeplugin.h
M +1 -1 plugins/skrooge/skrooge_report/skgreportplugin.cpp
M +1 -1 plugins/skrooge/skrooge_report/skgreportplugin.h
M +35 -21 plugins/skrooge/skrooge_scheduled/skgscheduledplugin.cpp
M +5 -2 plugins/skrooge/skrooge_scheduled/skgscheduledplugin.h
M +4 -4 plugins/skrooge/skrooge_search/skgsearchplugin.cpp
M +2 -2 plugins/skrooge/skrooge_search/skgsearchplugin.h
M +1 -1 plugins/skrooge/skrooge_tracker/skgtrackerplugin.cpp
M +1 -1 plugins/skrooge/skrooge_tracker/skgtrackerplugin.h
M +2 -2 plugins/skrooge/skrooge_unit/skgunitplugin.cpp
M +2 -2 plugins/skrooge/skrooge_unit/skgunitplugin.h
M +1 -1 skgbasegui/skghtmlboardwidget.cpp
M +2 -2 skgbasegui/skginterfaceplugin.cpp
M +2 -2 skgbasegui/skginterfaceplugin.h
M +3 -3 skgbasemodeler/skgreport.cpp
M +1 -1 skgbasemodeler/skgreport.h
http://commits.kde.org/skrooge/369ab18f60e4c76447c8a910a5cb0ca600dccfff
diff --git a/plugins/generic/skg_file/skgfileplugin.cpp \
b/plugins/generic/skg_file/skgfileplugin.cpp index b3a2fe7..a0c5b1a 100644
--- a/plugins/generic/skg_file/skgfileplugin.cpp
+++ b/plugins/generic/skg_file/skgfileplugin.cpp
@@ -502,7 +502,7 @@ void SKGFilePlugin::actionChangePassword()
}
}
-SKGAdviceList SKGFilePlugin::advice(const QStringList& iIgnoredAdvice) const
+SKGAdviceList SKGFilePlugin::advice(const QStringList& iIgnoredAdvice)
{
SKGTRACEIN(10, "SKGFilePlugin::advice");
SKGAdviceList output;
diff --git a/plugins/generic/skg_file/skgfileplugin.h \
b/plugins/generic/skg_file/skgfileplugin.h index ace84b0..2a297d5 100644
--- a/plugins/generic/skg_file/skgfileplugin.h
+++ b/plugins/generic/skg_file/skgfileplugin.h
@@ -123,7 +123,7 @@ public:
* The advice list of the plugin.
* @return The advice list of the plugin
*/
- virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice) const;
+ virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice);
Q_SIGNALS:
/**
diff --git a/plugins/generic/skg_monthly/skgmonthlyplugin.cpp \
b/plugins/generic/skg_monthly/skgmonthlyplugin.cpp index 2b52f8c..9e5ef6f 100644
--- a/plugins/generic/skg_monthly/skgmonthlyplugin.cpp
+++ b/plugins/generic/skg_monthly/skgmonthlyplugin.cpp
@@ -98,7 +98,7 @@ void SKGMonthlyPlugin::refreshMainPage()
} else {
if (m_currentBankDocument) {
SKGReport* rep = m_currentBankDocument->getReport();
- SKGError err = rep->getReportFormTemplate(rep, templateFile, html);
+ SKGError err = rep->getReportFromTemplate(rep, templateFile, html);
if (err) html += err.getFullMessageWithHistorical();
delete rep;
}
diff --git a/plugins/generic/skg_monthly/skgmonthlypluginwidget.cpp \
b/plugins/generic/skg_monthly/skgmonthlypluginwidget.cpp index 6b4b764..ebaee2a \
100644
--- a/plugins/generic/skg_monthly/skgmonthlypluginwidget.cpp
+++ b/plugins/generic/skg_monthly/skgmonthlypluginwidget.cpp
@@ -340,7 +340,7 @@ QString SKGMonthlyPluginWidget::getReport()
SKGReport* rep = getDocument()->getReport();
if (rep) {
rep->setMonth(getMonth());
- err = rep->getReportFormTemplate(rep, \
ui.kTemplate->itemData(ui.kTemplate->currentIndex()).toString(), html); + \
err = rep->getReportFromTemplate(rep, \
ui.kTemplate->itemData(ui.kTemplate->currentIndex()).toString(), html);
delete rep;
}
diff --git a/plugins/generic/skg_undoredo/skgundoredoplugin.cpp \
b/plugins/generic/skg_undoredo/skgundoredoplugin.cpp index d90b20e..ec07f00 100644
--- a/plugins/generic/skg_undoredo/skgundoredoplugin.cpp
+++ b/plugins/generic/skg_undoredo/skgundoredoplugin.cpp
@@ -218,7 +218,7 @@ int SKGUndoRedoPlugin::getOrder() const
return 4;
}
-SKGAdviceList SKGUndoRedoPlugin::advice(const QStringList& iIgnoredAdvice) const
+SKGAdviceList SKGUndoRedoPlugin::advice(const QStringList& iIgnoredAdvice)
{
SKGTRACEIN(10, "SKGUndoRedoPlugin::advice");
SKGAdviceList output;
@@ -243,7 +243,7 @@ SKGAdviceList SKGUndoRedoPlugin::advice(const QStringList& \
iIgnoredAdvice) const return output;
}
-SKGError SKGUndoRedoPlugin::executeAdviceCorrection(const QString& \
iAdviceIdentifier, int iSolution) const +SKGError \
SKGUndoRedoPlugin::executeAdviceCorrection(const QString& iAdviceIdentifier, int \
iSolution) {
SKGError err;
if (m_currentDocument && iAdviceIdentifier == "skgundoredoplugin_too_big") {
diff --git a/plugins/generic/skg_undoredo/skgundoredoplugin.h \
b/plugins/generic/skg_undoredo/skgundoredoplugin.h index dc5b2c7..cd41476 100644
--- a/plugins/generic/skg_undoredo/skgundoredoplugin.h
+++ b/plugins/generic/skg_undoredo/skgundoredoplugin.h
@@ -122,7 +122,7 @@ public:
* The advice list of the plugin.
* @return The advice list of the plugin
*/
- virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice) const;
+ virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice);
/**
* Must be implemented to execute the automatic correction for the advice.
@@ -131,7 +131,7 @@ public:
* @return an object managing the error. MUST return ERR_NOTIMPL if \
iAdviceIdentifier is not known
* @see SKGError
*/
- virtual SKGError executeAdviceCorrection(const QString& iAdviceIdentifier, int \
iSolution) const; + virtual SKGError executeAdviceCorrection(const QString& \
iAdviceIdentifier, int iSolution);
private Q_SLOTS:
void actionUndoSave();
diff --git a/plugins/skrooge/skrooge_bank/skgbankplugin.cpp \
b/plugins/skrooge/skrooge_bank/skgbankplugin.cpp index b9810c2..7af2e00 100644
--- a/plugins/skrooge/skrooge_bank/skgbankplugin.cpp
+++ b/plugins/skrooge/skrooge_bank/skgbankplugin.cpp
@@ -179,7 +179,7 @@ void SKGBankPlugin::actionReconciliate()
}
}
-SKGAdviceList SKGBankPlugin::advice(const QStringList& iIgnoredAdvice) const
+SKGAdviceList SKGBankPlugin::advice(const QStringList& iIgnoredAdvice)
{
SKGTRACEIN(10, "SKGBankPlugin::advice");
SKGAdviceList output;
@@ -232,7 +232,7 @@ SKGAdviceList SKGBankPlugin::advice(const QStringList& \
iIgnoredAdvice) const return output;
}
-SKGError SKGBankPlugin::executeAdviceCorrection(const QString& iAdviceIdentifier, \
int iSolution) const +SKGError SKGBankPlugin::executeAdviceCorrection(const QString& \
iAdviceIdentifier, int iSolution) {
if (m_currentBankDocument && \
iAdviceIdentifier.startsWith(QLatin1String("skgbankplugin_withoutaccount|"))) { \
//Get parameters
diff --git a/plugins/skrooge/skrooge_bank/skgbankplugin.h \
b/plugins/skrooge/skrooge_bank/skgbankplugin.h index fb60fa1..b3d94bf 100644
--- a/plugins/skrooge/skrooge_bank/skgbankplugin.h
+++ b/plugins/skrooge/skrooge_bank/skgbankplugin.h
@@ -124,7 +124,7 @@ public:
* The advice list of the plugin.
* @return The advice list of the plugin
*/
- virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice) const;
+ virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice);
/**
* Must be implemented to execute the automatic correction for the advice.
@@ -133,7 +133,7 @@ public:
* @return an object managing the error. MUST return ERR_NOTIMPL if \
iAdviceIdentifier is not known
* @see SKGError
*/
- virtual SKGError executeAdviceCorrection(const QString& iAdviceIdentifier, int \
iSolution) const; + virtual SKGError executeAdviceCorrection(const QString& \
iAdviceIdentifier, int iSolution);
private Q_SLOTS:
void actionReconciliate();
diff --git a/plugins/skrooge/skrooge_budget/skgbudgetplugin.cpp \
b/plugins/skrooge/skrooge_budget/skgbudgetplugin.cpp index 6fb60c5..593aaf5 100644
--- a/plugins/skrooge/skrooge_budget/skgbudgetplugin.cpp
+++ b/plugins/skrooge/skrooge_budget/skgbudgetplugin.cpp
@@ -112,7 +112,7 @@ bool SKGBudgetPlugin::isInPagesChooser() const
return true;
}
-SKGAdviceList SKGBudgetPlugin::advice(const QStringList& iIgnoredAdvice) const
+SKGAdviceList SKGBudgetPlugin::advice(const QStringList& iIgnoredAdvice)
{
SKGTRACEIN(10, "SKGBudgetPlugin::advice");
SKGAdviceList output;
@@ -170,7 +170,7 @@ SKGAdviceList SKGBudgetPlugin::advice(const QStringList& \
iIgnoredAdvice) const
return output;
}
-SKGError SKGBudgetPlugin::executeAdviceCorrection(const QString& iAdviceIdentifier, \
int iSolution) const +SKGError SKGBudgetPlugin::executeAdviceCorrection(const \
QString& iAdviceIdentifier, int iSolution) {
if (m_currentBankDocument && \
iAdviceIdentifier.startsWith(QLatin1String("skgbudgetplugin_alarm|"))) { //Get \
parameters
diff --git a/plugins/skrooge/skrooge_budget/skgbudgetplugin.h \
b/plugins/skrooge/skrooge_budget/skgbudgetplugin.h index 83c793d..8552f7b 100644
--- a/plugins/skrooge/skrooge_budget/skgbudgetplugin.h
+++ b/plugins/skrooge/skrooge_budget/skgbudgetplugin.h
@@ -99,7 +99,7 @@ public:
* The advice list of the plugin.
* @return The advice list of the plugin
*/
- virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice) const;
+ virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice);
/**
* Must be implemented to execute the automatic correction for the advice.
@@ -108,7 +108,7 @@ public:
* @return an object managing the error. MUST return ERR_NOTIMPL if \
iAdviceIdentifier is not known
* @see SKGError
*/
- virtual SKGError executeAdviceCorrection(const QString& iAdviceIdentifier, int \
iSolution) const; + virtual SKGError executeAdviceCorrection(const QString& \
iAdviceIdentifier, int iSolution);
private Q_SLOTS:
void onProcessRules();
diff --git a/plugins/skrooge/skrooge_calculator/skgcalculatorplugin.cpp \
b/plugins/skrooge/skrooge_calculator/skgcalculatorplugin.cpp index f43bcb7..4b3142d \
100644
--- a/plugins/skrooge/skrooge_calculator/skgcalculatorplugin.cpp
+++ b/plugins/skrooge/skrooge_calculator/skgcalculatorplugin.cpp
@@ -119,7 +119,7 @@ bool SKGCalculatorPlugin::isInPagesChooser() const
{
return true;
}
-SKGAdviceList SKGCalculatorPlugin::advice(const QStringList& iIgnoredAdvice) const
+SKGAdviceList SKGCalculatorPlugin::advice(const QStringList& iIgnoredAdvice)
{
SKGTRACEIN(10, "SKGCalculatorPlugin::advice");
SKGAdviceList output;
@@ -145,7 +145,7 @@ SKGAdviceList SKGCalculatorPlugin::advice(const QStringList& \
iIgnoredAdvice) con return output;
}
-SKGError SKGCalculatorPlugin::executeAdviceCorrection(const QString& \
iAdviceIdentifier, int iSolution) const +SKGError \
SKGCalculatorPlugin::executeAdviceCorrection(const QString& iAdviceIdentifier, int \
iSolution) {
if (m_currentBankDocument && \
iAdviceIdentifier.startsWith(QLatin1String("skgcalculatorplugin_nointerest|"))) { \
//Get parameters
diff --git a/plugins/skrooge/skrooge_calculator/skgcalculatorplugin.h \
b/plugins/skrooge/skrooge_calculator/skgcalculatorplugin.h index 1b053a4..b14769b \
100644
--- a/plugins/skrooge/skrooge_calculator/skgcalculatorplugin.h
+++ b/plugins/skrooge/skrooge_calculator/skgcalculatorplugin.h
@@ -119,7 +119,7 @@ public:
* The advice list of the plugin.
* @return The advice list of the plugin
*/
- virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice) const;
+ virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice);
/**
* Must be implemented to execute the automatic correction for the advice.
@@ -128,7 +128,7 @@ public:
* @return an object managing the error. MUST return ERR_NOTIMPL if \
iAdviceIdentifier is not known
* @see SKGError
*/
- virtual SKGError executeAdviceCorrection(const QString& iAdviceIdentifier, int \
iSolution) const; + virtual SKGError executeAdviceCorrection(const QString& \
iAdviceIdentifier, int iSolution);
private Q_SLOTS:
diff --git a/plugins/skrooge/skrooge_categories/skgcategoriesplugin.cpp \
b/plugins/skrooge/skrooge_categories/skgcategoriesplugin.cpp index 9ccc87a..e1a6606 \
100644
--- a/plugins/skrooge/skrooge_categories/skgcategoriesplugin.cpp
+++ b/plugins/skrooge/skrooge_categories/skgcategoriesplugin.cpp
@@ -231,14 +231,15 @@ bool SKGCategoriesPlugin::isInPagesChooser() const
return true;
}
-SKGAdviceList SKGCategoriesPlugin::advice(const QStringList& iIgnoredAdvice) const
+SKGAdviceList SKGCategoriesPlugin::advice(const QStringList& iIgnoredAdvice)
{
SKGTRACEIN(10, "SKGCategoriesPlugin::advice");
SKGAdviceList output;
//Check unused categies
if (!iIgnoredAdvice.contains("skgcategoriesplugin_unused")) {
+ SKGTRACEIN(10, "SKGCategoriesPlugin::advice-skgcategoriesplugin_unused");
bool exist = false;
- m_currentBankDocument->existObjects("category", "id IN (SELECT id FROM \
v_category_display WHERE i_SUMNBOPERATIONS=0)", exist); + \
m_currentBankDocument->existObjects("v_category_display", "i_SUMNBOPERATIONS=0", \
exist); if (exist) {
SKGAdvice ad;
ad.setUUID("skgcategoriesplugin_unused");
@@ -254,6 +255,7 @@ SKGAdviceList SKGCategoriesPlugin::advice(const QStringList& \
iIgnoredAdvice) con
//Check operations not validated
if (!iIgnoredAdvice.contains("skgmonthlyplugin_maincategoriesvariation")) {
+ SKGTRACEIN(10, \
"SKGCategoriesPlugin::advice-skgmonthlyplugin_maincategoriesvariation"); QString \
month = QDate::currentDate().toString("yyyy-MM");
QDate datepreviousmonth = \
QDate::currentDate().addDays(-QDate::currentDate().day()); QString previousmonth = \
datepreviousmonth.toString("yyyy-MM"); @@ -277,7 +279,7 @@ SKGAdviceList \
SKGCategoriesPlugin::advice(const QStringList& iIgnoredAdvice) con return output;
}
-SKGError SKGCategoriesPlugin::executeAdviceCorrection(const QString& \
iAdviceIdentifier, int iSolution) const +SKGError \
SKGCategoriesPlugin::executeAdviceCorrection(const QString& iAdviceIdentifier, int \
iSolution) {
if (m_currentBankDocument && \
iAdviceIdentifier.startsWith(QLatin1String("skgmonthlyplugin_maincategoriesvariation|"))) \
{ //Get parameters
diff --git a/plugins/skrooge/skrooge_categories/skgcategoriesplugin.h \
b/plugins/skrooge/skrooge_categories/skgcategoriesplugin.h index 914917a..c019cdb \
100644
--- a/plugins/skrooge/skrooge_categories/skgcategoriesplugin.h
+++ b/plugins/skrooge/skrooge_categories/skgcategoriesplugin.h
@@ -125,7 +125,7 @@ public:
* The advice list of the plugin.
* @return The advice list of the plugin
*/
- virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice) const;
+ virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice);
/**
* Must be implemented to execute the automatic correction for the advice.
@@ -134,7 +134,7 @@ public:
* @return an object managing the error. MUST return ERR_NOTIMPL if \
iAdviceIdentifier is not known
* @see SKGError
*/
- virtual SKGError executeAdviceCorrection(const QString& iAdviceIdentifier, int \
iSolution) const; + virtual SKGError executeAdviceCorrection(const QString& \
iAdviceIdentifier, int iSolution);
private Q_SLOTS:
void importStandardCategories();
diff --git a/plugins/skrooge/skrooge_importexport/skgimportexportplugin.cpp \
b/plugins/skrooge/skrooge_importexport/skgimportexportplugin.cpp index \
d96dddd..53b3d6e 100644
--- a/plugins/skrooge/skrooge_importexport/skgimportexportplugin.cpp
+++ b/plugins/skrooge/skrooge_importexport/skgimportexportplugin.cpp
@@ -627,7 +627,7 @@ void SKGImportExportPlugin::validateAllOperations()
SKGMainPanel::displayErrorMessage(err);
}
-SKGAdviceList SKGImportExportPlugin::advice(const QStringList& iIgnoredAdvice) const
+SKGAdviceList SKGImportExportPlugin::advice(const QStringList& iIgnoredAdvice)
{
SKGTRACEIN(10, "SKGImportExportPlugin::advice");
SKGAdviceList output;
@@ -688,7 +688,7 @@ SKGAdviceList SKGImportExportPlugin::advice(const QStringList& \
iIgnoredAdvice) c return output;
}
-SKGError SKGImportExportPlugin::executeAdviceCorrection(const QString& \
iAdviceIdentifier, int iSolution) const +SKGError \
SKGImportExportPlugin::executeAdviceCorrection(const QString& iAdviceIdentifier, int \
iSolution) {
if (iAdviceIdentifier.startsWith(QLatin1String("skgimportexportplugin_krunner_")) \
&& m_currentBankDocument) { SKGError err;
diff --git a/plugins/skrooge/skrooge_importexport/skgimportexportplugin.h \
b/plugins/skrooge/skrooge_importexport/skgimportexportplugin.h index 65bd683..bf07e9e \
100644
--- a/plugins/skrooge/skrooge_importexport/skgimportexportplugin.h
+++ b/plugins/skrooge/skrooge_importexport/skgimportexportplugin.h
@@ -113,7 +113,7 @@ public:
* The advice list of the plugin.
* @return The advice list of the plugin
*/
- virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice) const;
+ virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice);
/**
* Must be implemented to execute the automatic correction for the advice.
@@ -122,7 +122,7 @@ public:
* @return an object managing the error. MUST return ERR_NOTIMPL if \
iAdviceIdentifier is not known
* @see SKGError
*/
- virtual SKGError executeAdviceCorrection(const QString& iAdviceIdentifier, int \
iSolution) const; + virtual SKGError executeAdviceCorrection(const QString& \
iAdviceIdentifier, int iSolution);
Q_SIGNALS:
/**
diff --git a/plugins/skrooge/skrooge_operation/skgoperationplugin.cpp \
b/plugins/skrooge/skrooge_operation/skgoperationplugin.cpp index 45ce27a..45c45d1 \
100644
--- a/plugins/skrooge/skrooge_operation/skgoperationplugin.cpp
+++ b/plugins/skrooge/skrooge_operation/skgoperationplugin.cpp
@@ -772,13 +772,14 @@ void SKGOperationPlugin::actionOpenOperations()
}
}
-SKGAdviceList SKGOperationPlugin::advice(const QStringList& iIgnoredAdvice) const
+SKGAdviceList SKGOperationPlugin::advice(const QStringList& iIgnoredAdvice)
{
SKGTRACEIN(10, "SKGOperationPlugin::advice");
SKGAdviceList output;
//Search duplicate number on operation
if (!iIgnoredAdvice.contains("skgoperationplugin_duplicate")) {
+ SKGTRACEIN(10, "SKGOperationPlugin::advice-skgoperationplugin_duplicate");
SKGStringListList result;
m_currentBankDocument->executeSelectSqliteOrder("SELECT count(1), t_ACCOUNT, \
i_number FROM v_operation_display WHERE i_number!=0 GROUP BY t_ACCOUNT, i_number \
HAVING count(1)>1 ORDER BY count(1) DESC", result); int nb = result.count();
@@ -802,6 +803,7 @@ SKGAdviceList SKGOperationPlugin::advice(const QStringList& \
iIgnoredAdvice) cons
//Check operations not reconciliated
if (!iIgnoredAdvice.contains("skgoperationplugin_notreconciliated")) {
+ SKGTRACEIN(10, \
"SKGOperationPlugin::advice-skgoperationplugin_notreconciliated"); SKGStringListList \
result; m_currentBankDocument->executeSelectSqliteOrder("SELECT count(1), t_ACCOUNT \
FROM v_operation_display WHERE t_status='N' GROUP BY t_ACCOUNT HAVING count(1)>100 \
ORDER BY count(1) DESC", result); int nb = result.count();
@@ -824,6 +826,7 @@ SKGAdviceList SKGOperationPlugin::advice(const QStringList& \
iIgnoredAdvice) cons
//Check operations without mode
if (!iIgnoredAdvice.contains("skgimportexportplugin_notvalidated")) {
+ SKGTRACEIN(10, \
"SKGOperationPlugin::advice-skgimportexportplugin_notvalidated"); bool exist = \
false;
m_currentBankDocument->existObjects("operation", "t_template='N' AND \
t_mode='' AND d_date<>'0000-00-00'", exist); if (exist) {
@@ -841,6 +844,7 @@ SKGAdviceList SKGOperationPlugin::advice(const QStringList& \
iIgnoredAdvice) cons
//Check operations without category
if (!iIgnoredAdvice.contains("skgoperationplugin_nocategory")) {
+ SKGTRACEIN(10, "SKGOperationPlugin::advice-skgoperationplugin_nocategory");
bool exist = false;
m_currentBankDocument->existObjects("v_operation_display", "t_TRANSFER='N' \
AND EXISTS (SELECT 1 FROM suboperation WHERE rd_operation_id=v_operation_display.id \
AND r_category_id=0)", exist); if (exist) {
@@ -857,6 +861,7 @@ SKGAdviceList SKGOperationPlugin::advice(const QStringList& \
iIgnoredAdvice) cons }
if (!iIgnoredAdvice.contains("skgoperationplugin_transfer_nocategory")) {
+ SKGTRACEIN(10, \
"SKGOperationPlugin::advice-skgoperationplugin_transfer_nocategory"); bool exist = \
false; m_currentBankDocument->existObjects("v_operation_display", "t_TRANSFER='Y' \
AND EXISTS (SELECT 1 FROM suboperation WHERE rd_operation_id=v_operation_display.id \
AND r_category_id=0)", exist); if (exist) {
@@ -874,6 +879,7 @@ SKGAdviceList SKGOperationPlugin::advice(const QStringList& \
iIgnoredAdvice) cons
//Check operations without payee
if (!iIgnoredAdvice.contains("skgoperationplugin_nopayee")) {
+ SKGTRACEIN(10, "SKGOperationPlugin::advice-skgoperationplugin_nopayee");
bool exist = false;
m_currentBankDocument->existObjects("v_operation_display", "t_TRANSFER='N' \
AND r_payee_id=0", exist); if (exist) {
@@ -890,6 +896,7 @@ SKGAdviceList SKGOperationPlugin::advice(const QStringList& \
iIgnoredAdvice) cons }
if (!iIgnoredAdvice.contains("skgoperationplugin_transfer_nopayee")) {
+ SKGTRACEIN(10, \
"SKGOperationPlugin::advice-skgoperationplugin_transfer_nopayee"); bool exist = \
false;
m_currentBankDocument->existObjects("v_operation_display", "t_TRANSFER='Y' \
AND r_payee_id=0", exist); if (exist) {
@@ -907,6 +914,7 @@ SKGAdviceList SKGOperationPlugin::advice(const QStringList& \
iIgnoredAdvice) cons
//Check operations in group of only one transaction
if (!iIgnoredAdvice.contains("skgoperationplugin_groupofone")) {
+ SKGTRACEIN(10, "SKGOperationPlugin::advice-skgoperationplugin_groupofone");
bool exist = false;
m_currentBankDocument->existObjects("v_operation_display", "i_group_id<>0 \
AND (SELECT COUNT(1) FROM operation o WHERE \
o.i_group_id=v_operation_display.i_group_id)<2", exist); if (exist) {
@@ -925,6 +933,7 @@ SKGAdviceList SKGOperationPlugin::advice(const QStringList& \
iIgnoredAdvice) cons
//Check simple operations with comment not aligned with the comment of the \
suboperation
if (!iIgnoredAdvice.contains("skgoperationplugin_commentsnotaligned")) {
+ SKGTRACEIN(10, \
"SKGOperationPlugin::advice-skgoperationplugin_commentsnotaligned"); bool exist = \
false; m_currentBankDocument->existObjects("operation op, suboperation so", \
"so.rd_operation_id=op.id AND so.t_comment<>op.t_comment AND (SELECT COUNT(1) FROM \
suboperation so2 WHERE so2.rd_operation_id=op.id)=1", exist); if (exist) {
@@ -943,6 +952,7 @@ SKGAdviceList SKGOperationPlugin::advice(const QStringList& \
iIgnoredAdvice) cons
//Too many money on a current account
if (!iIgnoredAdvice.contains("skgoperationplugin_too_much_money")) {
+ SKGTRACEIN(10, \
"SKGOperationPlugin::advice-skgoperationplugin_too_much_money"); SKGStringListList \
result;
m_currentBankDocument->executeSelectSqliteOrder("SELECT t_name, f_RATE FROM \
v_account_display WHERE t_close='N' AND f_RATE>0 ORDER BY f_RATE DESC", result); int \
nb = result.count(); @@ -970,7 +980,7 @@ SKGAdviceList \
SKGOperationPlugin::advice(const QStringList& iIgnoredAdvice) cons return output;
}
-SKGError SKGOperationPlugin::executeAdviceCorrection(const QString& \
iAdviceIdentifier, int iSolution) const +SKGError \
SKGOperationPlugin::executeAdviceCorrection(const QString& iAdviceIdentifier, int \
iSolution) {
if (m_currentBankDocument && \
iAdviceIdentifier.startsWith(QLatin1String("skgoperationplugin_duplicate|"))) { \
//Get parameters
diff --git a/plugins/skrooge/skrooge_operation/skgoperationplugin.h \
b/plugins/skrooge/skrooge_operation/skgoperationplugin.h index bf14694..c28fc1b \
100644
--- a/plugins/skrooge/skrooge_operation/skgoperationplugin.h
+++ b/plugins/skrooge/skrooge_operation/skgoperationplugin.h
@@ -146,7 +146,7 @@ public:
* The advice list of the plugin.
* @return The advice list of the plugin
*/
- virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice) const;
+ virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice);
/**
* Must be implemented to execute the automatic correction for the advice.
@@ -155,7 +155,7 @@ public:
* @return an object managing the error. MUST return ERR_NOTIMPL if \
iAdviceIdentifier is not known
* @see SKGError
*/
- virtual SKGError executeAdviceCorrection(const QString& iAdviceIdentifier, int \
iSolution) const; + virtual SKGError executeAdviceCorrection(const QString& \
iAdviceIdentifier, int iSolution);
private Q_SLOTS:
void actionDuplicate();
diff --git a/plugins/skrooge/skrooge_payee/skgpayeeplugin.cpp \
b/plugins/skrooge/skrooge_payee/skgpayeeplugin.cpp index cc47bff..7cf7619 100644
--- a/plugins/skrooge/skrooge_payee/skgpayeeplugin.cpp
+++ b/plugins/skrooge/skrooge_payee/skgpayeeplugin.cpp
@@ -118,7 +118,7 @@ bool SKGPayeePlugin::isInPagesChooser() const
return true;
}
-SKGAdviceList SKGPayeePlugin::advice(const QStringList& iIgnoredAdvice) const
+SKGAdviceList SKGPayeePlugin::advice(const QStringList& iIgnoredAdvice)
{
SKGTRACEIN(10, "SKGPayeePlugin::advice");
SKGAdviceList output;
diff --git a/plugins/skrooge/skrooge_payee/skgpayeeplugin.h \
b/plugins/skrooge/skrooge_payee/skgpayeeplugin.h index f07c021..9768756 100644
--- a/plugins/skrooge/skrooge_payee/skgpayeeplugin.h
+++ b/plugins/skrooge/skrooge_payee/skgpayeeplugin.h
@@ -105,7 +105,7 @@ public:
* The advice list of the plugin.
* @return The advice list of the plugin
*/
- virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice) const;
+ virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice);
private Q_SLOTS:
void deleteUnusedPayees() const;
diff --git a/plugins/skrooge/skrooge_report/skgreportplugin.cpp \
b/plugins/skrooge/skrooge_report/skgreportplugin.cpp index e168f7b..60cec43 100644
--- a/plugins/skrooge/skrooge_report/skgreportplugin.cpp
+++ b/plugins/skrooge/skrooge_report/skgreportplugin.cpp
@@ -300,7 +300,7 @@ void SKGReportPlugin::actionOpenReport()
}
}
-SKGAdviceList SKGReportPlugin::advice(const QStringList& iIgnoredAdvice) const
+SKGAdviceList SKGReportPlugin::advice(const QStringList& iIgnoredAdvice)
{
SKGTRACEIN(10, "SKGReportPlugin::advice");
SKGAdviceList output;
diff --git a/plugins/skrooge/skrooge_report/skgreportplugin.h \
b/plugins/skrooge/skrooge_report/skgreportplugin.h index d39059a..47c8509 100644
--- a/plugins/skrooge/skrooge_report/skgreportplugin.h
+++ b/plugins/skrooge/skrooge_report/skgreportplugin.h
@@ -138,7 +138,7 @@ public:
* The advice list of the plugin.
* @return The advice list of the plugin
*/
- virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice) const;
+ virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice);
private Q_SLOTS:
void actionOpenReport();
diff --git a/plugins/skrooge/skrooge_scheduled/skgscheduledplugin.cpp \
b/plugins/skrooge/skrooge_scheduled/skgscheduledplugin.cpp index eb178e1..83aeee7 \
100644
--- a/plugins/skrooge/skrooge_scheduled/skgscheduledplugin.cpp
+++ b/plugins/skrooge/skrooge_scheduled/skgscheduledplugin.cpp
@@ -45,7 +45,7 @@ K_PLUGIN_FACTORY(SKGScheduledPluginFactory, \
registerPlugin<SKGScheduledPlugin>()
*/
K_EXPORT_PLUGIN(SKGScheduledPluginFactory("skrooge_scheduled", "skrooge_scheduled"))
-SKGScheduledPlugin::SKGScheduledPlugin(QObject* iParent, const QVariantList& \
/*iArg*/) : SKGInterfacePlugin(iParent) \
+SKGScheduledPlugin::SKGScheduledPlugin(QObject* iParent, const QVariantList& \
/*iArg*/) : SKGInterfacePlugin(iParent), m_counterAdvice(0) {
SKGTRACEIN(10, "SKGScheduledPlugin::SKGScheduledPlugin");
}
@@ -297,13 +297,14 @@ void SKGScheduledPlugin::actionScheduleOperation()
}
}
-SKGAdviceList SKGScheduledPlugin::advice(const QStringList& iIgnoredAdvice) const
+SKGAdviceList SKGScheduledPlugin::advice(const QStringList& iIgnoredAdvice)
{
SKGTRACEIN(10, "SKGScheduledPlugin::advice");
SKGAdviceList output;
//Recurrent operation with the last inserted operation having a different amount
if (!iIgnoredAdvice.contains("skgscheduledplugin_notuptodate")) {
+ SKGTRACEIN(10, "SKGScheduledPlugin::advice-skgscheduledplugin_notuptodate");
SKGStringListList result;
m_currentBankDocument->executeSelectSqliteOrder("SELECT r.id, \
r.rd_operation_id, r.f_CURRENTAMOUNT, r2.f_CURRENTAMOUNT FROM \
v_recurrentoperation_display r INNER JOIN (SELECT MAX(d_date), f_CURRENTAMOUNT, \
r_recurrentoperation_id FROM v_operation_display GROUP BY r_recurrentoperation_id) r2 \
WHERE r2.r_recurrentoperation_id=r.id AND r.f_CURRENTAMOUNT<>r2.f_CURRENTAMOUNT", \
result); int nb = result.count();
@@ -332,30 +333,41 @@ SKGAdviceList SKGScheduledPlugin::advice(const QStringList& \
iIgnoredAdvice) cons
//Possible recurrent operations
if (!iIgnoredAdvice.contains("skgscheduledplugin_possibleschedule")) {
- SKGStringListList result;
- m_currentBankDocument->executeSelectSqliteOrder("SELECT op1.id, \
op1.t_displayname FROM v_operation_displayname op1 WHERE op1.d_date>(SELECT \
date('now','-2 month')) AND op1.t_TRANSFER='N' AND op1.r_recurrentoperation_id=0 AND \
op1.d_date<>'0000-00-00' AND EXISTS (SELECT 1 FROM v_operation_tmp1 op2 WHERE \
op1.rd_account_id=op2.rd_account_id AND op1.r_payee_id=op2.r_payee_id AND \
op1.rc_unit_id=op2.rc_unit_id AND op1.f_QUANTITY=op2.f_QUANTITY AND \
op1.d_date=(SELECT date(op2.d_date, '+1 month'))) AND NOT EXISTS (SELECT 1 FROM \
recurrentoperation ro, v_operation_tmp1 op2 WHERE ro.rd_operation_id=op2.id AND \
ro.i_period_increment=1 AND ro.t_period_unit='M' AND \
op1.rd_account_id=op2.rd_account_id AND op1.r_payee_id=op2.r_payee_id AND \
op1.f_QUANTITY=op2.f_QUANTITY AND op1.rc_unit_id=op2.rc_unit_id)", \
result);
- int nb = result.count();
- for (int i = 1; i < nb; ++i) { //Ignore header
- //Get parameters
- QStringList line = result.at(i);
- QString id = line.at(0);
- QString name = line.at(1);
-
- SKGAdvice ad;
- ad.setUUID("skgscheduledplugin_possibleschedule|" % id);
- ad.setPriority(4);
- ad.setShortMessage(i18nc("Advice on making the best (short)", "Possible \
schedule '%1'", name));
- ad.setLongMessage(i18nc("Advice on making the best (long)", "The \
operation '%1' seems to be regularly created and could be scheduled", \
name));
- QStringList autoCorrections;
- autoCorrections.push_back(i18nc("Advice on making the best (action)", \
"Monthly schedule the operation '%1'", name));
- ad.setAutoCorrections(autoCorrections);
- output.push_back(ad);
+ SKGTRACEIN(10, \
"SKGScheduledPlugin::advice-skgscheduledplugin_possibleschedule"); + if \
(m_counterAdvice % 10 != 0) { + output.append(m_cacheAdvice);
+ } else {
+ m_cacheAdvice.clear();
+ SKGStringListList result;
+ m_currentBankDocument->executeSelectSqliteOrder("SELECT op1.id, \
op1.t_displayname FROM v_operation_displayname op1, v_operation_tmp1 op2 " + \
"WHERE op1.rd_account_id=op2.rd_account_id AND op1.r_payee_id=op2.r_payee_id AND \
op1.rc_unit_id=op2.rc_unit_id AND op1.d_date>(SELECT date('now','-2 month')) AND \
op2.d_date>(SELECT date('now','-3 month')) " + "AND \
op1.t_TRANSFER='N' AND op1.r_recurrentoperation_id=0 AND op1.d_date<>'0000-00-00' AND \
op1.f_QUANTITY=op2.f_QUANTITY AND op1.d_date=date(op2.d_date, '+1 month') " + \
"AND NOT EXISTS (SELECT 1 FROM recurrentoperation ro, v_operation_tmp1 op2 WHERE \
ro.rd_operation_id=op2.id AND ro.i_period_increment=1 AND ro.t_period_unit='M' AND \
op1.rd_account_id=op2.rd_account_id AND op1.r_payee_id=op2.r_payee_id AND \
op1.f_QUANTITY=op2.f_QUANTITY AND op1.rc_unit_id=op2.rc_unit_id)", result); + \
int nb = result.count(); + for (int i = 1; i < nb; ++i) { //Ignore header
+ //Get parameters
+ QStringList line = result.at(i);
+ QString id = line.at(0);
+ QString name = line.at(1);
+
+ SKGAdvice ad;
+ ad.setUUID("skgscheduledplugin_possibleschedule|" % id);
+ ad.setPriority(4);
+ ad.setShortMessage(i18nc("Advice on making the best (short)", \
"Possible schedule '%1'", name)); + ad.setLongMessage(i18nc("Advice on \
making the best (long)", "The operation '%1' seems to be regularly created and could \
be scheduled", name)); + QStringList autoCorrections;
+ autoCorrections.push_back(i18nc("Advice on making the best \
(action)", "Monthly schedule the operation '%1'", name)); + \
ad.setAutoCorrections(autoCorrections); + output.push_back(ad);
+ m_cacheAdvice.push_back(ad);
+ }
}
}
+ m_counterAdvice++;
return output;
}
-SKGError SKGScheduledPlugin::executeAdviceCorrection(const QString& \
iAdviceIdentifier, int iSolution) const +SKGError \
SKGScheduledPlugin::executeAdviceCorrection(const QString& iAdviceIdentifier, int \
iSolution) {
SKGError err;
if (m_currentBankDocument && \
iAdviceIdentifier.startsWith(QLatin1String("skgscheduledplugin_notuptodate|"))) { @@ \
-409,6 +421,8 @@ SKGError SKGScheduledPlugin::executeAdviceCorrection(const QString& \
iAdviceIdent if (!err) err = rop.setDate(op.getDate());
if (!err) err = rop.setDate(rop.getNextDate());
if (!err) err = rop.save(true, false);
+
+ m_counterAdvice = 0; //To force the update
}
//status bar
diff --git a/plugins/skrooge/skrooge_scheduled/skgscheduledplugin.h \
b/plugins/skrooge/skrooge_scheduled/skgscheduledplugin.h index 4f1295f..80c4bd0 \
100644
--- a/plugins/skrooge/skrooge_scheduled/skgscheduledplugin.h
+++ b/plugins/skrooge/skrooge_scheduled/skgscheduledplugin.h
@@ -153,7 +153,7 @@ public:
* The advice list of the plugin.
* @return The advice list of the plugin
*/
- virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice) const;
+ virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice);
/**
* Must be implemented to execute the automatic correction for the advice.
@@ -162,7 +162,7 @@ public:
* @return an object managing the error. MUST return ERR_NOTIMPL if \
iAdviceIdentifier is not known
* @see SKGError
*/
- virtual SKGError executeAdviceCorrection(const QString& iAdviceIdentifier, int \
iSolution) const; + virtual SKGError executeAdviceCorrection(const QString& \
iAdviceIdentifier, int iSolution);
private Q_SLOTS:
void actionScheduleOperation();
@@ -178,6 +178,9 @@ private:
KAction* m_scheduleOperationAction;
Ui::skgscheduledplugin_pref ui;
+
+ int m_counterAdvice;
+ QList<SKGAdvice> m_cacheAdvice;
};
#endif // SKGSCHEDULEDPLUGIN_H
diff --git a/plugins/skrooge/skrooge_search/skgsearchplugin.cpp \
b/plugins/skrooge/skrooge_search/skgsearchplugin.cpp index 1b43e6c..a68e6ff 100644
--- a/plugins/skrooge/skrooge_search/skgsearchplugin.cpp
+++ b/plugins/skrooge/skrooge_search/skgsearchplugin.cpp
@@ -365,7 +365,7 @@ bool SKGSearchPlugin::isInPagesChooser() const
return true;
}
-SKGAdviceList SKGSearchPlugin::advice(const QStringList& iIgnoredAdvice) const
+SKGAdviceList SKGSearchPlugin::advice(const QStringList& iIgnoredAdvice)
{
SKGTRACEIN(10, "SKGSearchPlugin::advice");
SKGAdviceList output;
@@ -383,10 +383,10 @@ SKGAdviceList SKGSearchPlugin::advice(const QStringList& \
iIgnoredAdvice) const SKGRuleObject::SKGAlarmInfo alarm = rule.getAlarmInfo();
double percent = 100 * alarm.Amount / alarm.Limit;
- if (percent >= 80) {
+ if (percent >= 70) {
SKGAdvice ad;
ad.setUUID("skgsearchplugin_alarm|" % \
SKGServices::intToString(rule.getID()));
- ad.setPriority(9);
+ ad.setPriority(percent >= 90 ? 9 : 6);
ad.setShortMessage(alarm.Message);
ad.setLongMessage(i18nc("Advice on making the best (long)", \
"Take care to your alarms.<br> %1.<br>%2 / %3", alarm.Message, \
m_currentBankDocument->formatMoney(alarm.Amount, primary), \
m_currentBankDocument->formatMoney(alarm.Limit, primary))); QStringList \
autoCorrections; @@ -401,7 +401,7 @@ SKGAdviceList SKGSearchPlugin::advice(const \
QStringList& iIgnoredAdvice) const return output;
}
-SKGError SKGSearchPlugin::executeAdviceCorrection(const QString& iAdviceIdentifier, \
int iSolution) const +SKGError SKGSearchPlugin::executeAdviceCorrection(const \
QString& iAdviceIdentifier, int iSolution) {
if (m_currentBankDocument && \
iAdviceIdentifier.startsWith(QLatin1String("skgsearchplugin_alarm|"))) { //Get \
parameters
diff --git a/plugins/skrooge/skrooge_search/skgsearchplugin.h \
b/plugins/skrooge/skrooge_search/skgsearchplugin.h index ad896c9..44f9726 100644
--- a/plugins/skrooge/skrooge_search/skgsearchplugin.h
+++ b/plugins/skrooge/skrooge_search/skgsearchplugin.h
@@ -140,7 +140,7 @@ public:
* The advice list of the plugin.
* @return The advice list of the plugin
*/
- virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice) const;
+ virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice);
/**
* Must be implemented to execute the automatic correction for the advice.
@@ -149,7 +149,7 @@ public:
* @return an object managing the error. MUST return ERR_NOTIMPL if \
iAdviceIdentifier is not known
* @see SKGError
*/
- virtual SKGError executeAdviceCorrection(const QString& iAdviceIdentifier, int \
iSolution) const; + virtual SKGError executeAdviceCorrection(const QString& \
iAdviceIdentifier, int iSolution);
private Q_SLOTS:
void raiseAlarms();
diff --git a/plugins/skrooge/skrooge_tracker/skgtrackerplugin.cpp \
b/plugins/skrooge/skrooge_tracker/skgtrackerplugin.cpp index 43e80b2..8614344 100644
--- a/plugins/skrooge/skrooge_tracker/skgtrackerplugin.cpp
+++ b/plugins/skrooge/skrooge_tracker/skgtrackerplugin.cpp
@@ -108,7 +108,7 @@ bool SKGTrackerPlugin::isInPagesChooser() const
return true;
}
-SKGAdviceList SKGTrackerPlugin::advice(const QStringList& iIgnoredAdvice) const
+SKGAdviceList SKGTrackerPlugin::advice(const QStringList& iIgnoredAdvice)
{
SKGTRACEIN(10, "SKGTrackerPlugin::advice");
SKGAdviceList output;
diff --git a/plugins/skrooge/skrooge_tracker/skgtrackerplugin.h \
b/plugins/skrooge/skrooge_tracker/skgtrackerplugin.h index af8b3af..73b7af3 100644
--- a/plugins/skrooge/skrooge_tracker/skgtrackerplugin.h
+++ b/plugins/skrooge/skrooge_tracker/skgtrackerplugin.h
@@ -105,7 +105,7 @@ public:
* The advice list of the plugin.
* @return The advice list of the plugin
*/
- virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice) const;
+ virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice);
private Q_SLOTS:
diff --git a/plugins/skrooge/skrooge_unit/skgunitplugin.cpp \
b/plugins/skrooge/skrooge_unit/skgunitplugin.cpp index c3bc191..6ae0c41 100644
--- a/plugins/skrooge/skrooge_unit/skgunitplugin.cpp
+++ b/plugins/skrooge/skrooge_unit/skgunitplugin.cpp
@@ -268,7 +268,7 @@ void SKGUnitPlugin::actionSplitShare()
}
}
-SKGAdviceList SKGUnitPlugin::advice(const QStringList& iIgnoredAdvice) const
+SKGAdviceList SKGUnitPlugin::advice(const QStringList& iIgnoredAdvice)
{
SKGTRACEIN(10, "SKGUnitPlugin::advice");
SKGAdviceList output;
@@ -403,7 +403,7 @@ SKGAdviceList SKGUnitPlugin::advice(const QStringList& \
iIgnoredAdvice) const return output;
}
-SKGError SKGUnitPlugin::executeAdviceCorrection(const QString& iAdviceIdentifier, \
int iSolution) const +SKGError SKGUnitPlugin::executeAdviceCorrection(const QString& \
iAdviceIdentifier, int iSolution) {
if (m_currentBankDocument && \
iAdviceIdentifier.startsWith(QLatin1String("skgunitplugin_primaryunit|"))) { if \
(iSolution == 1) {
diff --git a/plugins/skrooge/skrooge_unit/skgunitplugin.h \
b/plugins/skrooge/skrooge_unit/skgunitplugin.h index 8b82f8e..8fbd022 100644
--- a/plugins/skrooge/skrooge_unit/skgunitplugin.h
+++ b/plugins/skrooge/skrooge_unit/skgunitplugin.h
@@ -138,7 +138,7 @@ public:
* The advice list of the plugin.
* @return The advice list of the plugin
*/
- virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice) const;
+ virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice);
/**
* Must be implemented to execute the automatic correction for the advice.
@@ -147,7 +147,7 @@ public:
* @return an object managing the error. MUST return ERR_NOTIMPL if \
iAdviceIdentifier is not known
* @see SKGError
*/
- virtual SKGError executeAdviceCorrection(const QString& iAdviceIdentifier, int \
iSolution) const; + virtual SKGError executeAdviceCorrection(const QString& \
iAdviceIdentifier, int iSolution);
private Q_SLOTS:
void actionSplitShare();
diff --git a/skgbasegui/skghtmlboardwidget.cpp b/skgbasegui/skghtmlboardwidget.cpp
index 97cfe06..8da2e85 100644
--- a/skgbasegui/skghtmlboardwidget.cpp
+++ b/skgbasegui/skghtmlboardwidget.cpp
@@ -130,7 +130,7 @@ void SKGHtmlBoardWidget::dataModified(const QString& iTableName, \
int iIdTransact report->setMonth(monthS);
QString html;
- SKGError err = SKGReport::getReportFormTemplate(report, m_HtmlTemplate, \
html); + SKGError err = SKGReport::getReportFromTemplate(report, \
m_HtmlTemplate, html); if (err) html = err.getFullMessage();
m_Text->setText(html);
}
diff --git a/skgbasegui/skginterfaceplugin.cpp b/skgbasegui/skginterfaceplugin.cpp
index 101395e..25e605e 100644
--- a/skgbasegui/skginterfaceplugin.cpp
+++ b/skgbasegui/skginterfaceplugin.cpp
@@ -113,13 +113,13 @@ bool SKGInterfacePlugin::isEnabled() const
return true;
}
-SKGAdviceList SKGInterfacePlugin::advice(const QStringList& iIgnoredAdvice) const
+SKGAdviceList SKGInterfacePlugin::advice(const QStringList& iIgnoredAdvice)
{
Q_UNUSED(iIgnoredAdvice);
return SKGAdviceList();
}
-SKGError SKGInterfacePlugin::executeAdviceCorrection(const QString& \
iAdviceIdentifier, int iSolution) const +SKGError \
SKGInterfacePlugin::executeAdviceCorrection(const QString& iAdviceIdentifier, int \
iSolution) {
Q_UNUSED(iAdviceIdentifier);
Q_UNUSED(iSolution);
diff --git a/skgbasegui/skginterfaceplugin.h b/skgbasegui/skginterfaceplugin.h
index 601c6b8..405f77a 100644
--- a/skgbasegui/skginterfaceplugin.h
+++ b/skgbasegui/skginterfaceplugin.h
@@ -179,7 +179,7 @@ public:
* The advice list of the plugin.
* @return The advice list of the plugin
*/
- virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice) const;
+ virtual SKGAdviceList advice(const QStringList& iIgnoredAdvice);
/**
* Must be implemented to execute the automatic correction for the advice.
@@ -188,7 +188,7 @@ public:
* @return an object managing the error. MUST return ERR_NOTIMPL if \
iAdviceIdentifier is not known
* @see SKGError
*/
- virtual SKGError executeAdviceCorrection(const QString& iAdviceIdentifier, int \
iSolution) const; + virtual SKGError executeAdviceCorrection(const QString& \
iAdviceIdentifier, int iSolution);
private:
Q_DISABLE_COPY(SKGInterfacePlugin);
diff --git a/skgbasemodeler/skgreport.cpp b/skgbasemodeler/skgreport.cpp
index 7cc2a39..f508f5b 100644
--- a/skgbasemodeler/skgreport.cpp
+++ b/skgbasemodeler/skgreport.cpp
@@ -114,10 +114,10 @@ void SKGReport::addItemsInMapping(QVariantHash& iMapping)
}
-SKGError SKGReport::getReportFormTemplate(SKGReport* iReport, const QString& iFile, \
QString& oHtml) +SKGError SKGReport::getReportFromTemplate(SKGReport* iReport, const \
QString& iFile, QString& oHtml) {
SKGError err;
- SKGTRACEINRC(10, "SKGReport::getReportFormTemplate", err);
+ SKGTRACEINRC(10, "SKGReport::getReportFromTemplate", err);
SKGDocument* doc = (iReport ? static_cast<SKGDocument*>(iReport->m_document) : \
NULL);
//Prepare grantlee engine
@@ -169,7 +169,7 @@ SKGError SKGReport::getReportFormTemplate(SKGReport* iReport, \
const QString& iFi
//Generation
{
- SKGTRACEINRC(10, "SKGReport::getReportFormTemplate-grantlee render", err);
+ SKGTRACEINRC(10, "SKGReport::getReportFromTemplate-grantlee render", err);
oHtml = gTemplate->render(&gContext);
if (gTemplate->error()) err = SKGError(gTemplate->error(), \
gTemplate->errorString()); }
diff --git a/skgbasemodeler/skgreport.h b/skgbasemodeler/skgreport.h
index 2c90b6e..ea90fdb 100644
--- a/skgbasemodeler/skgreport.h
+++ b/skgbasemodeler/skgreport.h
@@ -81,7 +81,7 @@ public:
* @return an object managing the error
* @see SKGError
*/
- static SKGError getReportFormTemplate(SKGReport* iReport, const QString& iFile, \
QString& oHtml); + static SKGError getReportFromTemplate(SKGReport* iReport, const \
QString& iFile, QString& oHtml);
protected:
/**
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic