Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


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

1 files changed, 35 insertions, 35 deletions

diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp
index f8fb35cf4..9df927ca8 100644
--- a/kded/kbuildsycoca.cpp
+++ b/kded/kbuildsycoca.cpp
@@ -68,13 +68,13 @@
 typedef TQDict<KSycocaEntry> KBSEntryDict;
 typedef TQValueList<KSycocaEntry::List> KSycocaEntryListList;
 
-static TQ_UINT32 newTimestamp = 0;
+static Q_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<TQ_UINT32> *g_ctimeDict = 0;
+static TQDict<Q_UINT32> *g_ctimeDict = 0;
 static const char *g_resource = 0;
 static KBSEntryDict *g_entryDict = 0;
 static KBSEntryDict *g_serviceGroupEntryDict = 0;
@@ -160,15 +160,15 @@ 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.tqreplace(TQRegExp("\\*"), "all");
-          KService *s = g_bsf->tqfindServiceByName(app);
+          mimetypes.replace(TQRegExp("\\*"), "all");
+          KService *s = g_bsf->findServiceByName(app);
           if (!s)
              continue;
 
@@ -186,7 +186,7 @@ void KBuildSycoca::processGnomeVfs()
 
 KSycocaEntry *KBuildSycoca::createEntry(const TQString &file, bool addToFactory)
 {
-   TQ_UINT32 timeStamp = g_ctimeInfo->ctime(file);
+   Q_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);
-      TQ_UINT32 *timeP = (*g_ctimeDict)[file];
-      TQ_UINT32 oldTimestamp = timeP ? *timeP : 0;
+      Q_UINT32 *timeP = (*g_ctimeDict)[file];
+      Q_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->tqfind(file.left(file.length()-10));
+            entry = g_entryDict->find(file.left(file.length()-10));
          }
          else if (g_factory == g_bsf)
          {
-            entry = g_entryDict->tqfind(file);
+            entry = g_entryDict->find(file);
          }
          else
          {
-            entry = g_entryDict->tqfind(file);
+            entry = g_entryDict->find(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.tqcontains(res.resource))
+      if (!allResources.contains(res.resource))
          allResources.append(res.resource);
     }
   }
@@ -324,7 +324,7 @@ bool KBuildSycoca::build()
                                                relFiles);
 
 
-     // Now tqfind all factories that use this resource....
+     // Now find all factories that use this resource....
      // For each factory
      g_entryDict = entryDictList->first();
      for (g_factory = m_lstFactories->first();
@@ -382,7 +382,7 @@ bool KBuildSycoca::build()
      VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
 
      KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
-     entry->setLayoutInfo(kdeMenu->tqlayoutList);
+     entry->setLayoutInfo(kdeMenu->layoutList);
      createMenu(TQString::null, TQString::null, kdeMenu);
 
      KServiceGroup::Ptr g(entry);
@@ -414,7 +414,7 @@ void KBuildSycoca::createMenu(TQString caption, TQString name, VFolderMenu::SubM
      TQString directoryFile = subMenu->directoryFile;
      if (directoryFile.isEmpty())
         directoryFile = subName+".directory";
-     TQ_UINT32 timeStamp = g_ctimeInfo->ctime(directoryFile);
+     Q_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)
      {
-        TQ_UINT32 *timeP = (*g_ctimeDict)[directoryFile];
-        TQ_UINT32 oldTimestamp = timeP ? *timeP : 0;
+        Q_UINT32 *timeP = (*g_ctimeDict)[directoryFile];
+        Q_UINT32 oldTimestamp = timeP ? *timeP : 0;
 
         if (timeStamp && (timeStamp == oldTimestamp))
         {
-            entry = dynamic_cast<KServiceGroup *> (g_serviceGroupEntryDict->tqfind(subName));
+            entry = dynamic_cast<KServiceGroup *> (g_serviceGroupEntryDict->find(subName));
             if (entry && (entry->directoryEntryPath() != directoryFile))
                 entry = 0; // Can't reuse this one!
         }
@@ -436,7 +436,7 @@ void KBuildSycoca::createMenu(TQString caption, TQString name, VFolderMenu::SubM
      g_ctimeInfo->addCTime(directoryFile, timeStamp);
 
      entry = g_bsgf->addNew(subName, subMenu->directoryFile, entry, subMenu->isDeleted);
-     entry->setLayoutInfo(subMenu->tqlayoutList);
+     entry->setLayoutInfo(subMenu->layoutList);
      if (! (bMenuTest && entry->noDisplay()) )
         createMenu(caption + entry->caption() + "/", subName, subMenu);
   }
@@ -543,15 +543,15 @@ void KBuildSycoca::save()
    // Write header (#pass 1)
    m_str->device()->at(0);
 
-   (*m_str) << (TQ_INT32) KSycoca::version();
+   (*m_str) << (Q_INT32) KSycoca::version();
    KSycocaFactory * servicetypeFactory = 0L;
    KSycocaFactory * serviceFactory = 0L;
    for(KSycocaFactory *factory = m_lstFactories->first();
        factory;
        factory = m_lstFactories->next())
    {
-      TQ_INT32 aId;
-      TQ_INT32 aOffset;
+      Q_INT32 aId;
+      Q_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) << (TQ_INT32) 0; // No more factories.
+   (*m_str) << (Q_INT32) 0; // No more factories.
    // Write KDEDIRS
    (*m_str) << KGlobal::dirs()->kfsstnd_prefixes();
    (*m_str) << newTimestamp;
@@ -584,19 +584,19 @@ void KBuildSycoca::save()
    // Write header (#pass 2)
    m_str->device()->at(0);
 
-   (*m_str) << (TQ_INT32) KSycoca::version();
+   (*m_str) << (Q_INT32) KSycoca::version();
    for(KSycocaFactory *factory = m_lstFactories->first();
        factory;
        factory = m_lstFactories->next())
    {
-      TQ_INT32 aId;
-      TQ_INT32 aOffset;
+      Q_INT32 aId;
+      Q_INT32 aOffset;
       aId = factory->factoryId();
       aOffset = factory->offset();
       (*m_str) << aId;
       (*m_str) << aOffset;
    }
-   (*m_str) << (TQ_INT32) 0; // No more factories.
+   (*m_str) << (Q_INT32) 0; // No more factories.
 
    // Jump to end of database
    m_str->device()->at(endOfData);
@@ -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( TQ_UINT32 timestamp, const TQStringList &dirs )
+bool KBuildSycoca::checkTimestamps( Q_UINT32 timestamp, const TQStringList &dirs )
 {
    kdDebug( 7021 ) << "checking file timestamps" << endl;
    TQDateTime stamp;
@@ -709,7 +709,7 @@ static KCmdLineOptions options[] = {
 static const char appName[] = "kbuildsycoca";
 static const char appVersion[] = "1.1";
 
-class WaitForSignal : public TQObject
+class WaitForSignal : public QObject
 {
 public:
    ~WaitForSignal() { kapp->eventLoop()->exitLoop(); }
@@ -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();
-     TQ_UINT32 current_update_sig = KGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true);
-     TQ_UINT32 ksycoca_update_sig = KSycoca::self()->updateSignature();
+     Q_UINT32 current_update_sig = KGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true);
+     Q_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;
-   TQ_UINT32 filestamp = 0;
+   Q_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 = (TQ_UINT32) time(0);
+   newTimestamp = (Q_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<TQ_UINT32>(523);
+         g_ctimeDict = new TQDict<Q_UINT32>(523);
 
          // Must be in same order as in KBuildSycoca::recreate()!
          factories->append( new KServiceTypeFactory );