TQt4 convert kdesdk

This enables compilation under both Qt3 and Qt4


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

3 files changed, 25 insertions, 25 deletions

diff --git a/kmtrace/kmtrace.cpp b/kmtrace/kmtrace.cpp
index 5acf9e69..f4c11e1f 100644
--- a/kmtrace/kmtrace.cpp
+++ b/kmtrace/kmtrace.cpp
@@ -120,9 +120,9 @@ void parseLine(const TQCString &_line, char operation)
         maxBytes = totalBytes;
      if (count > maxCount)
         maxCount = count;
-     if (entryDict->find(entry->base))
+     if (entryDict->tqfind(entry->base))
         fprintf(stderr, "\rAllocated twice: 0x%08x                    \n", entry->base);
-     entryDict->replace(entry->base, entry);
+     entryDict->tqreplace(entry->base, entry);
    } break;
    case '-':
    {
@@ -155,7 +155,7 @@ void sortBlocks()
       entryList->append(entry);
       for(int i = 0; entry->backtrace[i]; i++)
       {
-         if (!symbolDict->find(entry->backtrace[i]))
+         if (!symbolDict->tqfind(entry->backtrace[i]))
              symbolDict->insert(entry->backtrace[i], unknown);
       }
    }
@@ -170,7 +170,7 @@ void collectDupes()
    {
       Entry *entry = it.current();
       ++it;
-      Entry *entry2 = dupeDict.find(entry->signature);
+      Entry *entry2 = dupeDict.tqfind(entry->signature);
       if (entry2)
       {
          entry2->count++;
@@ -223,7 +223,7 @@ int lookupSymbols(FILE *stream)
         if (addr)
         {
            long i_addr = fromHex(addr);
-           const char* str = symbolDict->find(i_addr);
+           const char* str = symbolDict->tqfind(i_addr);
            if (str == unknown)
            {
                *addr = 0;
@@ -232,7 +232,7 @@ int lookupSymbols(FILE *stream)
                    str = qstrdup(rindex(line2, '/')+1);
                else
                    str = qstrdup(line2);
-               symbolDict->replace(i_addr, str);
+               symbolDict->tqreplace(i_addr, str);
                symbols++;
            }
         }
@@ -285,7 +285,7 @@ void lookupUnknownSymbols(const char *appname)
       TQCString symbol;
       symbol.sprintf("%s(%s)", buffer2, buffer1);
       if(*buffer1 != '?')
-          symbolDict->replace(it2.currentKey(),qstrdup(symbol.data()));
+          symbolDict->tqreplace(it2.currentKey(),qstrdup(symbol.data()));
    }
    fclose(fInputFile);
 }
@@ -308,9 +308,9 @@ int match(const char *s1, const char *s2)
 
 const char *lookupAddress(int addr)
 {
-   char *str = formatDict->find(addr);
+   char *str = formatDict->tqfind(addr);
    if (str) return str;
-   TQCString s = symbolDict->find(addr);
+   TQCString s = symbolDict->tqfind(addr);
    if (s.isEmpty())
    {
 fprintf(stderr, "Error!\n");
@@ -318,15 +318,15 @@ fprintf(stderr, "Error!\n");
    }
    else
    {
-     int start = s.find('(');
-     int end = s.findRev('+');
+     int start = s.tqfind('(');
+     int end = s.tqfindRev('+');
      if (end < 0)
-        end = s.findRev(')');
+        end = s.tqfindRev(')');
      if ((start > 0) && (end > start))
      {
        TQCString symbol = s.mid(start+1, end-start-1);
        char *res = 0;
-       if (symbol.find(')') == -1)
+       if (symbol.tqfind(')') == -1)
            res = cplus_demangle(symbol.data(), DMGL_PARAMS | DMGL_AUTO | DMGL_ANSI );
 
        if (res)
@@ -344,7 +344,7 @@ fprintf(stderr, "Error!\n");
              return excluded;
           }
        }
-       s.replace(start+1, end-start-1, symbol);
+       s.tqreplace(start+1, end-start-1, symbol);
      }
    }
    str = qstrdup(s.data());
@@ -406,7 +406,7 @@ inline TreeEntry::TreeEntry (int adr, int size, int count, TreeList * sub)
 }
 
 inline bool TreeEntry::operator == (const TreeEntry & r) const
-{				// this one is for QValueList
+{				// this one is for TQValueList
    return address == r.address;
 }
 
@@ -439,12 +439,12 @@ void buildTree ()
 	 ;			// find last (topmost) backtrace entry
       for (--i; i >= 0; --i)
       {
-	 TreeList::Iterator pos = list->find (entry->backtrace[i]);
+	 TreeList::Iterator pos = list->tqfind (entry->backtrace[i]);
 	 if (pos == list->end ())
 	 {
 	    list->prepend (TreeEntry (entry->backtrace[i], entry->total_size,
 				      entry->count));
-	    pos = list->find (entry->backtrace[i]);
+	    pos = list->tqfind (entry->backtrace[i]);
 	 }
 	 else
 	    *pos = TreeEntry (entry->backtrace[i],
@@ -642,7 +642,7 @@ int main(int argc, char *argv[])
          exe = app.stripWhiteSpace();
          fprintf(stderr, "ktrace.out: malloc trace of %s\n", exe.data());
        }
-       else if(!app.contains(exe.data()))
+       else if(!app.tqcontains(exe.data()))
        {
          fprintf(stderr, "trace file was for application '%s', not '%s'\n", app.data(), exe.data());
          exit(1);
diff --git a/kmtrace/ktrace.c b/kmtrace/ktrace.c
index 21fca376..cf3c55c0 100644
--- a/kmtrace/ktrace.c
+++ b/kmtrace/ktrace.c
@@ -495,14 +495,14 @@ addAllocationToTree(void)
 	int i, j;
 	void *bt[TR_BT_SIZE + 1];
 	CallerNode* cn = CallTree;
-	CallerNode** parent = &CallTree;
+	CallerNode** tqparent = &CallTree;
 	
 	bt_size = backtrace(bt, TR_BT_SIZE);
 	for (i = bt_size - 1; i >= 4; i--)
 	{
 		if (cn == NULL)
 		{
-			*parent = cn = (CallerNode*) malloc(sizeof(CallerNode));
+			*tqparent = cn = (CallerNode*) malloc(sizeof(CallerNode));
 			cn->funcAdr = bt[i];
 			cn->mallocs = 0;
 			cn->noCallees = 0;
@@ -517,7 +517,7 @@ addAllocationToTree(void)
 			for (j = 0; j < cn->noCallees; j++)
 				if (bt[i - 1] == cn->callees[j]->funcAdr)
 				{
-					parent = &cn->callees[j];
+					tqparent = &cn->callees[j];
 					cn = cn->callees[j];
 					knownCallee = 1;
 					break;
@@ -541,7 +541,7 @@ addAllocationToTree(void)
 						   (newSize - cn->maxCallees) * sizeof(CallerNode*));
 					cn->maxCallees = newSize;
 				}
-				parent = &cn->callees[cn->noCallees++];
+				tqparent = &cn->callees[cn->noCallees++];
 				cn = 0;
 			}
 		}
diff --git a/kmtrace/match.cpp b/kmtrace/match.cpp
index afa83bc1..d4c5545a 100644
--- a/kmtrace/match.cpp
+++ b/kmtrace/match.cpp
@@ -39,7 +39,7 @@ int main(int argc, char **argv)
    while(!feof(map_file))
    {
       fgets(buf, 1024, map_file);
-      TQString line = TQString::fromLatin1(buf).stripWhiteSpace();
+      TQString line = TQString::tqfromLatin1(buf).stripWhiteSpace();
       TQStringList split = TQStringList::split(' ', line);
       if (split.count() <= 1)
          return 1;
@@ -61,8 +61,8 @@ int main(int argc, char **argv)
    while(!feof(call_file))
    {
       fgets(buf, 1024, call_file);
-      TQString line = TQString::fromLatin1(buf).stripWhiteSpace();
-      if (dict.find(line))
+      TQString line = TQString::tqfromLatin1(buf).stripWhiteSpace();
+      if (dict.tqfind(line))
       {
          qWarning("%s", line.latin1());
       }