From kde-commits Sat Jan 31 21:26:14 2015 From: =?utf-8?q?Christian_D=C3=A1vid?= Date: Sat, 31 Jan 2015 21:26:14 +0000 To: kde-commits Subject: [kmymoney] kmymoney/mymoney/storage: Improved code quality Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=142273958424005 Git commit 79bf9ef59c90e65ccf34e760e4abbe282b38ae13 by Christian D=C3=A1vid. Committed on 31/01/2015 at 21:03. Pushed by christiand into branch 'master'. Improved code quality No real changes but this improves readability and helps during debugging. M +9 -9 kmymoney/mymoney/storage/mymoneydatabasemgr.h M +15 -15 kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp M +4 -4 kmymoney/mymoney/storage/mymoneystoragesql.cpp http://commits.kde.org/kmymoney/79bf9ef59c90e65ccf34e760e4abbe282b38ae13 diff --git a/kmymoney/mymoney/storage/mymoneydatabasemgr.h b/kmymoney/mymon= ey/storage/mymoneydatabasemgr.h index f69481a..5ec21ca 100644 --- a/kmymoney/mymoney/storage/mymoneydatabasemgr.h +++ b/kmymoney/mymoney/storage/mymoneydatabasemgr.h @@ -960,15 +960,15 @@ public: virtual void loadOnlineJobs(const QMap& onlineJobs); //virtual void loadPayeeIdentifier(const QMap&= idents); = - virtual unsigned long accountId(void) const; - virtual unsigned long transactionId(void) const; - virtual unsigned long payeeId(void) const; - virtual unsigned long tagId(void) const; - virtual unsigned long institutionId(void) const; - virtual unsigned long scheduleId(void) const; - virtual unsigned long securityId(void) const; - virtual unsigned long reportId(void) const; - virtual unsigned long budgetId(void) const; + virtual unsigned long accountId() const; + virtual unsigned long transactionId() const; + virtual unsigned long payeeId() const; + virtual unsigned long tagId() const; + virtual unsigned long institutionId() const; + virtual unsigned long scheduleId() const; + virtual unsigned long securityId() const; + virtual unsigned long reportId() const; + virtual unsigned long budgetId() const; virtual unsigned long onlineJobId() const; virtual unsigned long payeeIdentifierId() const; = diff --git a/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney= /mymoney/storage/mymoneydatabasemgrtest.cpp index c43026d..6eec13b 100644 --- a/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp +++ b/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp @@ -290,13 +290,13 @@ void MyMoneyDatabaseMgrTest::testNewAccount() = m->addAccount(a); = - QVERIFY(m->accountId() =3D=3D 1); + QCOMPARE(m->accountId(), 1ul); QList accList; m->accountList(accList); - QVERIFY(accList.count() =3D=3D 1); - QVERIFY((*(accList.begin())).name() =3D=3D "AccountName"); - QVERIFY((*(accList.begin())).id() =3D=3D "A000001"); - QVERIFY((*(accList.begin())).value("Key") =3D=3D "Value"); + QCOMPARE(accList.count(), 1); + QCOMPARE((*(accList.begin())).name(), QLatin1String("AccountName")); + QCOMPARE((*(accList.begin())).id(), QLatin1String("A000001")); + QCOMPARE((*(accList.begin())).value("Key"), QLatin1String("Value")); } = void MyMoneyDatabaseMgrTest::testAccount() @@ -775,12 +775,12 @@ void MyMoneyDatabaseMgrTest::testTransactionCount() } = testAddTransactions(); - QVERIFY(m->transactionCount("A000001") =3D=3D 0); - QVERIFY(m->transactionCount("A000002") =3D=3D 1); - QVERIFY(m->transactionCount("A000003") =3D=3D 1); - QVERIFY(m->transactionCount("A000004") =3D=3D 1); - QVERIFY(m->transactionCount("A000005") =3D=3D 1); - QVERIFY(m->transactionCount("A000006") =3D=3D 2); + QVERIFY(m->transactionCount("A000001") =3D=3D 0ul); + QVERIFY(m->transactionCount("A000002") =3D=3D 1ul); + QVERIFY(m->transactionCount("A000003") =3D=3D 1ul); + QVERIFY(m->transactionCount("A000004") =3D=3D 1ul); + QVERIFY(m->transactionCount("A000005") =3D=3D 1ul); + QVERIFY(m->transactionCount("A000006") =3D=3D 2ul); } = void MyMoneyDatabaseMgrTest::testAddBudget() @@ -799,12 +799,12 @@ void MyMoneyDatabaseMgrTest::testAddBudget() = m->addBudget(budget); = - QVERIFY(m->budgetList().count() =3D=3D 1); - QVERIFY(m->budgetId() =3D=3D 1); + QCOMPARE(m->budgetList().count(), 1); + QCOMPARE(m->budgetId(), 1ul); MyMoneyBudget newBudget =3D m->budgetByName("TestBudget"); = - QVERIFY(budget.budgetStart() =3D=3D newBudget.budgetStart()); - QVERIFY(budget.name() =3D=3D newBudget.name()); + QCOMPARE(budget.budgetStart(), newBudget.budgetStart()); + QCOMPARE(budget.name(), newBudget.name()); } = void MyMoneyDatabaseMgrTest::testCopyBudget() diff --git a/kmymoney/mymoney/storage/mymoneystoragesql.cpp b/kmymoney/mymo= ney/storage/mymoneystoragesql.cpp index 8e59051..8cf4a95 100644 --- a/kmymoney/mymoney/storage/mymoneystoragesql.cpp +++ b/kmymoney/mymoney/storage/mymoneystoragesql.cpp @@ -847,7 +847,7 @@ bool MyMoneyStorageSql::readFile(void) } = // The following is called from 'SaveAsDatabase' -bool MyMoneyStorageSql::writeFile(void) +bool MyMoneyStorageSql::writeFile() { DBG("*** Entering MyMoneyStorageSql::writeFile"); // initialize record counts and hi ids @@ -2981,7 +2981,8 @@ void MyMoneyStorageSql::writeFileInfo() q.bindValue(":kvps", (unsigned long long) m_kvps); q.bindValue(":budgets", (unsigned long long) m_budgets); = - if (!q.exec()) throw MYMONEYEXCEPTION(buildError(q, Q_FUNC_INFO, QString= ("writing FileInfo"))); // krazy:exclude=3Dcrashy + if (!q.exec()) + throw MYMONEYEXCEPTION(buildError(q, Q_FUNC_INFO, QString("writing Fil= eInfo"))); // krazy:exclude=3Dcrashy } = // **** Key/value pairs **** @@ -4893,8 +4894,7 @@ void MyMoneyStorageSql::loadPayeeIdentifierId(const l= ong unsigned int& id) } = //**************************************************** -long unsigned MyMoneyStorageSql::calcHighId -(const long unsigned& i, const QString& id) +long unsigned MyMoneyStorageSql::calcHighId(const long unsigned& i, const = QString& id) { DBG("*** Entering MyMoneyStorageSql::calcHighId"); QString nid =3D id;