Fix inadvertent "TQ" changes.

12 files changed, 40 insertions, 40 deletions

diff --git a/kmymoney2/mymoney/mymoneyfile.cpp b/kmymoney2/mymoney/mymoneyfile.cpp
index 2b7fdbc..bd8eb15 100644
--- a/kmymoney2/mymoney/mymoneyfile.cpp
+++ b/kmymoney2/mymoney/mymoneyfile.cpp
@@ -1055,7 +1055,7 @@ const MyMoneyAccount& MyMoneyFile::equity(void) const
 {
   checkStorage();
 
-  return d->m_cache.account (STD_ACC_ETQUITY);
+  return d->m_cache.account (STD_ACC_EQUITY);
 }
 
 unsigned int MyMoneyFile::transactionCount(const TQString& account) const
diff --git a/kmymoney2/mymoney/mymoneyscheduled.cpp b/kmymoney2/mymoney/mymoneyscheduled.cpp
index 745160c..32584f1 100644
--- a/kmymoney2/mymoney/mymoneyscheduled.cpp
+++ b/kmymoney2/mymoney/mymoneyscheduled.cpp
@@ -373,7 +373,7 @@ void MyMoneySchedule::validate(bool id_check) const
       break;
 
     case TYPE_DEPOSIT:
-      if (m_paymentType == STYPE_DIRECTDEBIT || m_paymentType == STYPE_WRITECHETQUE)
+      if (m_paymentType == STYPE_DIRECTDEBIT || m_paymentType == STYPE_WRITECHEQUE)
         throw new MYMONEYEXCEPTION("Invalid payment type for deposits");
       break;
 
@@ -822,7 +822,7 @@ TQString MyMoneySchedule::occurenceToString(occurenceE occurence)
     occurenceString = I18N_NOOP("Every two months");
   else if(occurence == MyMoneySchedule::OCCUR_EVERYTHREEMONTHS)
     occurenceString = I18N_NOOP("Every three months");
-  else if(occurence == MyMoneySchedule::OCCUR_TQUARTERLY)
+  else if(occurence == MyMoneySchedule::OCCUR_QUARTERLY)
     occurenceString = I18N_NOOP("Quarterly");
   else if(occurence == MyMoneySchedule::OCCUR_EVERYFOURMONTHS)
     occurenceString = I18N_NOOP("Every four months");
@@ -949,7 +949,7 @@ TQString MyMoneySchedule::paymentMethodToString(MyMoneySchedule::paymentTypeE pa
     case MyMoneySchedule::STYPE_OTHER:
       text = I18N_NOOP("Other");
       break;
-    case MyMoneySchedule::STYPE_WRITECHETQUE:
+    case MyMoneySchedule::STYPE_WRITECHEQUE:
       text = I18N_NOOP("Write check");
       break;
     case MyMoneySchedule::STYPE_STANDINGORDER:
@@ -1049,7 +1049,7 @@ int MyMoneySchedule::eventsPerYear(MyMoneySchedule::occurenceE occurence)
       rc = 6;
       break;
     case MyMoneySchedule::OCCUR_EVERYTHREEMONTHS:
-    case MyMoneySchedule::OCCUR_TQUARTERLY:
+    case MyMoneySchedule::OCCUR_QUARTERLY:
       rc = 4;
       break;
     case MyMoneySchedule::OCCUR_EVERYFOURMONTHS:
@@ -1107,7 +1107,7 @@ int MyMoneySchedule::daysBetweenEvents(MyMoneySchedule::occurenceE occurence)
       rc = 60;
       break;
     case MyMoneySchedule::OCCUR_EVERYTHREEMONTHS:
-    case MyMoneySchedule::OCCUR_TQUARTERLY:
+    case MyMoneySchedule::OCCUR_QUARTERLY:
       rc = 90;
       break;
     case MyMoneySchedule::OCCUR_EVERYFOURMONTHS:
@@ -1216,7 +1216,7 @@ MyMoneySchedule::occurenceE MyMoneySchedule::stringToOccurence(const TQString& t
   else if(tmp == i18n("Every three months").lower())
     occurence = MyMoneySchedule::OCCUR_EVERYTHREEMONTHS;
   else if(tmp == i18n("Quarterly").lower())
-    occurence = MyMoneySchedule::OCCUR_TQUARTERLY;
+    occurence = MyMoneySchedule::OCCUR_QUARTERLY;
   else if(tmp == i18n("Every four months").lower())
     occurence = MyMoneySchedule::OCCUR_EVERYFOURMONTHS;
   else if(tmp == i18n("Twice yearly").lower())
@@ -1279,7 +1279,7 @@ void MyMoneySchedule::simpleToCompoundOccurence(int& multiplier,occurenceE& occu
     newMulti  = 2;
   }
   else if(occurence == MyMoneySchedule::OCCUR_EVERYTHREEMONTHS ||
-          occurence == MyMoneySchedule::OCCUR_TQUARTERLY )
+          occurence == MyMoneySchedule::OCCUR_QUARTERLY )
   {
     newOcc    = MyMoneySchedule::OCCUR_MONTHLY;
     newMulti  = 3;
diff --git a/kmymoney2/mymoney/mymoneyscheduled.h b/kmymoney2/mymoney/mymoneyscheduled.h
index 9f8fedd..1258b00 100644
--- a/kmymoney2/mymoney/mymoneyscheduled.h
+++ b/kmymoney2/mymoney/mymoneyscheduled.h
@@ -68,7 +68,7 @@ public:
                     OCCUR_MONTHLY=32, OCCUR_EVERYFOURWEEKS=64,
                     OCCUR_EVERYEIGHTWEEKS=126,
                     OCCUR_EVERYOTHERMONTH=128, OCCUR_EVERYTHREEMONTHS=256,
-                    OCCUR_TWICEYEARLY=1024, OCCUR_EVERYOTHERYEAR=2048, OCCUR_TQUARTERLY=4096,
+                    OCCUR_TWICEYEARLY=1024, OCCUR_EVERYOTHERYEAR=2048, OCCUR_QUARTERLY=4096,
                     OCCUR_EVERYFOURMONTHS=8192, OCCUR_YEARLY=16384
                      };
 
@@ -82,7 +82,7 @@ public:
     */
   enum paymentTypeE { STYPE_ANY=0, STYPE_DIRECTDEBIT=1, STYPE_DIRECTDEPOSIT=2,
                       STYPE_MANUALDEPOSIT=4, STYPE_OTHER=8,
-                      STYPE_WRITECHETQUE=16,
+                      STYPE_WRITECHEQUE=16,
                       STYPE_STANDINGORDER=32,
                       STYPE_BANKTRANSFER=64 };
 
diff --git a/kmymoney2/mymoney/mymoneyscheduletest.cpp b/kmymoney2/mymoney/mymoneyscheduletest.cpp
index 3fe6afe..8287f1f 100644
--- a/kmymoney2/mymoney/mymoneyscheduletest.cpp
+++ b/kmymoney2/mymoney/mymoneyscheduletest.cpp
@@ -168,7 +168,7 @@ void MyMoneyScheduleTest::testAddSchedule()
   	MyMoneySchedule s3(	"s3",
 				MyMoneySchedule::TYPE_TRANSFER,
   				MyMoneySchedule::OCCUR_YEARLY, 1,
-  				MyMoneySchedule::STYPE_WRITECHETQUE,
+  				MyMoneySchedule::STYPE_WRITECHEQUE,
   				TQDate(2001, 3, 1),
   				false,
   				true,
@@ -216,7 +216,7 @@ void MyMoneyScheduleTest::testAnyScheduled()
 				MyMoneySchedule::STYPE_MANUALDEPOSIT));
 	CPPUNIT_ASSERT(m->anyScheduled("A000001", MyMoneySchedule::TYPE_ANY,
 				MyMoneySchedule::OCCUR_ANY,
-				MyMoneySchedule::STYPE_WRITECHETQUE));
+				MyMoneySchedule::STYPE_WRITECHEQUE));
 
 	// Failures
 	CPPUNIT_ASSERT(m->anyScheduled("A000001", MyMoneySchedule::TYPE_BILL,
@@ -855,8 +855,8 @@ void MyMoneyScheduleTest::testPaymentDates()
  		CPPUNIT_ASSERT(list[2] == TQDate(2012, 5,15));
  		CPPUNIT_ASSERT(list[3] == TQDate(2012, 8,15));
  		CPPUNIT_ASSERT(list[4] == TQDate(2012,11,15));
-		// MyMoneySchedule::OCCUR_TQUARTERLY
-		sch.setOccurence(MyMoneySchedule::OCCUR_TQUARTERLY);
+		// MyMoneySchedule::OCCUR_QUARTERLY
+		sch.setOccurence(MyMoneySchedule::OCCUR_QUARTERLY);
 		startDate.setYMD(2012,11,20);
                 endDate.setYMD(2013,11,23);
 		sch.setStartDate(startDate);
@@ -1339,7 +1339,7 @@ void MyMoneyScheduleTest::testDaysBetweenEvents()
   CPPUNIT_ASSERT(MyMoneySchedule::daysBetweenEvents(MyMoneySchedule::OCCUR_EVERYEIGHTWEEKS) == 56);
   CPPUNIT_ASSERT(MyMoneySchedule::daysBetweenEvents(MyMoneySchedule::OCCUR_EVERYOTHERMONTH) == 60);
   CPPUNIT_ASSERT(MyMoneySchedule::daysBetweenEvents(MyMoneySchedule::OCCUR_EVERYTHREEMONTHS) == 90);
-  CPPUNIT_ASSERT(MyMoneySchedule::daysBetweenEvents(MyMoneySchedule::OCCUR_TQUARTERLY) == 90);
+  CPPUNIT_ASSERT(MyMoneySchedule::daysBetweenEvents(MyMoneySchedule::OCCUR_QUARTERLY) == 90);
   CPPUNIT_ASSERT(MyMoneySchedule::daysBetweenEvents(MyMoneySchedule::OCCUR_EVERYFOURMONTHS) == 120);
   CPPUNIT_ASSERT(MyMoneySchedule::daysBetweenEvents(MyMoneySchedule::OCCUR_TWICEYEARLY) == 180);
   CPPUNIT_ASSERT(MyMoneySchedule::daysBetweenEvents(MyMoneySchedule::OCCUR_YEARLY) == 360);
@@ -1361,7 +1361,7 @@ void MyMoneyScheduleTest::testStringToOccurence()
   CPPUNIT_ASSERT( MyMoneySchedule::stringToOccurence(i18n("Every eight weeks")) == MyMoneySchedule::OCCUR_EVERYEIGHTWEEKS );
   CPPUNIT_ASSERT( MyMoneySchedule::stringToOccurence(i18n("Every two months")) == MyMoneySchedule::OCCUR_EVERYOTHERMONTH );
   CPPUNIT_ASSERT( MyMoneySchedule::stringToOccurence(i18n("Every three months")) == MyMoneySchedule::OCCUR_EVERYTHREEMONTHS );
-  CPPUNIT_ASSERT( MyMoneySchedule::stringToOccurence(i18n("Quarterly")) == MyMoneySchedule::OCCUR_TQUARTERLY );
+  CPPUNIT_ASSERT( MyMoneySchedule::stringToOccurence(i18n("Quarterly")) == MyMoneySchedule::OCCUR_QUARTERLY );
   CPPUNIT_ASSERT( MyMoneySchedule::stringToOccurence(i18n("Every four months")) == MyMoneySchedule::OCCUR_EVERYFOURMONTHS );
   CPPUNIT_ASSERT( MyMoneySchedule::stringToOccurence(i18n("Twice yearly")) == MyMoneySchedule::OCCUR_TWICEYEARLY );
   CPPUNIT_ASSERT( MyMoneySchedule::stringToOccurence(i18n("Yearly")) == MyMoneySchedule::OCCUR_YEARLY );
@@ -1382,7 +1382,7 @@ void MyMoneyScheduleTest::testStringToOccurence()
   CPPUNIT_ASSERT( MyMoneySchedule::OCCUR_EVERYEIGHTWEEKS == MyMoneySchedule::stringToOccurence(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYEIGHTWEEKS))) );
   CPPUNIT_ASSERT( MyMoneySchedule::OCCUR_EVERYOTHERMONTH == MyMoneySchedule::stringToOccurence(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYOTHERMONTH))) );
   CPPUNIT_ASSERT( MyMoneySchedule::OCCUR_EVERYTHREEMONTHS == MyMoneySchedule::stringToOccurence(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYTHREEMONTHS))) );
-  CPPUNIT_ASSERT( MyMoneySchedule::OCCUR_TQUARTERLY == MyMoneySchedule::stringToOccurence(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_TQUARTERLY))) );
+  CPPUNIT_ASSERT( MyMoneySchedule::OCCUR_QUARTERLY == MyMoneySchedule::stringToOccurence(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_QUARTERLY))) );
   CPPUNIT_ASSERT( MyMoneySchedule::OCCUR_EVERYFOURMONTHS == MyMoneySchedule::stringToOccurence(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYFOURMONTHS))) );
   CPPUNIT_ASSERT( MyMoneySchedule::OCCUR_TWICEYEARLY == MyMoneySchedule::stringToOccurence(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_TWICEYEARLY))) );
   CPPUNIT_ASSERT( MyMoneySchedule::OCCUR_YEARLY == MyMoneySchedule::stringToOccurence(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_YEARLY))) );
@@ -1403,7 +1403,7 @@ void MyMoneyScheduleTest::testEventsPerYear()
   CPPUNIT_ASSERT(MyMoneySchedule::eventsPerYear(MyMoneySchedule::OCCUR_EVERYEIGHTWEEKS) == 6);
   CPPUNIT_ASSERT(MyMoneySchedule::eventsPerYear(MyMoneySchedule::OCCUR_EVERYOTHERMONTH) == 6);
   CPPUNIT_ASSERT(MyMoneySchedule::eventsPerYear(MyMoneySchedule::OCCUR_EVERYTHREEMONTHS) == 4);
-  CPPUNIT_ASSERT(MyMoneySchedule::eventsPerYear(MyMoneySchedule::OCCUR_TQUARTERLY) == 4);
+  CPPUNIT_ASSERT(MyMoneySchedule::eventsPerYear(MyMoneySchedule::OCCUR_QUARTERLY) == 4);
   CPPUNIT_ASSERT(MyMoneySchedule::eventsPerYear(MyMoneySchedule::OCCUR_EVERYFOURMONTHS) == 3);
   CPPUNIT_ASSERT(MyMoneySchedule::eventsPerYear(MyMoneySchedule::OCCUR_TWICEYEARLY) == 2);
   CPPUNIT_ASSERT(MyMoneySchedule::eventsPerYear(MyMoneySchedule::OCCUR_YEARLY) == 1);
@@ -1426,7 +1426,7 @@ void MyMoneyScheduleTest::testOccurenceToString()
   CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYEIGHTWEEKS) == "Every eight weeks" );
   CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYOTHERMONTH) == "Every two months" );
   CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYTHREEMONTHS) == "Every three months" );
-  CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_TQUARTERLY) == "Quarterly" );
+  CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_QUARTERLY) == "Quarterly" );
   CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYFOURMONTHS) == "Every four months" );
   CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_TWICEYEARLY) == "Twice yearly" );
   CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_YEARLY) == "Yearly" );
@@ -1451,7 +1451,7 @@ void MyMoneyScheduleTest::testOccurenceToString()
   s.setOccurence(MyMoneySchedule::OCCUR_EVERYOTHERMONTH); CPPUNIT_ASSERT(s.occurenceToString() == "Every two months" );
   s.setOccurence(MyMoneySchedule::OCCUR_EVERYTHREEMONTHS); CPPUNIT_ASSERT(s.occurenceToString() == "Every three months" );
   // Quarterly no longer used.  Every three months used instead
-  s.setOccurence(MyMoneySchedule::OCCUR_TQUARTERLY); CPPUNIT_ASSERT(s.occurenceToString() == "Every three months" );
+  s.setOccurence(MyMoneySchedule::OCCUR_QUARTERLY); CPPUNIT_ASSERT(s.occurenceToString() == "Every three months" );
   s.setOccurence(MyMoneySchedule::OCCUR_EVERYFOURMONTHS); CPPUNIT_ASSERT(s.occurenceToString() == "Every four months" );
   s.setOccurence(MyMoneySchedule::OCCUR_TWICEYEARLY); CPPUNIT_ASSERT(s.occurenceToString() == "Twice yearly" );
   s.setOccurence(MyMoneySchedule::OCCUR_YEARLY); CPPUNIT_ASSERT(s.occurenceToString() == "Yearly" );
@@ -1471,7 +1471,7 @@ void MyMoneyScheduleTest::testOccurenceToString()
   CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYEIGHTWEEKS) == MyMoneySchedule::occurenceToString(8,MyMoneySchedule::OCCUR_WEEKLY) );
   CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYOTHERMONTH) == MyMoneySchedule::occurenceToString(2,MyMoneySchedule::OCCUR_MONTHLY) );
   CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYTHREEMONTHS) == MyMoneySchedule::occurenceToString(3,MyMoneySchedule::OCCUR_MONTHLY) );
-  // OCCUR_TQUARTERLY will no longer be used: only Every Three Months
+  // OCCUR_QUARTERLY will no longer be used: only Every Three Months
   CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYFOURMONTHS) == MyMoneySchedule::occurenceToString(4,MyMoneySchedule::OCCUR_MONTHLY) );
   CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_TWICEYEARLY) == MyMoneySchedule::occurenceToString(6,MyMoneySchedule::OCCUR_MONTHLY) );
   CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_YEARLY) == MyMoneySchedule::occurenceToString(1,MyMoneySchedule::OCCUR_YEARLY) );
@@ -1545,7 +1545,7 @@ void MyMoneyScheduleTest::testOccurencePeriodToString()
   CPPUNIT_ASSERT(MyMoneySchedule::occurencePeriodToString(MyMoneySchedule::OCCUR_EVERYEIGHTWEEKS) == "Any" );
   CPPUNIT_ASSERT(MyMoneySchedule::occurencePeriodToString(MyMoneySchedule::OCCUR_EVERYOTHERMONTH) == "Any" );
   CPPUNIT_ASSERT(MyMoneySchedule::occurencePeriodToString(MyMoneySchedule::OCCUR_EVERYTHREEMONTHS) == "Any" );
-  CPPUNIT_ASSERT(MyMoneySchedule::occurencePeriodToString(MyMoneySchedule::OCCUR_TQUARTERLY) == "Any" );
+  CPPUNIT_ASSERT(MyMoneySchedule::occurencePeriodToString(MyMoneySchedule::OCCUR_QUARTERLY) == "Any" );
   CPPUNIT_ASSERT(MyMoneySchedule::occurencePeriodToString(MyMoneySchedule::OCCUR_EVERYFOURMONTHS) == "Any" );
   CPPUNIT_ASSERT(MyMoneySchedule::occurencePeriodToString(MyMoneySchedule::OCCUR_TWICEYEARLY) == "Any" );
   CPPUNIT_ASSERT(MyMoneySchedule::occurencePeriodToString(MyMoneySchedule::OCCUR_EVERYOTHERYEAR) == "Any" );
@@ -1730,7 +1730,7 @@ void MyMoneyScheduleTest::testOccurencePeriod()
   CPPUNIT_ASSERT(s.occurencePeriod() == MyMoneySchedule::OCCUR_MONTHLY);
   CPPUNIT_ASSERT(s.occurenceMultiplier() == 3);
   // Quarterly no longer used.  Every three months used instead
-  s.setOccurence(MyMoneySchedule::OCCUR_TQUARTERLY);
+  s.setOccurence(MyMoneySchedule::OCCUR_QUARTERLY);
   CPPUNIT_ASSERT(s.occurence() == MyMoneySchedule::OCCUR_EVERYTHREEMONTHS);
   CPPUNIT_ASSERT(s.occurencePeriod() == MyMoneySchedule::OCCUR_MONTHLY);
   CPPUNIT_ASSERT(s.occurenceMultiplier() == 3);
@@ -1798,7 +1798,7 @@ void MyMoneyScheduleTest::testSimpleToFromCompoundOccurence()
   occ = MyMoneySchedule::OCCUR_EVERYTHREEMONTHS; mult = 1;
   MyMoneySchedule::simpleToCompoundOccurence(mult, occ);
   CPPUNIT_ASSERT( occ == MyMoneySchedule::OCCUR_MONTHLY && mult == 3 );
-  occ = MyMoneySchedule::OCCUR_TQUARTERLY; mult = 1;
+  occ = MyMoneySchedule::OCCUR_QUARTERLY; mult = 1;
   MyMoneySchedule::simpleToCompoundOccurence(mult, occ);
   CPPUNIT_ASSERT( occ == MyMoneySchedule::OCCUR_MONTHLY && mult == 3 );
   occ = MyMoneySchedule::OCCUR_EVERYFOURMONTHS; mult = 1;
@@ -1851,7 +1851,7 @@ void MyMoneyScheduleTest::testSimpleToFromCompoundOccurence()
   occ = MyMoneySchedule::OCCUR_MONTHLY; mult = 3;
   MyMoneySchedule::compoundToSimpleOccurence(mult, occ);
   CPPUNIT_ASSERT( occ == MyMoneySchedule::OCCUR_EVERYTHREEMONTHS && mult == 1 );
-  // MyMoneySchedule::OCCUR_TQUARTERLY not converted back 
+  // MyMoneySchedule::OCCUR_QUARTERLY not converted back 
   occ = MyMoneySchedule::OCCUR_MONTHLY; mult = 4;
   MyMoneySchedule::compoundToSimpleOccurence(mult, occ);
   CPPUNIT_ASSERT( occ == MyMoneySchedule::OCCUR_EVERYFOURMONTHS && mult == 1 );
diff --git a/kmymoney2/mymoney/mymoneysecurity.cpp b/kmymoney2/mymoney/mymoneysecurity.cpp
index 027441c..7b42b84 100644
--- a/kmymoney2/mymoney/mymoneysecurity.cpp
+++ b/kmymoney2/mymoney/mymoneysecurity.cpp
@@ -72,7 +72,7 @@ MyMoneySecurity::MyMoneySecurity(const TQDomElement& node) :
   MyMoneyKeyValueContainer(node.elementsByTagName("KEYVALUEPAIRS").item(0).toElement())
 {
   if(("SECURITY" != node.tagName())
-      && ("ETQUITY" != node.tagName())
+      && ("EQUITY" != node.tagName())
       && ("CURRENCY" != node.tagName()))
     throw new MYMONEYEXCEPTION("Node was not SECURITY or CURRENCY");
 
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 + " (";