diff options
Diffstat (limited to 'kmymoney2/mymoney/storage')
4 files changed, 13 insertions, 13 deletions
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp index 08403f2..2c8307c 100644 --- a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp +++ b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp @@ -566,7 +566,7 @@ void MyMoneyDatabaseMgrTest::testReparentAccount() { CPPUNIT_ASSERT(m->account(ex1.id()).accountCount() == 2); CPPUNIT_ASSERT(ex3.parentAccountId() == ex1.id()); } catch (MyMoneyException *e) { - std::cout << std::endl << e->what() << std::endl; + std::cout << std::endl << e->what().local8Bit() << std::endl; delete e; CPPUNIT_FAIL("Unexpected exception"); } @@ -763,7 +763,7 @@ void MyMoneyDatabaseMgrTest::testCopyBudget() { CPPUNIT_ASSERT(testBudget.budgetStart() == newBudget.budgetStart()); CPPUNIT_ASSERT(testBudget.name() == newBudget.name()); } catch (TQString& s) { - std::cout << "Error in testCopyBudget(): " << s << std::endl; + std::cout << "Error in testCopyBudget(): " << s.local8Bit() << std::endl; CPPUNIT_ASSERT(false); } } diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp index 869e2e4..f1420dc 100644 --- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp +++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp @@ -1025,7 +1025,7 @@ void MyMoneySeqAccessMgr::loadAccounts(const TQMap<TQString, MyMoneyAccount>& ma int pos = lastId.find(TQRegExp("\\d+"), 0); if(pos != -1) { - m_nextAccountID = atol(lastId.mid(pos)); + m_nextAccountID = lastId.mid(pos).toLong(); } } @@ -1048,7 +1048,7 @@ void MyMoneySeqAccessMgr::loadTransactions(const TQMap<TQString, MyMoneyTransact int pos = lastId.find(TQRegExp("\\d+"), 0); if(pos != -1) { - m_nextTransactionID = atol(lastId.mid(pos)); + m_nextTransactionID = lastId.mid(pos).toLong(); } } @@ -1066,7 +1066,7 @@ void MyMoneySeqAccessMgr::loadInstitutions(const TQMap<TQString, MyMoneyInstitut int pos = lastId.find(TQRegExp("\\d+"), 0); if(pos != -1) { - m_nextInstitutionID = atol(lastId.mid(pos)); + m_nextInstitutionID = lastId.mid(pos).toLong(); } } @@ -1087,7 +1087,7 @@ void MyMoneySeqAccessMgr::loadPayees(const TQMap<TQString, MyMoneyPayee>& map) int pos = lastId.find(TQRegExp("\\d+"), 0); if(pos != -1) { - m_nextPayeeID = atol(lastId.mid(pos)); + m_nextPayeeID = lastId.mid(pos).toLong(); } } @@ -1105,7 +1105,7 @@ void MyMoneySeqAccessMgr::loadSecurities(const TQMap<TQString, MyMoneySecurity>& int pos = lastId.find(TQRegExp("\\d+"), 0); if(pos != -1) { - m_nextSecurityID = atol(lastId.mid(pos)); + m_nextSecurityID = lastId.mid(pos).toLong(); } } @@ -1329,7 +1329,7 @@ void MyMoneySeqAccessMgr::loadSchedules(const TQMap<TQString, MyMoneySchedule>& int pos = lastId.find(TQRegExp("\\d+"), 0); if(pos != -1) { - m_nextScheduleID = atol(lastId.mid(pos)); + m_nextScheduleID = lastId.mid(pos).toLong(); } } @@ -1531,7 +1531,7 @@ void MyMoneySeqAccessMgr::loadReports(const TQMap<TQString, MyMoneyReport>& map) int pos = lastId.find(TQRegExp("\\d+"), 0); if(pos != -1) { - m_nextReportID = atol(lastId.mid(pos)); + m_nextReportID = lastId.mid(pos).toLong(); } } @@ -1605,7 +1605,7 @@ void MyMoneySeqAccessMgr::loadBudgets(const TQMap<TQString, MyMoneyBudget>& map) int pos = lastId.find(TQRegExp("\\d+"), 0); if(pos != -1) { - m_nextBudgetID = atol(lastId.mid(pos)); + m_nextBudgetID = lastId.mid(pos).toLong(); } } diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp index c2f48cf..99f517e 100644 --- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp +++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp @@ -486,7 +486,7 @@ void MyMoneySeqAccessMgrTest::testReparentAccount() { CPPUNIT_ASSERT(m->account(ex1.id()).accountCount() == 2); CPPUNIT_ASSERT(ex3.parentAccountId() == ex1.id()); } catch (MyMoneyException *e) { - std::cout << std::endl << e->what() << std::endl; + std::cout << std::endl << e->what().local8Bit() << std::endl; delete e; CPPUNIT_FAIL("Unexpected exception"); } diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp index 1b8e694..e5914bb 100644 --- a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp +++ b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp @@ -64,10 +64,10 @@ MyMoneySqlQuery::MyMoneySqlQuery (MyMoneyStorageSql* db) } bool MyMoneySqlQuery::exec () { - TRACE(TQString("start sql - %1").arg(lastQuery())); + TRACE(TQString("start sql - %1").arg(lastQuery()).local8Bit()); bool rc = TQSqlQuery::exec(); TQString msg("end sql\n%1\n***Query returned %2, row count %3"); - TRACE (msg.arg(TQSqlQuery::executedQuery()).arg(rc).arg(numRowsAffected())); + TRACE(msg.arg(TQSqlQuery::executedQuery()).arg(rc).arg(numRowsAffected()).local8Bit()); //DBG (TQString("%1\n***Query returned %2, row count %3").arg(TQSqlQuery::executedQuery()).arg(rc).arg(size())); return (rc); } |