Rename a number of old tq methods that are no longer tq specific

7 files changed, 34 insertions, 34 deletions

diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp
index 30be4f213..8cc2e9462 100644
--- a/kded/kbuildservicefactory.cpp
+++ b/kded/kbuildservicefactory.cpp
@@ -113,32 +113,32 @@ KBuildServiceFactory::save(TQDataStream &str)
 {
    KSycocaFactory::save(str);
 
-   m_nameDictOffset = str.tqdevice()->tqat();
+   m_nameDictOffset = str.device()->at();
    m_nameDict->save(str);
 
-   m_relNameDictOffset = str.tqdevice()->tqat();
+   m_relNameDictOffset = str.device()->at();
    m_relNameDict->save(str);
 
    saveOfferList(str);
    saveInitList(str);
 
-   m_menuIdDictOffset = str.tqdevice()->tqat();
+   m_menuIdDictOffset = str.device()->at();
    m_menuIdDict->save(str);
 
-   int endOfFactoryData = str.tqdevice()->tqat();
+   int endOfFactoryData = str.device()->at();
 
    // Update header (pass #3)
    saveHeader(str);
 
 
    // Seek to end.
-   str.tqdevice()->tqat(endOfFactoryData);
+   str.device()->at(endOfFactoryData);
 }
 
 void
 KBuildServiceFactory::saveOfferList(TQDataStream &str)
 {
-   m_offerListOffset = str.tqdevice()->tqat();
+   m_offerListOffset = str.device()->at();
 
    bool isNumber;
    for(TQDictIterator<KSycocaEntry::Ptr> itserv ( *m_entryDict );
@@ -201,7 +201,7 @@ KBuildServiceFactory::saveOfferList(TQDataStream &str)
 void
 KBuildServiceFactory::saveInitList(TQDataStream &str)
 {
-   m_initListOffset = str.tqdevice()->tqat();
+   m_initListOffset = str.device()->at();
 
    KService::List initList;
 
diff --git a/kded/kbuildservicegroupfactory.cpp b/kded/kbuildservicegroupfactory.cpp
index 7499eda84..e231cd5da 100644
--- a/kded/kbuildservicegroupfactory.cpp
+++ b/kded/kbuildservicegroupfactory.cpp
@@ -165,14 +165,14 @@ KBuildServiceGroupFactory::save(TQDataStream &str)
 {
    KSycocaFactory::save(str);
 
-   m_baseGroupDictOffset = str.tqdevice()->tqat();
+   m_baseGroupDictOffset = str.device()->at();
    m_baseGroupDict->save(str);
 
-   int endOfFactoryData = str.tqdevice()->tqat();
+   int endOfFactoryData = str.device()->at();
 
    // Update header (pass #3)
    saveHeader(str);
 
    // Seek to end.
-   str.tqdevice()->tqat(endOfFactoryData);
+   str.device()->at(endOfFactoryData);
 }
diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp
index 1b09d10c6..27b55176d 100644
--- a/kded/kbuildservicetypefactory.cpp
+++ b/kded/kbuildservicetypefactory.cpp
@@ -152,13 +152,13 @@ KBuildServiceTypeFactory::save(TQDataStream &str)
 
    savePatternLists(str);
 
-   int endOfFactoryData = str.tqdevice()->tqat();
+   int endOfFactoryData = str.device()->at();
 
    // Update header (pass #3)
    saveHeader(str);
 
    // Seek to end.
-   str.tqdevice()->tqat(endOfFactoryData);
+   str.device()->at(endOfFactoryData);
 }
 
 void
@@ -203,10 +203,10 @@ KBuildServiceTypeFactory::savePatternLists(TQDataStream &str)
    TQ_INT32 entrySize = 0;
    TQ_INT32 nrOfEntries = 0;
 
-   m_fastPatternOffset = str.tqdevice()->tqat();
+   m_fastPatternOffset = str.device()->at();
 
    // Write out fastPatternHeader (Pass #1)
-   str.tqdevice()->tqat(m_fastPatternOffset);
+   str.device()->at(m_fastPatternOffset);
    str << nrOfEntries;
    str << entrySize;
 
@@ -214,27 +214,27 @@ KBuildServiceTypeFactory::savePatternLists(TQDataStream &str)
    TQStringList::ConstIterator it = fastPatterns.begin();
    for ( ; it != fastPatterns.end() ; ++it )
    {
-     int start = str.tqdevice()->tqat();
+     int start = str.device()->at();
      // Justify to 6 chars with spaces, so that the size remains constant
      // in the database file.
      TQString paddedPattern = (*it).leftJustify(6).right(4); // remove leading "*."
      //kdDebug(7021) << TQString("FAST : '%1' '%2'").arg(paddedPattern).arg(dict[(*it)]->name()) << endl;
      str << paddedPattern;
      str << dict[(*it)]->offset();
-     entrySize = str.tqdevice()->tqat() - start;
+     entrySize = str.device()->at() - start;
      nrOfEntries++;
    }
 
    // store position
-   m_otherPatternOffset = str.tqdevice()->tqat();
+   m_otherPatternOffset = str.device()->at();
 
    // Write out fastPatternHeader (Pass #2)
-   str.tqdevice()->tqat(m_fastPatternOffset);
+   str.device()->at(m_fastPatternOffset);
    str << nrOfEntries;
    str << entrySize;
 
    // For the other patterns
-   str.tqdevice()->tqat(m_otherPatternOffset);
+   str.device()->at(m_otherPatternOffset);
 
    it = otherPatterns.begin();
    for ( ; it != otherPatterns.end() ; ++it )
diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp
index da5059a92..19f7a3671 100644
--- a/kded/kbuildsycoca.cpp
+++ b/kded/kbuildsycoca.cpp
@@ -160,12 +160,12 @@ void KBuildSycoca::processGnomeVfs()
 
       if (line[0] != '\t')
       {
-          app = TQString::tqfromLatin1(line);
+          app = TQString::fromLatin1(line);
           app.truncate(app.length()-1);
       }
       else if (strncmp(line+1, "mime_types=", 11) == 0)
       {
-          TQString mimetypes = TQString::tqfromLatin1(line+12);
+          TQString mimetypes = TQString::fromLatin1(line+12);
           mimetypes.truncate(mimetypes.length()-1);
           mimetypes.replace(TQRegExp("\\*"), "all");
           KService *s = g_bsf->findServiceByName(app);
@@ -500,7 +500,7 @@ bool KBuildSycoca::recreate()
   if( build()) // Parse dirs
   {
     save(); // Save database
-    if (m_str->tqdevice()->status())
+    if (m_str->device()->status())
       database->abort(); // Error
     m_str = 0L;
     if (!database->close())
@@ -541,7 +541,7 @@ bool KBuildSycoca::recreate()
 void KBuildSycoca::save()
 {
    // Write header (#pass 1)
-   m_str->tqdevice()->tqat(0);
+   m_str->device()->at(0);
 
    (*m_str) << (TQ_INT32) KSycoca::version();
    KSycocaFactory * servicetypeFactory = 0L;
@@ -575,14 +575,14 @@ void KBuildSycoca::save()
        factory = m_lstFactories->next())
    {
       factory->save(*m_str);
-      if (m_str->tqdevice()->status())
+      if (m_str->device()->status())
          return; // error
    }
 
-   int endOfData = m_str->tqdevice()->tqat();
+   int endOfData = m_str->device()->at();
 
    // Write header (#pass 2)
-   m_str->tqdevice()->tqat(0);
+   m_str->device()->at(0);
 
    (*m_str) << (TQ_INT32) KSycoca::version();
    for(KSycocaFactory *factory = m_lstFactories->first();
@@ -599,7 +599,7 @@ void KBuildSycoca::save()
    (*m_str) << (TQ_INT32) 0; // No more factories.
 
    // Jump to end of database
-   m_str->tqdevice()->tqat(endOfData);
+   m_str->device()->at(endOfData);
 }
 
 bool KBuildSycoca::checkDirTimestamps( const TQString& dirname, const TQDateTime& stamp, bool top )
diff --git a/kded/kctimefactory.cpp b/kded/kctimefactory.cpp
index 746a1c433..966966a48 100644
--- a/kded/kctimefactory.cpp
+++ b/kded/kctimefactory.cpp
@@ -53,7 +53,7 @@ KCTimeInfo::save(TQDataStream &str)
 {
   KSycocaFactory::save(str);
 
-  m_dictOffset = str.tqdevice()->tqat();
+  m_dictOffset = str.device()->at();
   TQDictIterator<TQ_UINT32> it(ctimeDict);
   while( it.current())
   {
@@ -62,10 +62,10 @@ KCTimeInfo::save(TQDataStream &str)
   }   
   str << TQString::null << (TQ_UINT32) 0;
 
-  int endOfFactoryData = str.tqdevice()->tqat();
+  int endOfFactoryData = str.device()->at();
 
   saveHeader(str);
-  str.tqdevice()->tqat(endOfFactoryData);
+  str.device()->at(endOfFactoryData);
 }
 
 void 
@@ -86,7 +86,7 @@ void
 KCTimeInfo::fillCTimeDict(TQDict<TQ_UINT32> &dict)
 {
     assert(m_str);
-    m_str->tqdevice()->tqat(m_dictOffset);
+    m_str->device()->at(m_dictOffset);
     TQString path;
     TQ_UINT32 ctime;
     while(true)
diff --git a/kded/khostname.cpp b/kded/khostname.cpp
index e7b1cf209..3f5d8f62a 100644
--- a/kded/khostname.cpp
+++ b/kded/khostname.cpp
@@ -23,7 +23,7 @@
 #include <stdio.h>
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 
 #include <dcopclient.h>
diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp
index b1c3a612a..e147dcfaf 100644
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
@@ -1000,7 +1000,7 @@ VFolderMenu::loadApplications(const TQString &dir, const TQString &prefix)
    while( ( ep = readdir( dp ) ) != 0L )
    {
       TQString fn( TQFile::decodeName(ep->d_name));
-      if (fn == _dot || fn == _dotdot || TQChar(fn.tqat(fn.length() - 1)).latin1() == '~')
+      if (fn == _dot || fn == _dotdot || TQChar(fn.at(fn.length() - 1)).latin1() == '~')
          continue;
 
       TQString pathfn = dir + fn;
@@ -1110,7 +1110,7 @@ kdDebug(7021) << "processLegacyDir(" << dir << ", " << relDir << ", " << prefix
    while( ( ep = readdir( dp ) ) != 0L )
    {
       TQString fn( TQFile::decodeName(ep->d_name));
-      if (fn == _dot || fn == _dotdot || TQChar(fn.tqat(fn.length() - 1)).latin1() == '~')
+      if (fn == _dot || fn == _dotdot || TQChar(fn.at(fn.length() - 1)).latin1() == '~')
          continue;
 
       TQString pathfn = dir + fn;