Initial conversion for TQt for Qt4 3.4.0 TP2

This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase.  If it does then it needs to be fixed!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

14 files changed, 165 insertions, 165 deletions

diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp
index f8f8c34f1..64298c273 100644
--- a/kded/kbuildservicefactory.cpp
+++ b/kded/kbuildservicefactory.cpp
@@ -67,7 +67,7 @@ KSycocaEntry *
 KBuildServiceFactory::createEntry( const TQString& file, const char *resource )
 {
   TQString name = file;
-  int pos = name.findRev('/');
+  int pos = name.tqfindRev('/');
   if (pos != -1)
   {
      name = name.mid(pos+1);
@@ -101,11 +101,11 @@ KBuildServiceFactory::saveHeader(TQDataStream &str)
 {
    KSycocaFactory::saveHeader(str);
 
-   str << (Q_INT32) m_nameDictOffset;
-   str << (Q_INT32) m_relNameDictOffset;
-   str << (Q_INT32) m_offerListOffset;
-   str << (Q_INT32) m_initListOffset;
-   str << (Q_INT32) m_menuIdDictOffset;
+   str << (TQ_INT32) m_nameDictOffset;
+   str << (TQ_INT32) m_relNameDictOffset;
+   str << (TQ_INT32) m_offerListOffset;
+   str << (TQ_INT32) m_initListOffset;
+   str << (TQ_INT32) m_menuIdDictOffset;
 }
 
 void
@@ -113,32 +113,32 @@ KBuildServiceFactory::save(TQDataStream &str)
 {
    KSycocaFactory::save(str);
 
-   m_nameDictOffset = str.device()->at();
+   m_nameDictOffset = str.tqdevice()->at();
    m_nameDict->save(str);
 
-   m_relNameDictOffset = str.device()->at();
+   m_relNameDictOffset = str.tqdevice()->at();
    m_relNameDict->save(str);
 
    saveOfferList(str);
    saveInitList(str);
 
-   m_menuIdDictOffset = str.device()->at();
+   m_menuIdDictOffset = str.tqdevice()->at();
    m_menuIdDict->save(str);
 
-   int endOfFactoryData = str.device()->at();
+   int endOfFactoryData = str.tqdevice()->at();
 
    // Update header (pass #3)
    saveHeader(str);
 
 
    // Seek to end.
-   str.device()->at(endOfFactoryData);
+   str.tqdevice()->at(endOfFactoryData);
 }
 
 void
 KBuildServiceFactory::saveOfferList(TQDataStream &str)
 {
-   m_offerListOffset = str.device()->at();
+   m_offerListOffset = str.tqdevice()->at();
 
    bool isNumber;
    for(TQDictIterator<KSycocaEntry::Ptr> itserv ( *m_entryDict );
@@ -190,18 +190,18 @@ KBuildServiceFactory::saveOfferList(TQDataStream &str)
           it2 != services.end(); ++it2)
       {
          KService *service = *it2;
-         str << (Q_INT32) entry->offset();
-         str << (Q_INT32) service->offset();
+         str << (TQ_INT32) entry->offset();
+         str << (TQ_INT32) service->offset();
       }
    }
 
-   str << (Q_INT32) 0;               // End of list marker (0)
+   str << (TQ_INT32) 0;               // End of list marker (0)
 }
 
 void
 KBuildServiceFactory::saveInitList(TQDataStream &str)
 {
-   m_initListOffset = str.device()->at();
+   m_initListOffset = str.tqdevice()->at();
 
    KService::List initList;
 
@@ -215,19 +215,19 @@ KBuildServiceFactory::saveInitList(TQDataStream &str)
           initList.append(service); 
       }
    }
-   str << (Q_INT32) initList.count(); // Nr of init services.
+   str << (TQ_INT32) initList.count(); // Nr of init services.
    for(KService::List::Iterator it = initList.begin();
        it != initList.end();
        ++it)
    {
-      str << (Q_INT32) (*it)->offset();
+      str << (TQ_INT32) (*it)->offset();
    }
 }
 
 void
 KBuildServiceFactory::addEntry(KSycocaEntry *newEntry, const char *resource)
 {
-   if (m_dupeDict.find(newEntry))
+   if (m_dupeDict.tqfind(newEntry))
       return;
 
    KSycocaFactory::addEntry(newEntry, resource);
@@ -244,7 +244,7 @@ KBuildServiceFactory::addEntry(KSycocaEntry *newEntry, const char *resource)
 
    TQString name = service->desktopEntryName();
    m_nameDict->add( name, newEntry );
-   m_serviceDict.replace(name, service);
+   m_serviceDict.tqreplace(name, service);
 
    TQString relName = service->desktopEntryPath();
    m_relNameDict->add( relName, newEntry );
diff --git a/kded/kbuildservicegroupfactory.cpp b/kded/kbuildservicegroupfactory.cpp
index e75931182..a992b885d 100644
--- a/kded/kbuildservicegroupfactory.cpp
+++ b/kded/kbuildservicegroupfactory.cpp
@@ -59,7 +59,7 @@ KBuildServiceGroupFactory::createEntry( const TQString&, const char * )
 void KBuildServiceGroupFactory::addNewEntryTo( const TQString &menuName, KService *newEntry)
 {
   KServiceGroup *entry = 0;
-  KSycocaEntry::Ptr *ptr = m_entryDict->find(menuName);
+  KSycocaEntry::Ptr *ptr = m_entryDict->tqfind(menuName);
   if (ptr)
      entry = dynamic_cast<KServiceGroup *>(ptr->data());
 
@@ -74,7 +74,7 @@ void KBuildServiceGroupFactory::addNewEntryTo( const TQString &menuName, KServic
 KServiceGroup *
 KBuildServiceGroupFactory::addNew( const TQString &menuName, const TQString& file, KServiceGroup *entry, bool isDeleted)
 {
-  KSycocaEntry::Ptr *ptr = m_entryDict->find(menuName);
+  KSycocaEntry::Ptr *ptr = m_entryDict->tqfind(menuName);
   if (ptr)
   {
     kdWarning(7021) << "KBuildServiceGroupFactory::addNew( " << menuName << ", " << file << " ): menu already exists!" << endl;
@@ -94,14 +94,14 @@ KBuildServiceGroupFactory::addNew( const TQString &menuName, const TQString& fil
      // Make sure parent dir exists.
      KServiceGroup *parentEntry = 0;
      TQString parent = menuName.left(menuName.length()-1);
-     int i = parent.findRev('/');
+     int i = parent.tqfindRev('/');
      if (i > 0) {
         parent = parent.left(i+1);
      } else {
         parent = "/";
      }
      parentEntry = 0;
-     ptr = m_entryDict->find(parent);
+     ptr = m_entryDict->tqfind(parent);
      if (ptr)
         parentEntry = dynamic_cast<KServiceGroup *>(ptr->data());
      if (!parentEntry)
@@ -123,7 +123,7 @@ KBuildServiceGroupFactory::addNewChild( const TQString &parent, const char *reso
   TQString name = "#parent#"+parent;
 
   KServiceGroup *entry = 0;
-  KSycocaEntry::Ptr *ptr = m_entryDict->find(name);
+  KSycocaEntry::Ptr *ptr = m_entryDict->tqfind(name);
   if (ptr)
      entry = dynamic_cast<KServiceGroup *>(ptr->data());
 
@@ -157,7 +157,7 @@ KBuildServiceGroupFactory::saveHeader(TQDataStream &str)
 {
    KSycocaFactory::saveHeader(str);
 
-   str << (Q_INT32) m_baseGroupDictOffset;
+   str << (TQ_INT32) m_baseGroupDictOffset;
 }
 
 void
@@ -165,14 +165,14 @@ KBuildServiceGroupFactory::save(TQDataStream &str)
 {
    KSycocaFactory::save(str);
 
-   m_baseGroupDictOffset = str.device()->at();
+   m_baseGroupDictOffset = str.tqdevice()->at();
    m_baseGroupDict->save(str);
 
-   int endOfFactoryData = str.device()->at();
+   int endOfFactoryData = str.tqdevice()->at();
 
    // Update header (pass #3)
    saveHeader(str);
 
    // Seek to end.
-   str.device()->at(endOfFactoryData);
+   str.tqdevice()->at(endOfFactoryData);
 }
diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp
index b5259c5cd..c6a386aca 100644
--- a/kded/kbuildservicetypefactory.cpp
+++ b/kded/kbuildservicetypefactory.cpp
@@ -69,7 +69,7 @@ KSycocaEntry *
 KBuildServiceTypeFactory::createEntry(const TQString &file, const char *resource)
 {
   TQString name = file;
-  int pos = name.findRev('/');
+  int pos = name.tqfindRev('/');
   if (pos != -1)
   {
      name = name.mid(pos+1);
@@ -133,14 +133,14 @@ void
 KBuildServiceTypeFactory::saveHeader(TQDataStream &str)
 {
    KSycocaFactory::saveHeader(str);
-   str << (Q_INT32) m_fastPatternOffset;
-   str << (Q_INT32) m_otherPatternOffset;
-   str << (Q_INT32) m_propertyTypeDict.count();
+   str << (TQ_INT32) m_fastPatternOffset;
+   str << (TQ_INT32) m_otherPatternOffset;
+   str << (TQ_INT32) m_propertyTypeDict.count();
 
    TQMapIterator<TQString, int> it;
    for (it = m_propertyTypeDict.begin(); it != m_propertyTypeDict.end(); ++it)
    {
-     str << it.key() << (Q_INT32)it.data();
+     str << it.key() << (TQ_INT32)it.data();
    }
 
 }
@@ -152,13 +152,13 @@ KBuildServiceTypeFactory::save(TQDataStream &str)
 
    savePatternLists(str);
 
-   int endOfFactoryData = str.device()->at();
+   int endOfFactoryData = str.tqdevice()->at();
 
    // Update header (pass #3)
    saveHeader(str);
 
    // Seek to end.
-   str.device()->at(endOfFactoryData);
+   str.tqdevice()->at(endOfFactoryData);
 }
 
 void
@@ -183,8 +183,8 @@ KBuildServiceTypeFactory::savePatternLists(TQDataStream &str)
         for ( ; patit != pat.end() ; ++patit )
         {
            const TQString &pattern = *patit;
-           if ( pattern.findRev('*') == 0
-                && pattern.findRev('.') == 1
+           if ( pattern.tqfindRev('*') == 0
+                && pattern.tqfindRev('.') == 1
                 && pattern.length() <= 6 )
               // it starts with "*.", has no other '*' and no other '.', and is max 6 chars
               // => fast patttern
@@ -193,20 +193,20 @@ KBuildServiceTypeFactory::savePatternLists(TQDataStream &str)
               otherPatterns.append( pattern );
            // Assumption : there is only one mimetype for that pattern
            // It doesn't really make sense otherwise, anyway.
-           dict.replace( pattern, mimeType );
+           dict.tqreplace( pattern, mimeType );
         }
       }
    }
    // Sort the list - the fast one, useless for the other one
    fastPatterns.sort();
 
-   Q_INT32 entrySize = 0;
-   Q_INT32 nrOfEntries = 0;
+   TQ_INT32 entrySize = 0;
+   TQ_INT32 nrOfEntries = 0;
 
-   m_fastPatternOffset = str.device()->at();
+   m_fastPatternOffset = str.tqdevice()->at();
 
    // Write out fastPatternHeader (Pass #1)
-   str.device()->at(m_fastPatternOffset);
+   str.tqdevice()->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.device()->at();
+     int start = str.tqdevice()->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.device()->at() - start;
+     entrySize = str.tqdevice()->at() - start;
      nrOfEntries++;
    }
 
    // store position
-   m_otherPatternOffset = str.device()->at();
+   m_otherPatternOffset = str.tqdevice()->at();
 
    // Write out fastPatternHeader (Pass #2)
-   str.device()->at(m_fastPatternOffset);
+   str.tqdevice()->at(m_fastPatternOffset);
    str << nrOfEntries;
    str << entrySize;
 
    // For the other patterns
-   str.device()->at(m_otherPatternOffset);
+   str.tqdevice()->at(m_otherPatternOffset);
 
    it = otherPatterns.begin();
    for ( ; it != otherPatterns.end() ; ++it )
@@ -267,7 +267,7 @@ KBuildServiceTypeFactory::addEntry(KSycocaEntry *newEntry, const char *resource)
    TQMap<TQString,TQVariant::Type>::ConstIterator pit = pd.begin();
    for( ; pit != pd.end(); ++pit )
    {
-     if (!m_propertyTypeDict.contains(pit.key()))
+     if (!m_propertyTypeDict.tqcontains(pit.key()))
        m_propertyTypeDict.insert(pit.key(), pit.data());
      else if (m_propertyTypeDict[pit.key()] != pit.data())
        kdWarning(7021) << "Property '"<< pit.key() << "' is defined multiple times ("<< serviceType->name() <<")" <<endl;
diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp
index 9df927ca8..58585f19a 100644
--- a/kded/kbuildsycoca.cpp
+++ b/kded/kbuildsycoca.cpp
@@ -68,13 +68,13 @@
 typedef TQDict<KSycocaEntry> KBSEntryDict;
 typedef TQValueList<KSycocaEntry::List> KSycocaEntryListList;
 
-static Q_UINT32 newTimestamp = 0;
+static TQ_UINT32 newTimestamp = 0;
 
 static KBuildServiceFactory *g_bsf = 0;
 static KBuildServiceGroupFactory *g_bsgf = 0;
 static KSycocaFactory *g_factory = 0;
 static KCTimeInfo *g_ctimeInfo = 0;
-static TQDict<Q_UINT32> *g_ctimeDict = 0;
+static TQDict<TQ_UINT32> *g_ctimeDict = 0;
 static const char *g_resource = 0;
 static KBSEntryDict *g_entryDict = 0;
 static KBSEntryDict *g_serviceGroupEntryDict = 0;
@@ -160,12 +160,12 @@ void KBuildSycoca::processGnomeVfs()
 
       if (line[0] != '\t')
       {
-          app = TQString::fromLatin1(line);
+          app = TQString::tqfromLatin1(line);
           app.truncate(app.length()-1);
       }
       else if (strncmp(line+1, "mime_types=", 11) == 0)
       {
-          TQString mimetypes = TQString::fromLatin1(line+12);
+          TQString mimetypes = TQString::tqfromLatin1(line+12);
           mimetypes.truncate(mimetypes.length()-1);
           mimetypes.replace(TQRegExp("\\*"), "all");
           KService *s = g_bsf->findServiceByName(app);
@@ -186,7 +186,7 @@ void KBuildSycoca::processGnomeVfs()
 
 KSycocaEntry *KBuildSycoca::createEntry(const TQString &file, bool addToFactory)
 {
-   Q_UINT32 timeStamp = g_ctimeInfo->ctime(file);
+   TQ_UINT32 timeStamp = g_ctimeInfo->ctime(file);
    if (!timeStamp)
    {
       timeStamp = KGlobal::dirs()->calcResourceHash( g_resource, file, true);
@@ -195,23 +195,23 @@ KSycocaEntry *KBuildSycoca::createEntry(const TQString &file, bool addToFactory)
    if (g_allEntries)
    {
       assert(g_ctimeDict);
-      Q_UINT32 *timeP = (*g_ctimeDict)[file];
-      Q_UINT32 oldTimestamp = timeP ? *timeP : 0;
+      TQ_UINT32 *timeP = (*g_ctimeDict)[file];
+      TQ_UINT32 oldTimestamp = timeP ? *timeP : 0;
 
       if (timeStamp && (timeStamp == oldTimestamp))
       {
          // Re-use old entry
          if (g_factory == g_bsgf) // Strip .directory from service-group entries
          {
-            entry = g_entryDict->find(file.left(file.length()-10));
+            entry = g_entryDict->tqfind(file.left(file.length()-10));
          }
          else if (g_factory == g_bsf)
          {
-            entry = g_entryDict->find(file);
+            entry = g_entryDict->tqfind(file);
          }
          else
          {
-            entry = g_entryDict->find(file);
+            entry = g_entryDict->tqfind(file);
          }
          // remove from g_ctimeDict; if g_ctimeDict is not empty
          // after all files have been processed, it means
@@ -300,7 +300,7 @@ bool KBuildSycoca::build()
          ++it1 )
     {
       KSycocaResource res = (*it1);
-      if (!allResources.contains(res.resource))
+      if (!allResources.tqcontains(res.resource))
          allResources.append(res.resource);
     }
   }
@@ -414,7 +414,7 @@ void KBuildSycoca::createMenu(TQString caption, TQString name, VFolderMenu::SubM
      TQString directoryFile = subMenu->directoryFile;
      if (directoryFile.isEmpty())
         directoryFile = subName+".directory";
-     Q_UINT32 timeStamp = g_ctimeInfo->ctime(directoryFile);
+     TQ_UINT32 timeStamp = g_ctimeInfo->ctime(directoryFile);
      if (!timeStamp)
      {
         timeStamp = KGlobal::dirs()->calcResourceHash( g_resource, directoryFile, true);
@@ -423,12 +423,12 @@ void KBuildSycoca::createMenu(TQString caption, TQString name, VFolderMenu::SubM
      KServiceGroup* entry = 0;
      if (g_allEntries)
      {
-        Q_UINT32 *timeP = (*g_ctimeDict)[directoryFile];
-        Q_UINT32 oldTimestamp = timeP ? *timeP : 0;
+        TQ_UINT32 *timeP = (*g_ctimeDict)[directoryFile];
+        TQ_UINT32 oldTimestamp = timeP ? *timeP : 0;
 
         if (timeStamp && (timeStamp == oldTimestamp))
         {
-            entry = dynamic_cast<KServiceGroup *> (g_serviceGroupEntryDict->find(subName));
+            entry = dynamic_cast<KServiceGroup *> (g_serviceGroupEntryDict->tqfind(subName));
             if (entry && (entry->directoryEntryPath() != directoryFile))
                 entry = 0; // Can't reuse this one!
         }
@@ -500,7 +500,7 @@ bool KBuildSycoca::recreate()
   if( build()) // Parse dirs
   {
     save(); // Save database
-    if (m_str->device()->status())
+    if (m_str->tqdevice()->status())
       database->abort(); // Error
     m_str = 0L;
     if (!database->close())
@@ -541,17 +541,17 @@ bool KBuildSycoca::recreate()
 void KBuildSycoca::save()
 {
    // Write header (#pass 1)
-   m_str->device()->at(0);
+   m_str->tqdevice()->at(0);
 
-   (*m_str) << (Q_INT32) KSycoca::version();
+   (*m_str) << (TQ_INT32) KSycoca::version();
    KSycocaFactory * servicetypeFactory = 0L;
    KSycocaFactory * serviceFactory = 0L;
    for(KSycocaFactory *factory = m_lstFactories->first();
        factory;
        factory = m_lstFactories->next())
    {
-      Q_INT32 aId;
-      Q_INT32 aOffset;
+      TQ_INT32 aId;
+      TQ_INT32 aOffset;
       aId = factory->factoryId();
       if ( aId == KST_KServiceTypeFactory )
          servicetypeFactory = factory;
@@ -561,7 +561,7 @@ void KBuildSycoca::save()
       (*m_str) << aId;
       (*m_str) << aOffset;
    }
-   (*m_str) << (Q_INT32) 0; // No more factories.
+   (*m_str) << (TQ_INT32) 0; // No more factories.
    // Write KDEDIRS
    (*m_str) << KGlobal::dirs()->kfsstnd_prefixes();
    (*m_str) << newTimestamp;
@@ -575,31 +575,31 @@ void KBuildSycoca::save()
        factory = m_lstFactories->next())
    {
       factory->save(*m_str);
-      if (m_str->device()->status())
+      if (m_str->tqdevice()->status())
          return; // error
    }
 
-   int endOfData = m_str->device()->at();
+   int endOfData = m_str->tqdevice()->at();
 
    // Write header (#pass 2)
-   m_str->device()->at(0);
+   m_str->tqdevice()->at(0);
 
-   (*m_str) << (Q_INT32) KSycoca::version();
+   (*m_str) << (TQ_INT32) KSycoca::version();
    for(KSycocaFactory *factory = m_lstFactories->first();
        factory;
        factory = m_lstFactories->next())
    {
-      Q_INT32 aId;
-      Q_INT32 aOffset;
+      TQ_INT32 aId;
+      TQ_INT32 aOffset;
       aId = factory->factoryId();
       aOffset = factory->offset();
       (*m_str) << aId;
       (*m_str) << aOffset;
    }
-   (*m_str) << (Q_INT32) 0; // No more factories.
+   (*m_str) << (TQ_INT32) 0; // No more factories.
 
    // Jump to end of database
-   m_str->device()->at(endOfData);
+   m_str->tqdevice()->at(endOfData);
 }
 
 bool KBuildSycoca::checkDirTimestamps( const TQString& dirname, const TQDateTime& stamp, bool top )
@@ -614,11 +614,11 @@ bool KBuildSycoca::checkDirTimestamps( const TQString& dirname, const TQDateTime
          }
    }
    TQDir dir( dirname );
-   const QFileInfoList *list = dir.entryInfoList( TQDir::DefaultFilter, TQDir::Unsorted );
+   const TQFileInfoList *list = dir.entryInfoList( TQDir::DefaultFilter, TQDir::Unsorted );
    if (!list)
       return true;
 
-   for( QFileInfoListIterator it( *list );
+   for( TQFileInfoListIterator it( *list );
         it.current() != NULL;
         ++it )
    {
@@ -640,7 +640,7 @@ bool KBuildSycoca::checkDirTimestamps( const TQString& dirname, const TQDateTime
 // and also their directories
 // if all of them all older than the timestamp in file ksycocastamp, this
 // means that there's no need to rebuild ksycoca
-bool KBuildSycoca::checkTimestamps( Q_UINT32 timestamp, const TQStringList &dirs )
+bool KBuildSycoca::checkTimestamps( TQ_UINT32 timestamp, const TQStringList &dirs )
 {
    kdDebug( 7021 ) << "checking file timestamps" << endl;
    TQDateTime stamp;
@@ -806,8 +806,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
      KSycoca::self()->disableAutoRebuild(); // Prevent deadlock
      TQString current_language = KGlobal::locale()->language();
      TQString ksycoca_language = KSycoca::self()->language();
-     Q_UINT32 current_update_sig = KGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true);
-     Q_UINT32 ksycoca_update_sig = KSycoca::self()->updateSignature();
+     TQ_UINT32 current_update_sig = KGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true);
+     TQ_UINT32 ksycoca_update_sig = KSycoca::self()->updateSignature();
 
      if ((current_update_sig != ksycoca_update_sig) ||
          (current_language != ksycoca_language) ||
@@ -822,7 +822,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
    g_changeList = new TQStringList;
 
    bool checkstamps = incremental && args->isSet("checkstamps") && checkfiles;
-   Q_UINT32 filestamp = 0;
+   TQ_UINT32 filestamp = 0;
    TQStringList oldresourcedirs;
    if( checkstamps && incremental )
    {
@@ -859,7 +859,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
        cSycocaPath = 0;
    }
 
-   newTimestamp = (Q_UINT32) time(0);
+   newTimestamp = (TQ_UINT32) time(0);
 
    if( checkfiles && ( !checkstamps || !KBuildSycoca::checkTimestamps( filestamp, oldresourcedirs )))
    {
@@ -874,7 +874,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
          KSycoca *oldSycoca = KSycoca::self();
          KSycocaFactoryList *factories = new KSycocaFactoryList;
          g_allEntries = new KSycocaEntryListList;
-         g_ctimeDict = new TQDict<Q_UINT32>(523);
+         g_ctimeDict = new TQDict<TQ_UINT32>(523);
 
          // Must be in same order as in KBuildSycoca::recreate()!
          factories->append( new KServiceTypeFactory );
diff --git a/kded/kbuildsycoca.h b/kded/kbuildsycoca.h
index 0f90c3df6..f98001781 100644
--- a/kded/kbuildsycoca.h
+++ b/kded/kbuildsycoca.h
@@ -47,7 +47,7 @@ public:
     */
    bool recreate();
 
-   static bool checkTimestamps( Q_UINT32 timestamp, const TQStringList &dirs );
+   static bool checkTimestamps( TQ_UINT32 timestamp, const TQStringList &dirs );
 
    static TQStringList existingResourceDirs();
    
diff --git a/kded/kctimefactory.cpp b/kded/kctimefactory.cpp
index 25d78bab0..f268889c4 100644
--- a/kded/kctimefactory.cpp
+++ b/kded/kctimefactory.cpp
@@ -53,47 +53,47 @@ KCTimeInfo::save(TQDataStream &str)
 {
   KSycocaFactory::save(str);
 
-  m_dictOffset = str.device()->at();
-  TQDictIterator<Q_UINT32> it(ctimeDict);
+  m_dictOffset = str.tqdevice()->at();
+  TQDictIterator<TQ_UINT32> it(ctimeDict);
   while( it.current())
   {
      str << it.currentKey() << *(it.current());
      ++it;
   }   
-  str << TQString::null << (Q_UINT32) 0;
+  str << TQString::null << (TQ_UINT32) 0;
 
-  int endOfFactoryData = str.device()->at();
+  int endOfFactoryData = str.tqdevice()->at();
 
   saveHeader(str);
-  str.device()->at(endOfFactoryData);
+  str.tqdevice()->at(endOfFactoryData);
 }
 
 void 
-KCTimeInfo::addCTime(const TQString &path, Q_UINT32 ctime)
+KCTimeInfo::addCTime(const TQString &path, TQ_UINT32 ctime)
 {
   assert(!path.isEmpty());
-  ctimeDict.replace(path, new Q_UINT32(ctime));
+  ctimeDict.tqreplace(path, new TQ_UINT32(ctime));
 }
 
-Q_UINT32
+TQ_UINT32
 KCTimeInfo::ctime(const TQString &path)
 {
-  Q_UINT32 *ctimeP = ctimeDict[path];
+  TQ_UINT32 *ctimeP = ctimeDict[path];
   return ctimeP ? *ctimeP : 0;
 }
 
 void
-KCTimeInfo::fillCTimeDict(TQDict<Q_UINT32> &dict)
+KCTimeInfo::fillCTimeDict(TQDict<TQ_UINT32> &dict)
 {
     assert(m_str);
-    m_str->device()->at(m_dictOffset);
+    m_str->tqdevice()->at(m_dictOffset);
     TQString path;
-    Q_UINT32 ctime;
+    TQ_UINT32 ctime;
     while(true)
     {
       KSycocaEntry::read(*m_str, path);
       (*m_str) >> ctime;
       if (path.isEmpty()) break;
-      dict.replace(path, new Q_UINT32(ctime));
+      dict.tqreplace(path, new TQ_UINT32(ctime));
     }
 }
diff --git a/kded/kctimefactory.h b/kded/kctimefactory.h
index b878b3033..64cfe6c19 100644
--- a/kded/kctimefactory.h
+++ b/kded/kctimefactory.h
@@ -50,14 +50,14 @@ public:
   KSycocaEntry * createEntry(const TQString &, const char *) { return 0; }
   KSycocaEntry * createEntry(int) { return 0; }
   
-  void addCTime(const TQString &path, Q_UINT32 ctime);
+  void addCTime(const TQString &path, TQ_UINT32 ctime);
 
-  Q_UINT32 ctime(const TQString &path);
+  TQ_UINT32 ctime(const TQString &path);
 
-  void fillCTimeDict(TQDict<Q_UINT32> &dict);
+  void fillCTimeDict(TQDict<TQ_UINT32> &dict);
 
 protected:
-  TQDict<Q_UINT32> ctimeDict;
+  TQDict<TQ_UINT32> ctimeDict;
   int m_dictOffset;
 };
 
diff --git a/kded/kde-menu.cpp b/kded/kde-menu.cpp
index 89ee5a857..873ce154d 100644
--- a/kded/kde-menu.cpp
+++ b/kded/kde-menu.cpp
@@ -96,7 +96,7 @@ static void findMenuEntry(KServiceGroup::Ptr parent, const TQString &name, const
                DCOPRef kicker( "kicker", "kicker" );
                bool result = kicker.call( "highlightMenuItem", menuId );
                if (!result)
-                  error(3, i18n("Menu item '%1' could not be highlighted.").arg(menuId).local8Bit());
+                  error(3, TQString(i18n("Menu item '%1' could not be highlighted.").arg(menuId)).local8Bit());
             }
             exit(0);
          }
diff --git a/kded/kded.cpp b/kded/kded.cpp
index d33bfc6b3..7f8ec9121 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -247,7 +247,7 @@ void Kded::noDemandLoad(const TQString &obj)
 
 KDEDModule *Kded::loadModule(const TQCString &obj, bool onDemand)
 {
-  KDEDModule *module = m_modules.find(obj);
+  KDEDModule *module = m_modules.tqfind(obj);
   if (module)
      return module;
   KService::Ptr s = KService::serviceByDesktopPath("kded/"+obj+".desktop");
@@ -260,7 +260,7 @@ KDEDModule *Kded::loadModule(const KService *s, bool onDemand)
   if (s && !s->library().isEmpty())
   {
     TQCString obj = s->desktopEntryName().latin1();
-    KDEDModule *oldModule = m_modules.find(obj);
+    KDEDModule *oldModule = m_modules.tqfind(obj);
     if (oldModule)
        return oldModule;
 
@@ -374,7 +374,7 @@ void Kded::slotApplicationRemoved(const TQCString &appId)
      it.current()->removeAll(appId);
   }
 
-  TQValueList<long> *windowIds = m_windowIdList.find(appId);
+  TQValueList<long> *windowIds = m_windowIdList.tqfind(appId);
   if (windowIds)
   {
      for( TQValueList<long>::ConstIterator it = windowIds->begin();
@@ -428,7 +428,7 @@ void Kded::updateResourceList()
        it != dirs.end();
        ++it )
   {
-     if (m_allResourceDirs.find(*it) == m_allResourceDirs.end())
+     if (m_allResourceDirs.tqfind(*it) == m_allResourceDirs.end())
      {
         m_allResourceDirs.append(*it);
         readDirectory(*it);
@@ -577,7 +577,7 @@ void Kded::readDirectory( const TQString& _path )
 
   if ( !d.exists() )                            // exists&isdir?
   {
-    kdDebug(7020) << TQString("Does not exist! (%1)").arg(_path) << endl;
+    kdDebug(7020) << TQString(TQString("Does not exist! (%1)").arg(_path)) << endl;
     return;                             // return false
   }
 
@@ -603,18 +603,18 @@ void Kded::readDirectory( const TQString& _path )
 
 bool Kded::isWindowRegistered(long windowId)
 {
-  return m_globalWindowIdList.find(windowId) != 0;
+  return m_globalWindowIdList.tqfind(windowId) != 0;
 
 }
 
 // DCOP
 void Kded::registerWindowId(long windowId)
 {
-  m_globalWindowIdList.replace(windowId, &windowId);
+  m_globalWindowIdList.tqreplace(windowId, &windowId);
   TQCString sender = callingDcopClient()->senderId();
   if( sender.isEmpty()) // local call
       sender = callingDcopClient()->appId();
-  TQValueList<long> *windowIds = m_windowIdList.find(sender);
+  TQValueList<long> *windowIds = m_windowIdList.tqfind(sender);
   if (!windowIds)
   {
     windowIds = new TQValueList<long>;
@@ -636,7 +636,7 @@ void Kded::unregisterWindowId(long windowId)
   TQCString sender = callingDcopClient()->senderId();
   if( sender.isEmpty()) // local call
       sender = callingDcopClient()->appId();
-  TQValueList<long> *windowIds = m_windowIdList.find(sender);
+  TQValueList<long> *windowIds = m_windowIdList.tqfind(sender);
   if (windowIds)
   {
      windowIds->remove(windowId);
diff --git a/kded/kded.h b/kded/kded.h
index 1b6ebe481..b30549083 100644
--- a/kded/kded.h
+++ b/kded/kded.h
@@ -173,7 +173,7 @@ private:
    static Kded *_self;
 };
 
-class KUpdateD : public QObject
+class KUpdateD : public TQObject
 {
    Q_OBJECT
 public:
@@ -200,7 +200,7 @@ private:
    TQTimer* m_pTimer;
 };
 
-class KHostnameD : public QObject
+class KHostnameD : public TQObject
 {
    Q_OBJECT
 public:
diff --git a/kded/kdedmodule.cpp b/kded/kdedmodule.cpp
index ca28a5c62..426ec21da 100644
--- a/kded/kdedmodule.cpp
+++ b/kded/kdedmodule.cpp
@@ -69,14 +69,14 @@ void KDEDModule::insert(const TQCString &app, const TQCString &key, KShared *obj
 
    // appKey acts as a placeholder
    KEntryKey appKey(app, 0);
-   d->objMap->replace(appKey, 0);
+   d->objMap->tqreplace(appKey, 0);
 
    KEntryKey indexKey(app, key);
 
    // Prevent deletion in case the same object is inserted again.
    KSharedPtr<KShared> _obj = obj; 
 
-   d->objMap->replace(indexKey, _obj);
+   d->objMap->tqreplace(indexKey, _obj);
    resetIdle();
 }
 
diff --git a/kded/khostname.cpp b/kded/khostname.cpp
index 0fa837a2c..4965ae684 100644
--- a/kded/khostname.cpp
+++ b/kded/khostname.cpp
@@ -82,7 +82,7 @@ KHostName::KHostName()
 
    display = ::getenv("DISPLAY");
    // strip the screen number from the display
-   display.replace(TQRegExp("\\.[0-9]+$"), "");
+   display.tqreplace(TQRegExp("\\.[0-9]+$"), "");
    if (display.isEmpty())
    {
       fprintf(stderr, "%s", i18n("Error: DISPLAY environment variable not set.\n").local8Bit().data());
@@ -145,14 +145,14 @@ void KHostName::changeX()
       TQCString authName = entries[1];
       TQCString authKey = entries[2];
 
-      int i = netId.findRev(':');
+      int i = netId.tqfindRev(':');
       if (i == -1)
          continue;
       TQCString netDisplay = netId.mid(i);
       if (netDisplay != display)
          continue;
 
-      i = netId.find('/');
+      i = netId.tqfind('/');
       if (i == -1)
          continue;
 
@@ -208,7 +208,7 @@ void KHostName::changeDcop()
 
    if (!newName.isEmpty())
    {
-      int i = line1.findRev(':');
+      int i = line1.tqfindRev(':');
       if (i == -1)
       {
          fprintf(stderr, "Warning: File '%s' has unexpected format.\n", fname.data());
@@ -299,8 +299,8 @@ void KHostName::changeDcop()
 void KHostName::changeStdDirs(const TQCString &type)
 {
    // We make links to the old dirs cause we can't delete the old dirs.
-   TQCString oldDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localkdedir()).arg(type).arg(oldName));
-   TQCString newDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localkdedir()).arg(type).arg(newName));
+   TQCString oldDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localkdedir()).arg(type.data()).arg(oldName.data()));
+   TQCString newDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localkdedir()).arg(type.data()).arg(newName.data()));
 
    KDE_struct_stat st_buf;
 
@@ -340,7 +340,7 @@ void KHostName::changeSessionManager()
       fprintf(stderr, "Warning: No session management specified.\n");
       return;
    }
-   int i = sm.findRev(':');
+   int i = sm.tqfindRev(':');
    if ((i == -1) || (sm.left(6) != "local/"))
    {
       fprintf(stderr, "Warning: Session Management socket '%s' has unexpected format.\n", sm.data());
diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp
index b48662cb2..c2321cf39 100644
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
@@ -39,7 +39,7 @@ static void foldNode(TQDomElement &docElem, TQDomElement &e, TQMap<TQString,TQDo
 {
    if (s.isEmpty())
       s = e.text();
-   TQMap<TQString,TQDomElement>::iterator it = dupeList.find(s);
+   TQMap<TQString,TQDomElement>::iterator it = dupeList.tqfind(s);
    if (it != dupeList.end())
    {
       kdDebug(7021) << e.tagName() << " and " << s << " requires combining!" << endl;
@@ -69,7 +69,7 @@ static void replaceNode(TQDomElement &docElem, TQDomNode &n, const TQStringList
 
 void VFolderMenu::registerFile(const TQString &file)
 {
-   int i = file.findRev('/');
+   int i = file.tqfindRev('/');
    if (i < 0)
       return;
 
@@ -108,8 +108,8 @@ TQStringList VFolderMenu::allDirectories()
 static void
 track(const TQString &menuId, const TQString &menuName, TQDict<KService> *includeList, TQDict<KService> *excludeList, TQDict<KService> *itemList, const TQString &comment)
 {
-   if (itemList->find(menuId))
-      printf("%s: %s INCL %d EXCL %d\n", menuName.latin1(), comment.latin1(), includeList->find(menuId) ? 1 : 0, excludeList->find(menuId) ? 1 : 0);
+   if (itemList->tqfind(menuId))
+      printf("%s: %s INCL %d EXCL %d\n", menuName.latin1(), comment.latin1(), includeList->tqfind(menuId) ? 1 : 0, excludeList->tqfind(menuId) ? 1 : 0);
 }
 
 void
@@ -117,7 +117,7 @@ VFolderMenu::includeItems(TQDict<KService> *items1, TQDict<KService> *items2)
 {
    for(TQDictIterator<KService> it(*items2); it.current(); ++it)
    {
-       items1->replace(it.current()->menuId(), it.current());
+       items1->tqreplace(it.current()->menuId(), it.current());
    }
 }
 
@@ -128,7 +128,7 @@ VFolderMenu::matchItems(TQDict<KService> *items1, TQDict<KService> *items2)
    {
        TQString id = it.current()->menuId();
        ++it;
-       if (!items2->find(id))
+       if (!items2->tqfind(id))
           items1->remove(id);
    }
 }
@@ -145,7 +145,7 @@ VFolderMenu::excludeItems(TQDict<KService> *items1, TQDict<KService> *items2)
 VFolderMenu::SubMenu*
 VFolderMenu::takeSubMenu(SubMenu *parentMenu, const TQString &menuName)
 {
-   int i = menuName.find('/');
+   int i = menuName.tqfind('/');
    TQString s1 = i > 0 ? menuName.left(i) : menuName;
    TQString s2 = menuName.mid(i+1);
 
@@ -231,7 +231,7 @@ VFolderMenu::mergeMenu(SubMenu *menu1, SubMenu *menu2, bool reversePriority)
 void
 VFolderMenu::insertSubMenu(SubMenu *parentMenu, const TQString &menuName, SubMenu *newMenu, bool reversePriority)
 {
-   int i = menuName.find('/');
+   int i = menuName.tqfind('/');
 
    TQString s1 = menuName.left(i);
    TQString s2 = menuName.mid(i+1);
@@ -271,12 +271,12 @@ VFolderMenu::insertSubMenu(SubMenu *parentMenu, const TQString &menuName, SubMen
 void
 VFolderMenu::insertService(SubMenu *parentMenu, const TQString &name, KService *newService)
 {
-   int i = name.find('/');
+   int i = name.tqfind('/');
 
    if (i == -1)
    {
      // Add it here
-     parentMenu->items.replace(newService->menuId(), newService);
+     parentMenu->items.tqreplace(newService->menuId(), newService);
      return;
    }
 
@@ -324,7 +324,7 @@ VFolderMenu::~VFolderMenu()
    for(appsInfo *info = m_appsInfoStack.first(); \
        info; info = m_appsInfoStack.next()) \
    { \
-      KService::List *list = info->dictCategories.find(category); \
+      KService::List *list = info->dictCategories.tqfind(category); \
       if (list) for(KService::List::ConstIterator it = list->begin(); \
              it != list->end(); ++it) \
       {
@@ -336,7 +336,7 @@ VFolderMenu::findApplication(const TQString &relPath)
    for(appsInfo *info = m_appsInfoStack.first();
        info; info = m_appsInfoStack.next())
    {
-      KService *s = info->applications.find(relPath);
+      KService *s = info->applications.tqfind(relPath);
       if (s)
          return s;
    }
@@ -347,7 +347,7 @@ void
 VFolderMenu::addApplication(const TQString &id, KService *service)
 {
    service->setMenuId(id);
-   m_appsInfo->applications.replace(id, service);
+   m_appsInfo->applications.tqreplace(id, service);
 }
 
 void
@@ -364,7 +364,7 @@ VFolderMenu::buildApplicationIndex(bool unusedOnly)
          KService *s = it.current();
          TQDictIterator<KService> tmpIt = it;
          ++it;
-         if (unusedOnly && m_usedAppsDict.find(s->menuId()))
+         if (unusedOnly && m_usedAppsDict.tqfind(s->menuId()))
          {
             // Remove and skip this one
             info->applications.remove(tmpIt.currentKey());
@@ -376,7 +376,7 @@ VFolderMenu::buildApplicationIndex(bool unusedOnly)
              it2 != cats.end(); ++it2)
          {
             const TQString &cat = *it2;
-            KService::List *list = info->dictCategories.find(cat);
+            KService::List *list = info->dictCategories.tqfind(cat);
             if (!list)
             {
                list = new KService::List();
@@ -428,7 +428,7 @@ VFolderMenu::unloadAppsInfo()
    m_appsInfo = 0;
 }
 
-QString
+TQString
 VFolderMenu::absoluteDir(const TQString &_dir, const TQString &baseDir, bool keepRelativeToCfg)
 {
    TQString dir = _dir;
@@ -471,7 +471,7 @@ static void tagBasePath(TQDomDocument &doc, const TQString &tag, const TQString
    }
 }
 
-QDomDocument
+TQDomDocument
 VFolderMenu::loadDoc()
 {
    TQDomDocument doc;
@@ -603,7 +603,7 @@ VFolderMenu::mergeMenus(TQDomElement &docElem, TQString &name)
       else if( e.tagName() == "Menu") {
          TQString name;
          mergeMenus(e, name);
-         TQMap<TQString,TQDomElement>::iterator it = menuNodes.find(name);
+         TQMap<TQString,TQDomElement>::iterator it = menuNodes.tqfind(name);
          if (it != menuNodes.end())
          {
            TQDomElement docElem2 = *it;
@@ -719,7 +719,7 @@ VFolderMenu::pushDocInfo(const TQString &fileName, const TQString &baseDir)
       return;
    }
    int i;
-   i = baseName.findRev('/');
+   i = baseName.tqfindRev('/');
    if (i > 0)
    {
       m_docInfo.baseDir = baseName.left(i+1);
@@ -739,7 +739,7 @@ VFolderMenu::pushDocInfoParent(const TQString &basePath, const TQString &baseDir
 
    m_docInfo.baseDir = baseDir;
 
-   TQString fileName = basePath.mid(basePath.findRev('/')+1);
+   TQString fileName = basePath.mid(basePath.tqfindRev('/')+1);
    m_docInfo.baseName = fileName.left( fileName.length() - 5 );
    TQString baseName = TQDir::cleanDirPath(m_docInfo.baseDir + fileName);
 
@@ -762,7 +762,7 @@ VFolderMenu::popDocInfo()
    m_docInfo = m_docInfoStack.pop();
 }
 
-QString
+TQString
 VFolderMenu::locateMenuFile(const TQString &fileName)
 {
    if (!TQDir::isRelativePath(fileName))
@@ -800,7 +800,7 @@ VFolderMenu::locateMenuFile(const TQString &fileName)
    return result;
 }
 
-QString
+TQString
 VFolderMenu::locateDirectoryFile(const TQString &fileName)
 {
    if (fileName.isEmpty())
@@ -937,7 +937,7 @@ VFolderMenu::processCondition(TQDomElement &domElem, TQDict<KService> *items)
       FOR_ALL_APPLICATIONS(it)
       {
          KService *s = it.current();
-         items->replace(s->menuId(), s);
+         items->tqreplace(s->menuId(), s);
       }
       FOR_ALL_APPLICATIONS_END
 
@@ -958,7 +958,7 @@ VFolderMenu::processCondition(TQDomElement &domElem, TQDict<KService> *items)
       FOR_CATEGORY(domElem.text(), it)
       {
          KService *s = *it;
-         items->replace(s->menuId(), s);
+         items->tqreplace(s->menuId(), s);
       }
       FOR_CATEGORY_END
    }
@@ -967,7 +967,7 @@ VFolderMenu::processCondition(TQDomElement &domElem, TQDict<KService> *items)
       FOR_ALL_APPLICATIONS(it)
       {
          KService *s = it.current();
-         items->replace(s->menuId(), s);
+         items->tqreplace(s->menuId(), s);
       }
       FOR_ALL_APPLICATIONS_END
    }
@@ -977,7 +977,7 @@ VFolderMenu::processCondition(TQDomElement &domElem, TQDict<KService> *items)
 kdDebug(7021) << "Adding file " << filename << endl;
       KService *s = findApplication(filename);
       if (s)
-         items->replace(filename, s);
+         items->tqreplace(filename, s);
    }
 }
 
@@ -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 || fn.at(fn.length() - 1).latin1() == '~')
+      if (fn == _dot || fn == _dotdot || TQChar(fn.at(fn.length() - 1)).latin1() == '~')
          continue;
 
       TQString pathfn = dir + fn;
@@ -1071,7 +1071,7 @@ kdDebug(7021) << "processKDELegacyDirs()" << endl;
          {
             TQString id = name;
             // Strip path from id
-            int i = id.findRev('/');
+            int i = id.tqfindRev('/');
             if (i >= 0)
                id = id.mid(i+1);
 
@@ -1079,7 +1079,7 @@ kdDebug(7021) << "processKDELegacyDirs()" << endl;
 
             // TODO: add Legacy category
             addApplication(id, service);
-            items.replace(service->menuId(), service);
+            items.tqreplace(service->menuId(), service);
             if (service->categories().isEmpty())
                insertService(m_currentMenu, name, service);
 
@@ -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 || fn.at(fn.length() - 1).latin1() == '~')
+      if (fn == _dot || fn == _dotdot || TQChar(fn.at(fn.length() - 1)).latin1() == '~')
          continue;
 
       TQString pathfn = dir + fn;
@@ -1144,10 +1144,10 @@ kdDebug(7021) << "processLegacyDir(" << dir << ", " << relDir << ", " << prefix
 
             // TODO: Add legacy category
             addApplication(id, service);
-            items.replace(service->menuId(), service);
+            items.tqreplace(service->menuId(), service);
 
             if (service->categories().isEmpty())
-               m_currentMenu->items.replace(id, service);
+               m_currentMenu->items.tqreplace(id, service);
          }
       }
     }
@@ -1305,7 +1305,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for <KDE>" << endl;
 
                processKDELegacyDirs();
 
-               m_legacyNodes.replace("<KDE>", m_currentMenu);
+               m_legacyNodes.tqreplace("<KDE>", m_currentMenu);
                m_currentMenu = oldMenu;
 
                kdeLegacyDirsDone = true;
@@ -1318,7 +1318,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for <KDE>" << endl;
 
             TQString prefix = e.attributes().namedItem("prefix").toAttr().value();
 
-            if (m_defaultLegacyDirs.contains(dir))
+            if (m_defaultLegacyDirs.tqcontains(dir))
             {
                if (!kdeLegacyDirsDone)
                {
@@ -1328,7 +1328,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for " << dir << endl;
 
                   processKDELegacyDirs();
 
-                  m_legacyNodes.replace("<KDE>", m_currentMenu);
+                  m_legacyNodes.tqreplace("<KDE>", m_currentMenu);
                   m_currentMenu = oldMenu;
 
                   kdeLegacyDirsDone = true;
@@ -1343,7 +1343,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for " << dir << endl;
 
                processLegacyDir(dir, TQString::null, prefix);
 
-               m_legacyNodes.replace(dir, m_currentMenu);
+               m_legacyNodes.tqreplace(dir, m_currentMenu);
                m_currentMenu = oldMenu;
             }
          }
@@ -1421,7 +1421,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for " << dir << endl;
          {
             // Add legacy nodes to Menu structure
             TQString dir = absoluteDir(e.text(), e.attribute("__BaseDir"));
-            SubMenu *legacyMenu = m_legacyNodes.find(dir);
+            SubMenu *legacyMenu = m_legacyNodes.tqfind(dir);
             if (legacyMenu)
             {
                mergeMenu(m_currentMenu, legacyMenu);
@@ -1432,7 +1432,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for " << dir << endl;
          {
             // Add legacy nodes to Menu structure
             TQString dir = "<KDE>";
-            SubMenu *legacyMenu = m_legacyNodes.find(dir);
+            SubMenu *legacyMenu = m_legacyNodes.tqfind(dir);
             if (legacyMenu)
             {
                mergeMenu(m_currentMenu, legacyMenu);
@@ -1618,7 +1618,7 @@ VFolderMenu::markUsedApplications(TQDict<KService> *items)
 {
    for(TQDictIterator<KService> it(*items); it.current(); ++it)
    {
-      m_usedAppsDict.replace(it.current()->menuId(), it.current());
+      m_usedAppsDict.tqreplace(it.current()->menuId(), it.current());
    }
 }
 
diff --git a/kded/vfolder_menu.h b/kded/vfolder_menu.h
index ce7183056..a2536af7d 100644
--- a/kded/vfolder_menu.h
+++ b/kded/vfolder_menu.h
@@ -29,7 +29,7 @@
 
 #include <kservice.h>
 
-class VFolderMenu : public QObject
+class VFolderMenu : public TQObject
 {
   Q_OBJECT
 public: