5 files changed, 8 insertions, 8 deletions
diff --git a/kmymoney2/mymoney/mymoneyreport.h b/kmymoney2/mymoney/mymoneyreport.h
index a04573f..a7bfc98 100644
--- a/kmymoney2/mymoney/mymoneyreport.h
+++ b/kmymoney2/mymoney/mymoneyreport.h
@@ -45,8 +45,8 @@ class TQDomDocument;
   * A report is a transactionfilter, so any report can specify which
   * transactions it's interested down to the most minute level of detail.
   * It extends the transactionfilter by providing identification (name,
-  * comments, group type, etc) as well as tqlayout information (what kind
-  * of tqlayout should be used, how the rows & columns should be presented,
+  * comments, group type, etc) as well as layout information (what kind
+  * of layout should be used, how the rows & columns should be presented,
   * currency converted, etc.)
   *
   * As noted above, this class only provides a report DEFINITION.  The
diff --git a/kmymoney2/mymoney/mymoneytransaction.cpp b/kmymoney2/mymoney/mymoneytransaction.cpp
index 27dbe98..a46bb79 100644
--- a/kmymoney2/mymoney/mymoneytransaction.cpp
+++ b/kmymoney2/mymoney/mymoneytransaction.cpp
@@ -334,7 +334,7 @@ unsigned long MyMoneyTransaction::hash(const TQString& txt, unsigned long h)
   unsigned long g;
 
   for(unsigned i=0; i < txt.length(); ++i) {
-    unsigned short uc = txt[i].tqunicode();
+    unsigned short uc = txt[i].unicode();
     for(unsigned j = 0; j < 2; ++j) {
       unsigned char c = uc & 0xff;
       // if either the cell or the row of the Unicode char is 0, stop processing
diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
index b518585..e14f79e 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
+++ b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp
@@ -1973,9 +1973,9 @@ void MyMoneyStorageSql::writeCurrency(const MyMoneySecurity& currency, MyMoneySq
   // writing the symbol as three short ints is a PITA, but the
   // problem is that database drivers have incompatible ways of declaring UTF8
   TQString symbol = currency.tradingSymbol() + "   ";
-  q.bindValue(":symbol1", symbol.mid(0,1).tqunicode()->tqunicode());
-  q.bindValue(":symbol2", symbol.mid(1,1).tqunicode()->tqunicode());
-  q.bindValue(":symbol3", symbol.mid(2,1).tqunicode()->tqunicode());
+  q.bindValue(":symbol1", symbol.mid(0,1).unicode()->unicode());
+  q.bindValue(":symbol2", symbol.mid(1,1).unicode()->unicode());
+  q.bindValue(":symbol3", symbol.mid(2,1).unicode()->unicode());
   q.bindValue(":symbolString", symbol);
   q.bindValue(":partsPerUnit", currency.partsPerUnit());
   q.bindValue(":smallestCashFraction", currency.smallestCashFraction());
diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.h b/kmymoney2/mymoney/storage/mymoneystoragesql.h
index 52db295..eb7b5a3 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragesql.h
+++ b/kmymoney2/mymoney/storage/mymoneystoragesql.h
@@ -402,7 +402,7 @@ public:
 private:
   const TQString enclose(const TQString& text) const
     {return (TQString("'" + text + "'"));};
-  static unsigned int m_currentVersion; // The current version of the database tqlayout
+  static unsigned int m_currentVersion; // The current version of the database layout
   MyMoneyDbDrivers m_drivers;
 #define TABLE(name) void name();
 #define VIEW(name) void name();
diff --git a/kmymoney2/mymoney/storage/mymoneystoragexml.h b/kmymoney2/mymoney/storage/mymoneystoragexml.h
index b74626d..666fc6b 100644
--- a/kmymoney2/mymoney/storage/mymoneystoragexml.h
+++ b/kmymoney2/mymoney/storage/mymoneystoragexml.h
@@ -61,7 +61,7 @@ protected:
     * This method returns the version of the underlying file. It
     * is used by the MyMoney objects contained in a MyMoneyStorageBin object (e.g.
     * MyMoneyAccount, MyMoneyInstitution, MyMoneyTransaction, etc.) to
-    * determine the tqlayout used when reading/writing a persistant file.
+    * determine the layout used when reading/writing a persistant file.
     * A parameter is used to determine the direction.
     *
     * @param dir information about the direction (reading/writing). The