1 files changed, 14 insertions, 14 deletions

diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
index 8f6a4f3..7973519 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
+++ b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
@@ -118,7 +118,7 @@ MyMoneyStorageSql::MyMoneyStorageSql (IMyMoneySerialize *storage, const KURL& ur
   DBG("*** Entering MyMoneyStorageSql::MyMoneyStorageSql");
   m_dbVersion = 0;
   m_progressCallback = 0;
-  m_displaytqStatus = false;
+  m_displayStatus = false;
   m_storage = storage;
   m_storagePtr = dynamic_cast<IMyMoneyStorage*>(storage);
   m_newDatabase = false;
@@ -200,7 +200,7 @@ try {
     rc = -1;
   } else {
     m_logonUser = url.user() + "@" + url.host();
-    m_logonAt = TQDateTime::tqcurrentDateTime();
+    m_logonAt = TQDateTime::currentDateTime();
     writeFileInfo();
   }
   return(rc);
@@ -821,7 +821,7 @@ void MyMoneyStorageSql::clean() {
 
 bool MyMoneyStorageSql::readFile(void) {
   DBG("*** Entering MyMoneyStorageSql::readFile");
-  m_displaytqStatus = true;
+  m_displayStatus = true;
   try {
     readFileInfo();
     readInstitutions();
@@ -860,7 +860,7 @@ bool MyMoneyStorageSql::readFile(void) {
     // FIXME?? if (m_mode == 0) m_storage = NULL;
   // make sure the progress bar is not shown any longer
     signalProgress(-1, -1);
-    m_displaytqStatus = false;
+    m_displayStatus = false;
     //MyMoneySqlQuery::traceOn();
     return true;
   } catch (TQString& s) {
@@ -876,7 +876,7 @@ bool MyMoneyStorageSql::writeFile(void) {
       = m_securities = m_prices = m_currencies = m_schedules  = m_reports = m_kvps = m_budgets = 0;
   m_hiIdInstitutions = m_hiIdPayees = m_hiIdAccounts = m_hiIdTransactions =
       m_hiIdSchedules = m_hiIdSecurities = m_hiIdReports = m_hiIdBudgets = 0;
-  m_displaytqStatus = true;
+  m_displayStatus = true;
   try{
   startCommitUnit(__func__);
   writeInstitutions ();
@@ -897,7 +897,7 @@ bool MyMoneyStorageSql::writeFile(void) {
   endCommitUnit(__func__);
   // make sure the progress bar is not shown any longer
   signalProgress(-1, -1);
-  m_displaytqStatus = false;
+  m_displayStatus = false;
   return true;
 } catch (TQString& s) {
   return false;
@@ -2167,7 +2167,7 @@ void MyMoneyStorageSql::writeFileInfo() {
   q.bindValue(":fixLevel", m_storage->fileFixVersion());
   q.bindValue(":created", TQString(m_storage->creationDate().toString(Qt::ISODate)));
   //q.bindValue(":lastModified", m_storage->lastModificationDate().toString(Qt::ISODate));
-  q.bindValue(":lastModified", TQString(TQDate::tqcurrentDate().toString(Qt::ISODate)));
+  q.bindValue(":lastModified", TQString(TQDate::currentDate().toString(Qt::ISODate)));
   q.bindValue(":baseCurrency", m_storage->pairs()["kmm-baseCurrency"]);
   q.bindValue(":institutions", (unsigned long long) m_institutions);
   q.bindValue(":accounts", (unsigned long long) m_accounts);
@@ -2410,7 +2410,7 @@ void MyMoneyStorageSql::readPayees(const TQValueList<TQString> pid) {
 
 const TQMap<TQString, MyMoneyPayee> MyMoneyStorageSql::fetchPayees (const TQStringList& idList, bool /*forUpdate*/) const {
   DBG("*** Entering MyMoneyStorageSql::readPayees");
-  if (m_displaytqStatus) {
+  if (m_displayStatus) {
     signalProgress(0, m_payees, TQObject::tr("Loading payees..."));
   } else {
 //    if (m_payeeListRead) return;
@@ -2472,7 +2472,7 @@ const TQMap<TQString, MyMoneyPayee> MyMoneyStorageSql::fetchPayees (const TQStri
       //if(id > lastId)
       //  lastId = id;
     }
-    if (m_displaytqStatus) signalProgress(++progress, 0);
+    if (m_displayStatus) signalProgress(++progress, 0);
   }
   return pList;
 }
@@ -2666,7 +2666,7 @@ void MyMoneyStorageSql::readTransactions(const MyMoneyTransactionFilter& filter)
 const TQMap<TQString, MyMoneyTransaction> MyMoneyStorageSql::fetchTransactions (const TQString& tidList, const TQString& dateClause, bool /*forUpdate*/) const {
   DBG("*** Entering MyMoneyStorageSql::readTransactions");
 //  if (m_transactionListRead) return; // all list already in memory
-  if (m_displaytqStatus) signalProgress(0, m_transactions, TQObject::tr("Loading transactions..."));
+  if (m_displayStatus) signalProgress(0, m_transactions, TQObject::tr("Loading transactions..."));
   int progress = 0;
 //  m_payeeList.clear();
   TQString whereClause;
@@ -2748,7 +2748,7 @@ const TQMap<TQString, MyMoneyTransaction> MyMoneyStorageSql::fetchTransactions (
        i != txMapEnd; ++i) {
          i.data().setPairs(kvpMap[i.data().id()].pairs());
 
-         if (m_displaytqStatus) signalProgress(++progress, 0);
+         if (m_displayStatus) signalProgress(++progress, 0);
        }
 
        if ((tidList.isEmpty()) && (dateClause.isEmpty())) {
@@ -3245,7 +3245,7 @@ const  MyMoneyPrice MyMoneyStorageSql::fetchSinglePrice (const TQString& fromIdL
   TQDate date (date_);
 
   if(!date.isValid())
-    date = TQDate::tqcurrentDate();
+    date = TQDate::currentDate();
 
   q.bindValue(":fromId", fromIdList);
   q.bindValue(":toId", toIdList);
@@ -4131,9 +4131,9 @@ const TQString MyMoneyDbDef::generateSQL (const TQString& driver) const {
       replace =  TQString::number
           (MyMoneyFile::instance()->storage()->currentFixVersion());
     if ((*fit)->name() == "created")
-      replace = TQDate::tqcurrentDate().toString(Qt::ISODate);
+      replace = TQDate::currentDate().toString(Qt::ISODate);
     if ((*fit)->name() == "lastModified")
-      replace = TQDate::tqcurrentDate().toString(Qt::ISODate);
+      replace = TQDate::currentDate().toString(Qt::ISODate);
     if ((*fit)->name() == "updateInProgress")
       replace = enclose("N");
     qs.replace(toReplace, replace);