Trinity Qt initial conversion

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

1 files changed, 25 insertions, 25 deletions

diff --git a/quanta/parsers/saparser.cpp b/quanta/parsers/saparser.cpp
index 230ddbe0..f402e0c8 100644
--- a/quanta/parsers/saparser.cpp
+++ b/quanta/parsers/saparser.cpp
@@ -15,7 +15,7 @@
   ***************************************************************************/
 
 //qt includes
-#include <qtimer.h>
+#include <tqtimer.h>
 
 //kde includes
 #include <kdebug.h>
@@ -39,14 +39,14 @@ SAParser::SAParser()
   m_write = 0L;
   m_baseNode = 0L;
   m_currentNode = 0L;
-  m_quotesRx = QRegExp("\"|'");
+  m_quotesRx = TQRegExp("\"|'");
   m_specialInsideXml = false;
   m_parsingEnabled = true;
   m_synchronous = true;
-  m_parseOneLineTimer = new QTimer(this);
-  connect(m_parseOneLineTimer, SIGNAL(timeout()), this, SLOT(slotParseOneLine()));
-  m_parseInDetailTimer = new QTimer(this);
-  connect(m_parseInDetailTimer, SIGNAL(timeout()), this, SLOT(slotParseNodeInDetail()));
+  m_parseOneLineTimer = new TQTimer(this);
+  connect(m_parseOneLineTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseOneLine()));
+  m_parseInDetailTimer = new TQTimer(this);
+  connect(m_parseInDetailTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseNodeInDetail()));
 }
 
 SAParser::~SAParser()
@@ -143,7 +143,7 @@ bool SAParser::slotParseOneLine()
             if  ( (groupKeywordPos < specialAreaPos || specialAreaPos == -1) &&
                   (groupKeywordPos < areaEndPos || areaEndPos == -1) )
             {
-              QString foundText = s_dtd->structRx.cap();
+              TQString foundText = s_dtd->structRx.cap();
               if (foundText == s_dtd->structBeginStr)
               {
                 s_context.type = Group;
@@ -201,7 +201,7 @@ bool SAParser::slotParseOneLine()
                 }
                 s_currentContext.area.eLine = s_line;
                 s_currentContext.area.eCol = groupKeywordPos - 1;
-                //kdDebug(24000) << QString("Group Struct s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl;
+                //kdDebug(24000) << TQString("Group Struct s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl;
 
                 if (s_currentNode &&
                     (s_currentNode->tag->type == Tag::Text ||
@@ -265,7 +265,7 @@ bool SAParser::slotParseOneLine()
           {
             if (specialAreaPos < areaEndPos || areaEndPos == -1)
             {
-              QString foundText = s_dtd->specialAreaStartRx.cap();
+              TQString foundText = s_dtd->specialAreaStartRx.cap();
               s_currentContext.area.eLine = s_line;
               s_currentContext.area.eCol = specialAreaPos - 1;
               if (s_fullParse)
@@ -351,7 +351,7 @@ bool SAParser::slotParseOneLine()
               s_currentNode->specialInsideXml = m_specialInsideXml;
             }
           }
-          //kdDebug(24000) << QString("Special area %1 ends at %2, %3").arg(s_dtd->name).arg(s_line).arg(lastCol) << endl;
+          //kdDebug(24000) << TQString("Special area %1 ends at %2, %3").arg(s_dtd->name).arg(s_line).arg(lastCol) << endl;
 
           //create a closing node for the special area
           Tag *tag = new Tag();
@@ -396,9 +396,9 @@ bool SAParser::slotParseOneLine()
                 }
               }
               SAGroupParser *groupParser = new SAGroupParser(this, write(), g_node, g_endNode, m_synchronous, parsingLastNode, true);
-              connect(groupParser, SIGNAL(rebuildStructureTree(bool)), SIGNAL(rebuildStructureTree(bool)));
-              connect(groupParser, SIGNAL(cleanGroups()), SIGNAL(cleanGroups()));
-              connect(groupParser, SIGNAL(parsingDone(SAGroupParser*)), SLOT(slotGroupParsingDone(SAGroupParser*)));
+              connect(groupParser, TQT_SIGNAL(rebuildStructureTree(bool)), TQT_SIGNAL(rebuildStructureTree(bool)));
+              connect(groupParser, TQT_SIGNAL(cleanGroups()), TQT_SIGNAL(cleanGroups()));
+              connect(groupParser, TQT_SIGNAL(parsingDone(SAGroupParser*)), TQT_SLOT(slotGroupParsingDone(SAGroupParser*)));
               groupParser->slotParseForScriptGroup();
               m_groupParsers.append(groupParser);
             }
@@ -439,7 +439,7 @@ bool SAParser::slotParseOneLine()
             {
               //create a tag from the s_currentContext
               Tag *tag = new Tag(s_currentContext.area, m_write, s_dtd);
-              QString tagStr = tag->tagStr();
+              TQString tagStr = tag->tagStr();
               tag->cleanStr = tagStr;
               QuantaCommon::removeCommentsAndQuotes(tag->cleanStr, s_dtd);
               if (tagStr.simplifyWhiteSpace().isEmpty())
@@ -468,7 +468,7 @@ bool SAParser::slotParseOneLine()
               s_currentNode = node;
             }
           }
-          //kdDebug(24000) << QString("%1 s_context: %2, %3, %4, %5").arg(s_currentContext.type).arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl;
+          //kdDebug(24000) << TQString("%1 s_context: %2, %3, %4, %5").arg(s_currentContext.type).arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl;
 
           s_currentContext = s_context;
           s_col = s_context.area.bCol + s_context.startString.length();
@@ -514,7 +514,7 @@ bool SAParser::slotParseOneLine()
       //    if (pos != 0) pos++;
           s_currentContext.area.eLine = s_line;
           s_currentContext.area.eCol = pos;
-          //kdDebug(24000) << QString("Quoted String s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl;
+          //kdDebug(24000) << TQString("Quoted String s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl;
           if (s_fullParse)
           {
             if ( s_currentNode  &&
@@ -561,7 +561,7 @@ bool SAParser::slotParseOneLine()
           s_currentContext.area.eLine = s_line;
           s_currentContext.area.eCol = pos + s_dtd->comments[s_currentContext.startString].length() - 1;
           s_currentContext.type = s_previousContext.type;
-          //kdDebug(24000) << QString("Comment s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl;
+          //kdDebug(24000) << TQString("Comment s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl;
 
           if (s_fullParse)
           {
@@ -633,8 +633,8 @@ bool SAParser::slotParseOneLine()
 }
 
 Node* SAParser::parseArea(const AreaStruct &specialArea,
-                          const QString &areaStartString,
-                          const QString &forcedAreaEndString,
+                          const TQString &areaStartString,
+                          const TQString &forcedAreaEndString,
                           Node *parentNode,
                           bool fullParse, bool synchronous)
 {
@@ -649,7 +649,7 @@ Node* SAParser::parseArea(const AreaStruct &specialArea,
   int s_startCol = specialArea.bCol;
   s_endLine = specialArea.eLine;
   s_endCol = specialArea.eCol;
-  //kdDebug(24000) << QString("Starting to parse at %1, %2 for %3").arg(s_startLine).arg(s_startCol).arg(areaStartString) << endl;
+  //kdDebug(24000) << TQString("Starting to parse at %1, %2 for %3").arg(s_startLine).arg(s_startCol).arg(areaStartString) << endl;
 
   s_searchForAreaEnd = false;
   s_searchForForcedAreaEnd = false;
@@ -818,9 +818,9 @@ Node *SAParser::parsingDone()
     if (!m_synchronous)
     {
       SAGroupParser *groupParser = new SAGroupParser(this, write(), g_node, 0L, m_synchronous, true /*last node*/, true);
-      connect(groupParser, SIGNAL(rebuildStructureTree(bool)), SIGNAL(rebuildStructureTree(bool)));
-      connect(groupParser, SIGNAL(cleanGroups()), SIGNAL(cleanGroups()));
-      connect(groupParser, SIGNAL(parsingDone(SAGroupParser*)), SLOT(slotGroupParsingDone(SAGroupParser*)));
+      connect(groupParser, TQT_SIGNAL(rebuildStructureTree(bool)), TQT_SIGNAL(rebuildStructureTree(bool)));
+      connect(groupParser, TQT_SIGNAL(cleanGroups()), TQT_SIGNAL(cleanGroups()));
+      connect(groupParser, TQT_SIGNAL(parsingDone(SAGroupParser*)), TQT_SLOT(slotGroupParsingDone(SAGroupParser*)));
       groupParser->slotParseForScriptGroup();
       m_groupParsers.append(groupParser);
      }
@@ -925,7 +925,7 @@ void SAParser::slotParseNodeInDetail()
 #ifdef DEBUG_PARSER
       kdDebug(24001) << "Calling parseArea from slotParseNodeInDetail." << endl;
 #endif
-      QString areaStartString = m_currentNode->tag->tagStr();
+      TQString areaStartString = m_currentNode->tag->tagStr();
       if (m_currentNode->tag->dtd()->specialAreaNames[areaStartString].isEmpty())
       {
         AreaStruct area2(m_currentNode->tag->area());
@@ -967,7 +967,7 @@ void SAParser::setParsingEnabled(bool enabled)
   {
     m_parseOneLineTimer->stop();
     m_parseInDetailTimer->stop();
-    for (QValueList<SAGroupParser*>::Iterator it = m_groupParsers.begin(); it != m_groupParsers.end(); ++it)
+    for (TQValueList<SAGroupParser*>::Iterator it = m_groupParsers.begin(); it != m_groupParsers.end(); ++it)
     {
       (*it)->m_parseForGroupTimer->stop();
       delete (*it);