From 13281e2856a2ef43bbab78c5528470309c23aa77 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 15 Dec 2011 15:48:49 -0600
Subject: Rename a number of old tq methods that are no longer tq specific

---
 tdecore/ksycocadict.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'tdecore/ksycocadict.cpp')

diff --git a/tdecore/ksycocadict.cpp b/tdecore/ksycocadict.cpp
index 11b16b08b..d1deb609b 100644
--- a/tdecore/ksycocadict.cpp
+++ b/tdecore/ksycocadict.cpp
@@ -29,7 +29,7 @@ namespace
 {
 struct string_entry {
   string_entry(TQString _key, KSycocaEntry *_payload) 
-  { keyStr = _key; key = keyStr.tqunicode(); length = keyStr.length(); payload = _payload; hash = 0; }
+  { keyStr = _key; key = keyStr.unicode(); length = keyStr.length(); payload = _payload; hash = 0; }
   uint hash;
   int length;
   const TQChar *key;
@@ -60,7 +60,7 @@ KSycocaDict::KSycocaDict(TQDataStream *str, int offset)
   : d(0), mStr(str), mOffset(offset)
 {
    TQ_UINT32 test1, test2;
-   str->tqdevice()->tqat(offset);
+   str->device()->at(offset);
    (*str) >> test1 >> test2;
    if ((test1 > 0x000fffff) || (test2 > 1024))
    {
@@ -70,10 +70,10 @@ KSycocaDict::KSycocaDict(TQDataStream *str, int offset)
        return;
    }
 
-   str->tqdevice()->tqat(offset);
+   str->device()->at(offset);
    (*str) >> mHashTableSize;
    (*str) >> mHashList;
-   mOffset = str->tqdevice()->tqat(); // Start of hashtable
+   mOffset = str->device()->at(); // Start of hashtable
 }
 
 KSycocaDict::~KSycocaDict()
@@ -131,7 +131,7 @@ KSycocaDict::find_string(const TQString &key )
 
    uint off = mOffset+sizeof(TQ_INT32)*hash;
    //kdDebug(7011) << TQString("off is %1").arg(off,8,16) << endl;
-   mStr->tqdevice()->tqat( off );
+   mStr->device()->at( off );
 
    TQ_INT32 offset;
    (*mStr) >> offset;
@@ -146,7 +146,7 @@ KSycocaDict::find_string(const TQString &key )
    // Lookup duplicate list.
    offset = -offset;
 
-   mStr->tqdevice()->tqat(offset);
+   mStr->device()->at(offset);
    //kdDebug(7011) << TQString("Looking up duplicate list at %1").arg(offset,8,16) << endl;
    
    while(true)
@@ -286,7 +286,7 @@ KSycocaDict::save(TQDataStream &str)
       return;
    }
 
-   mOffset = str.tqdevice()->tqat();
+   mOffset = str.device()->at();
 
    //kdDebug(7011) << TQString("KSycocaDict: %1 entries.").arg(count()) << endl;
 
@@ -402,12 +402,12 @@ KSycocaDict::save(TQDataStream &str)
    str << mHashTableSize;
    str << mHashList;
 
-   mOffset = str.tqdevice()->tqat(); // mOffset points to start of hashTable
+   mOffset = str.device()->at(); // mOffset points to start of hashTable
    //kdDebug(7011) << TQString("Start of Hash Table, offset = %1").arg(mOffset,8,16) << endl;
 
    for(int pass = 1; pass <= 2; pass++)
    {
-      str.tqdevice()->tqat(mOffset);
+      str.device()->at(mOffset);
       //kdDebug(7011) << TQString("Writing hash table (pass #%1)").arg(pass) << endl;
       for(uint i=0; i < mHashTableSize; i++)
       {
@@ -421,7 +421,7 @@ KSycocaDict::save(TQDataStream &str)
          str << tmpid;
          //kdDebug(7011) << TQString("Hash table : %1").arg(tmpid,8,16) << endl;
       }
-      //kdDebug(7011) << TQString("End of Hash Table, offset = %1").arg(str.tqdevice()->tqat(),8,16) << endl;
+      //kdDebug(7011) << TQString("End of Hash Table, offset = %1").arg(str.device()->at(),8,16) << endl;
 
       //kdDebug(7011) << TQString("Writing duplicate lists (pass #%1)").arg(pass) << endl;
       for(uint i=0; i < mHashTableSize; i++)
@@ -429,7 +429,7 @@ KSycocaDict::save(TQDataStream &str)
          if (hashTable[i].duplicates)
          {
             TQPtrList<string_entry> *dups = hashTable[i].duplicates;
-            hashTable[i].duplicate_offset = str.tqdevice()->tqat();
+            hashTable[i].duplicate_offset = str.device()->at();
 
             /*kdDebug(7011) << TQString("Duplicate lists: Offset = %1 list_size = %2")                           .arg(hashTable[i].duplicate_offset,8,16).arg(dups->count()) << endl;
 */
@@ -441,7 +441,7 @@ KSycocaDict::save(TQDataStream &str)
             str << (TQ_INT32) 0;               // End of list marker (0)
          }
       }
-      //kdDebug(7011) << TQString("End of Dict, offset = %1").arg(str.tqdevice()->tqat(),8,16) << endl;
+      //kdDebug(7011) << TQString("End of Dict, offset = %1").arg(str.device()->at(),8,16) << endl;
    }
 
    //kdDebug(7011) << "Cleaning up hash table." << endl;
-- 
cgit v1.2.1