From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 7 Jan 2011 03:45:53 +0000
Subject: 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
---
 kded/kbuildservicetypefactory.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'kded/kbuildservicetypefactory.cpp')

diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp
index ddeff23fe..b5259c5cd 100644
--- a/kded/kbuildservicetypefactory.cpp
+++ b/kded/kbuildservicetypefactory.cpp
@@ -54,7 +54,7 @@ KBuildServiceTypeFactory::~KBuildServiceTypeFactory()
    delete m_resourceList;
 }
 
-KServiceType * KBuildServiceTypeFactory::tqfindServiceTypeByName(const TQString &_name)
+KServiceType * KBuildServiceTypeFactory::findServiceTypeByName(const TQString &_name)
 {
    assert (KSycoca::self()->isBuilding());
    // We're building a database - the service type must be in memory
@@ -69,7 +69,7 @@ KSycocaEntry *
 KBuildServiceTypeFactory::createEntry(const TQString &file, const char *resource)
 {
   TQString name = file;
-  int pos = name.tqfindRev('/');
+  int pos = name.findRev('/');
   if (pos != -1)
   {
      name = name.mid(pos+1);
@@ -133,14 +133,14 @@ void
 KBuildServiceTypeFactory::saveHeader(TQDataStream &str)
 {
    KSycocaFactory::saveHeader(str);
-   str << (TQ_INT32) m_fastPatternOffset;
-   str << (TQ_INT32) m_otherPatternOffset;
-   str << (TQ_INT32) m_propertyTypeDict.count();
+   str << (Q_INT32) m_fastPatternOffset;
+   str << (Q_INT32) m_otherPatternOffset;
+   str << (Q_INT32) m_propertyTypeDict.count();
 
    TQMapIterator<TQString, int> it;
    for (it = m_propertyTypeDict.begin(); it != m_propertyTypeDict.end(); ++it)
    {
-     str << it.key() << (TQ_INT32)it.data();
+     str << it.key() << (Q_INT32)it.data();
    }
 
 }
@@ -183,8 +183,8 @@ KBuildServiceTypeFactory::savePatternLists(TQDataStream &str)
         for ( ; patit != pat.end() ; ++patit )
         {
            const TQString &pattern = *patit;
-           if ( pattern.tqfindRev('*') == 0
-                && pattern.tqfindRev('.') == 1
+           if ( pattern.findRev('*') == 0
+                && pattern.findRev('.') == 1
                 && pattern.length() <= 6 )
               // it starts with "*.", has no other '*' and no other '.', and is max 6 chars
               // => fast patttern
@@ -193,15 +193,15 @@ 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.tqreplace( pattern, mimeType );
+           dict.replace( pattern, mimeType );
         }
       }
    }
    // Sort the list - the fast one, useless for the other one
    fastPatterns.sort();
 
-   TQ_INT32 entrySize = 0;
-   TQ_INT32 nrOfEntries = 0;
+   Q_INT32 entrySize = 0;
+   Q_INT32 nrOfEntries = 0;
 
    m_fastPatternOffset = str.device()->at();
 
@@ -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.tqcontains(pit.key()))
+     if (!m_propertyTypeDict.contains(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;
-- 
cgit v1.2.1