summaryrefslogtreecommitdiffstats
path: root/kmymoney2/mymoney/storage
diff options
context:
space:
mode:
Diffstat (limited to 'kmymoney2/mymoney/storage')
-rw-r--r--kmymoney2/mymoney/storage/imymoneystorage.h2
-rw-r--r--kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp4
-rw-r--r--kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp4
-rw-r--r--kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp8
-rw-r--r--kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h4
-rw-r--r--kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp2
-rw-r--r--kmymoney2/mymoney/storage/mymoneystoragesql.cpp4
7 files changed, 14 insertions, 14 deletions
diff --git a/kmymoney2/mymoney/storage/imymoneystorage.h b/kmymoney2/mymoney/storage/imymoneystorage.h
index 02e53c2..1053e6b 100644
--- a/kmymoney2/mymoney/storage/imymoneystorage.h
+++ b/kmymoney2/mymoney/storage/imymoneystorage.h
@@ -96,7 +96,7 @@ public:
#define STD_ACC_ASSET "AStd::Asset"
#define STD_ACC_EXPENSE "AStd::Expense"
#define STD_ACC_INCOME "AStd::Income"
-#define STD_ACC_ETQUITY "AStd::Equity"
+#define STD_ACC_EQUITY "AStd::Equity"
IMyMoneyStorage();
virtual ~IMyMoneyStorage();
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
index d4de685..8767b61 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
@@ -268,7 +268,7 @@ bool MyMoneyDatabaseMgr::isStandardAccount(const TQString& id) const
|| id == STD_ACC_ASSET
|| id == STD_ACC_EXPENSE
|| id == STD_ACC_INCOME
- || id == STD_ACC_ETQUITY;
+ || id == STD_ACC_EQUITY;
}
void MyMoneyDatabaseMgr::setAccountName(const TQString& id, const TQString& name)
@@ -1052,7 +1052,7 @@ const MyMoneyAccount MyMoneyDatabaseMgr::income(void) const
{ return MyMoneyFile::instance()->account(STD_ACC_INCOME); }
const MyMoneyAccount MyMoneyDatabaseMgr::equity(void) const
-{ return MyMoneyFile::instance()->account(STD_ACC_ETQUITY); }
+{ return MyMoneyFile::instance()->account(STD_ACC_EQUITY); }
void MyMoneyDatabaseMgr::addSecurity(MyMoneySecurity& security)
{
diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
index a171431..d80c348 100644
--- a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
+++ b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
@@ -202,7 +202,7 @@ void MyMoneyDatabaseMgrTest::testIsStandardAccount()
CPPUNIT_ASSERT(m->isStandardAccount(STD_ACC_ASSET) == true);
CPPUNIT_ASSERT(m->isStandardAccount(STD_ACC_EXPENSE) == true);
CPPUNIT_ASSERT(m->isStandardAccount(STD_ACC_INCOME) == true);
- CPPUNIT_ASSERT(m->isStandardAccount(STD_ACC_ETQUITY) == true);
+ CPPUNIT_ASSERT(m->isStandardAccount(STD_ACC_EQUITY) == true);
CPPUNIT_ASSERT(m->isStandardAccount("A0002") == false);
}
@@ -1717,7 +1717,7 @@ void MyMoneyDatabaseMgrTest::testScheduleList() {
MyMoneySchedule schedule4("Schedule 4",
MyMoneySchedule::TYPE_BILL,
MyMoneySchedule::OCCUR_WEEKLY, 1,
- MyMoneySchedule::STYPE_WRITECHETQUE,
+ MyMoneySchedule::STYPE_WRITECHEQUE,
TQDate(),
notOverdue.addDays(31),
false,
diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
index 6ebea3c..35122e3 100644
--- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
+++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
@@ -70,14 +70,14 @@ MyMoneySeqAccessMgr::MyMoneySeqAccessMgr()
MyMoneyAccount acc_q;
acc_q.setAccountType(MyMoneyAccount::Equity);
acc_q.setName("Equity");
- MyMoneyAccount equity(STD_ACC_ETQUITY, acc_q);
+ MyMoneyAccount equity(STD_ACC_EQUITY, acc_q);
TQMap<TQString, MyMoneyAccount> map;
map[STD_ACC_ASSET] = asset;
map[STD_ACC_LIABILITY] = liability;
map[STD_ACC_INCOME] = income;
map[STD_ACC_EXPENSE] = expense;
- map[STD_ACC_ETQUITY] = equity;
+ map[STD_ACC_EQUITY] = equity;
// load account list with inital accounts
m_accountList = map;
@@ -89,7 +89,7 @@ MyMoneySeqAccessMgr::MyMoneySeqAccessMgr()
m_balanceCache[STD_ACC_ASSET] = balance;
m_balanceCache[STD_ACC_EXPENSE] = balance;
m_balanceCache[STD_ACC_INCOME] = balance;
- m_balanceCache[STD_ACC_ETQUITY] = balance;
+ m_balanceCache[STD_ACC_EQUITY] = balance;
// initialize for file fixes (see kmymoneyview.cpp)
m_currentFixVersion = 2;
@@ -121,7 +121,7 @@ bool MyMoneySeqAccessMgr::isStandardAccount(const TQString& id) const
|| id == STD_ACC_ASSET
|| id == STD_ACC_EXPENSE
|| id == STD_ACC_INCOME
- || id == STD_ACC_ETQUITY;
+ || id == STD_ACC_EQUITY;
}
void MyMoneySeqAccessMgr::setAccountName(const TQString& id, const TQString& name)
diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h
index d92d94e..5689e73 100644
--- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h
+++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h
@@ -145,7 +145,7 @@ public:
* @li STD_ACC_ASSET
* @li STD_ACC_EXPENSE
* @li STD_ACC_INCOME
- * @li STD_ACC_ETQUITY
+ * @li STD_ACC_EQUITY
*
* @param name TQString reference to the name to be set
*
@@ -526,7 +526,7 @@ public:
* This method is used to return the standard equity account
* @return MyMoneyAccount equity account(group)
*/
- const MyMoneyAccount equity(void) const { return account(STD_ACC_ETQUITY); };
+ const MyMoneyAccount equity(void) const { return account(STD_ACC_EQUITY); };
virtual void loadAccounts(const TQMap<TQString, MyMoneyAccount>& acc);
virtual void loadTransactions(const TQMap<TQString, MyMoneyTransaction>& map);
diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp
index af05e16..e64e0b5 100644
--- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp
+++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp
@@ -1370,7 +1370,7 @@ void MyMoneySeqAccessMgrTest::testScheduleList() {
MyMoneySchedule schedule4("Schedule 4",
MyMoneySchedule::TYPE_BILL,
MyMoneySchedule::OCCUR_WEEKLY, 1,
- MyMoneySchedule::STYPE_WRITECHETQUE,
+ MyMoneySchedule::STYPE_WRITECHEQUE,
TQDate(),
notOverdue.addDays(31),
false,
diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
index fe8ac87..6868e64 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
+++ b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
@@ -1208,7 +1208,7 @@ void MyMoneyStorageSql::writeAccounts() {
MyMoneyAccount acc_q;
acc_q.setAccountType(MyMoneyAccount::Equity);
acc_q.setName("Equity");
- MyMoneyAccount equity(STD_ACC_ETQUITY, acc_q);
+ MyMoneyAccount equity(STD_ACC_EQUITY, acc_q);
writeAccount(asset, q); ++m_accounts;
writeAccount(expense, q); ++m_accounts;
@@ -4297,7 +4297,7 @@ const TQString MyMoneyDbIndex::generateDDL (databaseTypeE dbType) const
TQString qs = "CREATE ";
if (m_unique)
- qs += "UNITQUE ";
+ qs += "UNIQUE ";
qs += "INDEX " + m_table + "_" + m_name + "_idx ON "
+ m_table + " (";