diff --git a/kmymoney/converter/mymoneyqifwriter.cpp b/kmymoney/converter/mymoneyqifwriter.cpp --- a/kmymoney/converter/mymoneyqifwriter.cpp +++ b/kmymoney/converter/mymoneyqifwriter.cpp @@ -339,16 +339,16 @@ value = (*it).value(); accName = acc.name(); - if ((actionType == "Dividend") || (actionType == "Buy") || (actionType == "IntIncome")) { + if ((actionType == MyMoneySplit::ActionDividend) || (actionType == MyMoneySplit::ActionBuyShares) || (actionType == MyMoneySplit::ActionInterestIncome)) { isXfer = true; } // // Actions. // QString action; - if ((*it).action() == "Dividend") { + if ((*it).action() == MyMoneySplit::ActionDividend) { action = "DivX"; - } else if ((*it).action() == "IntIncome") { + } else if ((*it).action() == MyMoneySplit::ActionInterestIncome) { action = "IntIncX"; } if ((action == "DivX") || (action == "IntIncX")) { @@ -364,21 +364,21 @@ if (noError) { s += 'T' + txt + '\n'; } - } else if ((*it).action() == "Buy") { + } else if ((*it).action() == MyMoneySplit::ActionBuyShares) { if (qty.isNegative()) { action = "Sell"; } else { action = "Buy"; } - } else if ((*it).action() == "Add") { + } else if ((*it).action() == MyMoneySplit::ActionAddShares) { qty = (*it).shares(); if (qty.isNegative()) { action = "Shrsout"; } else { action = "Shrsin"; } - } else if ((*it).action() == "Reinvest") { + } else if ((*it).action() == MyMoneySplit::ActionReinvestDividend) { action = "ReinvDiv"; } else { action = (*it).action(); diff --git a/kmymoney/dialogs/transactioneditor.cpp b/kmymoney/dialogs/transactioneditor.cpp --- a/kmymoney/dialogs/transactioneditor.cpp +++ b/kmymoney/dialogs/transactioneditor.cpp @@ -691,8 +691,8 @@ // Save pricing information QList::const_iterator it_t; for (it_t = t.splits().constBegin(); it_t != t.splits().constEnd(); ++it_t) { - if (((*it_t).action() != "Buy") && - ((*it_t).action() != "Reinvest")) { + if (((*it_t).action() != MyMoneySplit::ActionBuyShares) && + ((*it_t).action() != MyMoneySplit::ActionReinvestDividend)) { continue; } QString id = (*it_t).accountId(); diff --git a/kmymoney/plugins/csvexport/csvwriter.cpp b/kmymoney/plugins/csvexport/csvwriter.cpp --- a/kmymoney/plugins/csvexport/csvwriter.cpp +++ b/kmymoney/plugins/csvexport/csvwriter.cpp @@ -372,9 +372,9 @@ // // Actions. // - if ((*itSplit).action() == QLatin1String("Dividend")) { + if ((*itSplit).action() == MyMoneySplit::ActionDividend) { strAction = QLatin1String("DivX"); - } else if ((*itSplit).action() == QLatin1String("IntIncome")) { + } else if ((*itSplit).action() == MyMoneySplit::ActionInterestIncome) { strAction = QLatin1String("IntIncX"); } if ((strAction == QLatin1String("DivX")) || (strAction == QLatin1String("IntIncX"))) { @@ -384,21 +384,21 @@ i18n("Invalid transaction")); return; } - } else if ((*itSplit).action() == QLatin1String("Buy")) { + } else if ((*itSplit).action() == MyMoneySplit::ActionBuyShares) { qty = (*itSplit).shares(); if (qty.isNegative()) { strAction = QLatin1String("Sell"); } else { strAction = QLatin1String("Buy"); } - } else if ((*itSplit).action() == QLatin1String("Add")) { + } else if ((*itSplit).action() == MyMoneySplit::ActionAddShares) { qty = (*itSplit).shares(); if (qty.isNegative()) { strAction = QLatin1String("Shrsout"); } else { strAction = QLatin1String("Shrsin"); } - } else if ((*itSplit).action() == QLatin1String("Reinvest")) { + } else if ((*itSplit).action() == MyMoneySplit::ActionReinvestDividend) { qty = (*itSplit).shares(); strAmount = (*itSplit).value().formatMoney("", 2).remove(localeThousands) + m_separator; strAction = QLatin1String("ReinvDiv");