Reduce the use of QString in favor of the more efficient QCString

24 files changed, 83 insertions, 102 deletions

diff --git a/src/cite.cpp b/src/cite.cpp
index a36f62c..42f695f 100644
--- a/src/cite.cpp
+++ b/src/cite.cpp
@@ -79,7 +79,7 @@ void CiteDict::writeLatexBibliography(FTextStream &t)
       {
         if (i) t << ",";
         i++;
-        t << bibTmpFile << QString().setNum(i);
+        t << bibTmpFile << QCString().setNum(i);
       }
     }
     bibdata = citeDataList.next();
diff --git a/src/classdef.cpp b/src/classdef.cpp
index b38518c..7548c6c 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -1890,7 +1890,7 @@ void ClassDefImpl::writeIncludeFilesForSlice(OutputList &ol) const
         QFileInfo info(s);
         if (info.exists())
         {
-          QString prefix = info.absFilePath();
+          QCString prefix = info.absFilePath().utf8();
           if (prefix.at(prefix.length() - 1) != '/')
           {
             prefix += '/';
diff --git a/src/cmdmapper.cpp b/src/cmdmapper.cpp
index b4d35d4..d766fa3 100644
--- a/src/cmdmapper.cpp
+++ b/src/cmdmapper.cpp
@@ -239,14 +239,14 @@ int Mapper::map(const char *n)
   return !name.isEmpty() && (result=m_map.find(name)) ? *result: 0;
 }
 
-QString Mapper::find(const int n)
+QCString Mapper::find(const int n)
 {
   QDictIterator<int> mapIterator(m_map);
   for (int *curVal = mapIterator.toFirst();(curVal = mapIterator.current());++mapIterator)
   {
     if (*curVal == n || (*curVal == (n | SIMPLESECT_BIT))) return mapIterator.currentKey();
   }
-  return NULL;
+  return QCString();
 }
 
 Mapper::Mapper(const CommandMap *cm,bool caseSensitive) : m_map(89), m_cs(caseSensitive)
diff --git a/src/cmdmapper.h b/src/cmdmapper.h
index d670cd4..e0a2e65 100644
--- a/src/cmdmapper.h
+++ b/src/cmdmapper.h
@@ -214,7 +214,7 @@ class Mapper
 {
   public:
     int map(const char *n);
-    QString find(const int n);
+    QCString find(const int n);
     Mapper(const CommandMap *cm,bool caseSensitive);
   private:
     QDict<int> m_map;
diff --git a/src/code.l b/src/code.l
index 5ed8866..4998705 100644
--- a/src/code.l
+++ b/src/code.l
@@ -1327,9 +1327,8 @@ static void generateFunctionLink(CodeOutputInterface &ol,const char *funcName)
   //CodeClassDef *ccd=0;
   ClassDef *ccd=0;
   QCString locScope=g_classScope;
-  QString qq=removeRedundantWhiteSpace(funcName);
-  if (g_insidePHP && qq.startsWith("self::")) qq=qq.mid(4);
-  QCString locFunc(qq.data());
+  QCString locFunc=removeRedundantWhiteSpace(funcName);
+  if (g_insidePHP && locFunc.startsWith("self::")) locFunc=locFunc.mid(4);
   QCString funcScope;
   QCString funcWithScope=locFunc;
   QCString funcWithFullScope=locFunc;
diff --git a/src/commentscan.l b/src/commentscan.l
index abf218c..7c9929c 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -1180,7 +1180,7 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
   					  addOutput(yytext);
   					}
 <Comment>{B}*{CMD}"~"[a-z_A-Z-]*		{ // language switch command
-                                          QCString langId = QString(yytext).stripWhiteSpace().data()+2;
+                                          QCString langId = QCString(yytext).stripWhiteSpace().data()+2;
 			       	          if (!langId.isEmpty() &&
 					      qstricmp(Config_getEnum(OUTPUT_LANGUAGE),langId)!=0)
 				          { // enable language specific section
@@ -1190,7 +1190,7 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
 <Comment>{B}*{CMD}"f{"[^}\n]+"}"("{"?)  { // start of a formula with custom environment
 					  setOutput(OutputDoc);
 					  formulaText="\\begin";
-					  formulaEnv=QString(yytext).stripWhiteSpace().data()+2;
+					  formulaEnv=QCString(yytext).stripWhiteSpace().data()+2;
 					  if (formulaEnv.at(formulaEnv.length()-1)=='{')
 					  {
 					    // remove trailing open brace
diff --git a/src/configimpl.l b/src/configimpl.l
index 7d22859..e657745 100644
--- a/src/configimpl.l
+++ b/src/configimpl.l
@@ -1290,14 +1290,13 @@ static void cleanUpPaths(QStrList &str)
       if (fi.exists() && fi.isDir())
       {
         int i = str.at();
-        QString p = fi.absFilePath();
-        if (p.at(p.length()-1)!='/')
-          p.append('/');
+        QCString p = fi.absFilePath().utf8();
+        if (p[p.length()-1]!='/') p+='/';
         str.remove();
         if (str.at()==i) // did not remove last item
-          str.insert(i,p.utf8());
+          str.insert(i,p);
         else
-          str.append(p.utf8());
+          str.append(p);
       }
     }
     sfp = str.next();
diff --git a/src/docparser.cpp b/src/docparser.cpp
index 2ee3d7d..da4cfb2 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -6897,7 +6897,7 @@ int DocSection::parse()
     }
     else if (retval==RetVal_Subsubsection && m_level<=Doxygen::subpageNestingLevel+2)
     {
-      if ((m_level<=1+Doxygen::subpageNestingLevel) && !QString(g_token->sectionId).startsWith("autotoc_md"))
+      if ((m_level<=1+Doxygen::subpageNestingLevel) && !g_token->sectionId.startsWith("autotoc_md"))
           warn_doc_error(g_fileName,doctokenizerYYlineno,"Unexpected subsubsection command found inside %s!",sectionLevelToName[m_level]);
       // then parse any number of nested sections
       while (retval==RetVal_Subsubsection) // more sections follow
@@ -6912,7 +6912,7 @@ int DocSection::parse()
     }
     else if (retval==RetVal_Paragraph && m_level<=QMIN(5,Doxygen::subpageNestingLevel+3))
     {
-      if ((m_level<=2+Doxygen::subpageNestingLevel) && !QString(g_token->sectionId).startsWith("autotoc_md"))
+      if ((m_level<=2+Doxygen::subpageNestingLevel) && !g_token->sectionId.startsWith("autotoc_md"))
         warn_doc_error(g_fileName,doctokenizerYYlineno,"Unexpected paragraph command found inside %s!",sectionLevelToName[m_level]);
       // then parse any number of nested sections
       while (retval==RetVal_Paragraph) // more sections follow
@@ -7084,8 +7084,10 @@ void DocRoot::parse()
     }
     if (retval==RetVal_Paragraph)
     {
-      if (!QString(g_token->sectionId).startsWith("autotoc_md"))
+      if (!g_token->sectionId.startsWith("autotoc_md"))
+      {
          warn_doc_error(g_fileName,doctokenizerYYlineno,"found paragraph command outside of subsubsection context!");
+      }
       while (retval==RetVal_Paragraph)
       {
         if (!g_token->sectionId.isEmpty())
@@ -7113,7 +7115,7 @@ void DocRoot::parse()
     }
     if (retval==RetVal_Subsubsection)
     {
-      if (!(QString(g_token->sectionId).startsWith("autotoc_md")))
+      if (!(g_token->sectionId.startsWith("autotoc_md")))
         warn_doc_error(g_fileName,doctokenizerYYlineno,"found subsubsection command outside of subsection context!");
       while (retval==RetVal_Subsubsection)
       {
@@ -7142,8 +7144,10 @@ void DocRoot::parse()
     }
     if (retval==RetVal_Subsection)
     {
-      if (!(QString(g_token->sectionId).startsWith("autotoc_md")))
+      if (!g_token->sectionId.startsWith("autotoc_md"))
+      {
         warn_doc_error(g_fileName,doctokenizerYYlineno,"found subsection command outside of section context!");
+      }
       while (retval==RetVal_Subsection)
       {
         if (!g_token->sectionId.isEmpty())
diff --git a/src/docparser.h b/src/docparser.h
index 84868f7..02fe135 100644
--- a/src/docparser.h
+++ b/src/docparser.h
@@ -22,6 +22,7 @@
 #include <stdio.h>
 
 #include <qlist.h>
+#include <qstring.h>
 #include <qcstring.h>
 
 #include "docvisitor.h"
diff --git a/src/dotfilepatcher.cpp b/src/dotfilepatcher.cpp
index 92a5618..efc6341 100644
--- a/src/dotfilepatcher.cpp
+++ b/src/dotfilepatcher.cpp
@@ -337,8 +337,8 @@ bool DotFilePatcher::run() const
     //printf("DotFilePatcher::addSVGConversion: file=%s zoomable=%d\n",
     //    m_patchFile.data(),map->zoomable);
   }
-  QString tmpName = QString::fromUtf8(m_patchFile+".tmp");
-  QString patchFile = QString::fromUtf8(m_patchFile);
+  QCString tmpName = m_patchFile+".tmp";
+  QCString patchFile = m_patchFile;
   if (!QDir::current().rename(patchFile,tmpName))
   {
     err("Failed to rename file %s to %s!\n",m_patchFile.data(),tmpName.data());
diff --git a/src/dotnode.cpp b/src/dotnode.cpp
index 491bcb5..9eccdde 100644
--- a/src/dotnode.cpp
+++ b/src/dotnode.cpp
@@ -176,12 +176,12 @@ static void writeBoxMemberList(FTextStream &t,
 
 QCString DotNode::convertLabel(const QCString &l)
 {
-  QString bBefore("\\_/<({[: =-+@%#~?$"); // break before character set
-  QString bAfter(">]),:;|");              // break after  character set
-  QString p(l);
+  QCString bBefore("\\_/<({[: =-+@%#~?$"); // break before character set
+  QCString bAfter(">]),:;|");              // break after  character set
+  QCString p(l);
   if (p.isEmpty()) return QCString();
-  QString result;
-  QChar c,pc=0;
+  QCString result;
+  char c,pc=0;
   uint idx = 0;
   int len=p.length();
   int charsLeft=len;
@@ -190,18 +190,18 @@ QCString DotNode::convertLabel(const QCString &l)
   while (idx < p.length())
   {
     c = p[idx++];
-    QString replacement;
+    QCString replacement;
     switch(c)
     {
-    case '\\': replacement="\\\\"; break;
-    case '\n': replacement="\\n"; break;
-    case '<':  replacement="\\<"; break;
-    case '>':  replacement="\\>"; break;
-    case '|':  replacement="\\|"; break;
-    case '{':  replacement="\\{"; break;
-    case '}':  replacement="\\}"; break;
-    case '"':  replacement="\\\""; break;
-    default:   replacement=c; break;
+      case '\\': replacement="\\\\"; break;
+      case '\n': replacement="\\n"; break;
+      case '<':  replacement="\\<"; break;
+      case '>':  replacement="\\>"; break;
+      case '|':  replacement="\\|"; break;
+      case '{':  replacement="\\{"; break;
+      case '}':  replacement="\\}"; break;
+      case '"':  replacement="\\\""; break;
+      default:   replacement+=c; break;
     }
     // Some heuristics to insert newlines to prevent too long
     // boxes and at the same time prevent ugly breaks
@@ -219,7 +219,7 @@ QCString DotNode::convertLabel(const QCString &l)
       sinceLast=1;
     }
     else if (charsLeft>1+foldLen/4 && sinceLast>foldLen+foldLen/3 && 
-      !isupper(c) && p[idx].category()==QChar::Letter_Uppercase)
+      !isupper(c) && isupper(p[idx]))
     {
       result+=replacement;
       result+="\\l";
@@ -241,7 +241,7 @@ QCString DotNode::convertLabel(const QCString &l)
     charsLeft--;
     pc=c;
   }
-  return result.utf8();
+  return result;
 }
 
 static QCString stripProtectionPrefix(const QCString &s)
diff --git a/src/dotrunner.cpp b/src/dotrunner.cpp
index c01a4e5..a97d8af 100644
--- a/src/dotrunner.cpp
+++ b/src/dotrunner.cpp
@@ -63,8 +63,8 @@ static void checkPngResult(const char *imgName)
 
 static bool resetPDFSize(const int width,const int height, const char *base)
 {
-  QString tmpName = QString::fromUtf8(QCString(base)+".tmp");
-  QString patchFile = QString::fromUtf8(QCString(base)+".dot");
+  QCString tmpName = QCString(base)+".tmp";
+  QCString patchFile = QCString(base)+".dot";
   if (!QDir::current().rename(patchFile,tmpName))
   {
     err("Failed to rename file %s to %s!\n",patchFile.data(),tmpName.data());
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index c15eddd..7b4810e 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -9434,7 +9434,7 @@ static void copyLogo(const QCString &outputOption)
   }
 }
 
-static void copyExtraFiles(QStrList files,const QString &filesOption,const QCString &outputOption)
+static void copyExtraFiles(QStrList files,const QCString &filesOption,const QCString &outputOption)
 {
   uint i;
   for (i=0; i<files.count(); ++i)
diff --git a/src/eclipsehelp.cpp b/src/eclipsehelp.cpp
index dab001a..2757308 100644
--- a/src/eclipsehelp.cpp
+++ b/src/eclipsehelp.cpp
@@ -115,7 +115,7 @@ void EclipseHelp::finalize()
   QFile pluginFile(name);
   if (pluginFile.open(IO_WriteOnly))
   {
-    QString docId = Config_getString(ECLIPSE_DOC_ID);
+    QCString docId = Config_getString(ECLIPSE_DOC_ID);
     FTextStream t(&pluginFile);
     t << "<plugin name=\""  << docId << "\" id=\"" << docId << "\"" << endl;
     t << "        version=\"1.0.0\" provider-name=\"Doxygen\">" << endl;
diff --git a/src/fortrancode.l b/src/fortrancode.l
index eee4d47..d372299 100644
--- a/src/fortrancode.l
+++ b/src/fortrancode.l
@@ -971,7 +971,7 @@ LANGUAGE_BIND_SPEC BIND{BS}"("{BS}C{BS}(,{BS}NAME{BS}"="{BS}"\""(.*)"\""{BS})?")
 <Start>{TYPE_SPEC}/[,:( ]               { 
                                           QCString typ = yytext;
                                           typ = removeRedundantWhiteSpace(typ.lower());
-                                          if (QString(typ).startsWith("real")) YY_FTN_REJECT;
+                                          if (typ.startsWith("real")) YY_FTN_REJECT;
                                           if (typ == "type" || typ == "class" || typ == "procedure") inTypeDecl = 1;
                                           yy_push_state(YY_START);
 					  BEGIN(Declaration);
diff --git a/src/fortranscanner.l b/src/fortranscanner.l
index 38abb89..d75134a 100644
--- a/src/fortranscanner.l
+++ b/src/fortranscanner.l
@@ -1985,7 +1985,7 @@ SymbolModifiers& SymbolModifiers::operator|=(QCString mdfStringArg)
     else
       newMdf.passVar = "";
   }
-  else if (QString(mdfString.data()).startsWith("bind"))
+  else if (mdfString.startsWith("bind"))
   {
     // we need here the original string as we want to don't want to have the lowercase name between the quotes of the name= part
     newMdf.bindVar = extractBind(mdfStringArg);
diff --git a/src/ftextstream.h b/src/ftextstream.h
index d073f40..bfc5bd5 100644
--- a/src/ftextstream.h
+++ b/src/ftextstream.h
@@ -23,7 +23,6 @@ class FTextStream
 
     FTextStream &operator<<( char );
     FTextStream &operator<<( const char *);
-    FTextStream &operator<<( const QString & );
     FTextStream &operator<<( const QCString & );
     FTextStream &operator<<( signed short );
     FTextStream &operator<<( unsigned short );
@@ -59,11 +58,6 @@ inline FTextStream &FTextStream::operator<<( const char* s)
   return *this;
 }
 
-inline FTextStream &FTextStream::operator<<( const QString & s)
-{
-  return operator<<(s.data());
-}
-
 inline FTextStream &FTextStream::operator<<( const QCString &s)
 {
   return operator<<(s.data());
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
index c7fcaf8..513c3a4 100644
--- a/src/htmldocvisitor.cpp
+++ b/src/htmldocvisitor.cpp
@@ -65,7 +65,7 @@ static const char *contexts[10] =
   "intertd"    // 9
 };
 
-static QCString convertIndexWordToAnchor(const QString &word)
+static QCString convertIndexWordToAnchor(const QCString &word)
 {
   static char hex[] = "0123456789abcdef";
   static int cnt = 0;
@@ -1550,7 +1550,7 @@ void HtmlDocVisitor::visitPre(DocHtmlTable *t)
     }
   }
 
-  QString attrs = htmlAttribsToString(t->attribs());
+  QCString attrs = htmlAttribsToString(t->attribs());
   if (attrs.isEmpty())
   {
     m_t << "<table";
@@ -1685,7 +1685,7 @@ void HtmlDocVisitor::visitPre(DocImage *img)
       forceEndParagraph(img);
     }
     if (m_hide) return;
-    QString baseName=img->name();
+    QCString baseName=img->name();
     int i;
     if ((i=baseName.findRev('/'))!=-1 || (i=baseName.findRev('\\'))!=-1)
     {
@@ -1912,9 +1912,9 @@ void HtmlDocVisitor::visitPost(DocRef *ref)
 void HtmlDocVisitor::visitPre(DocSecRefItem *ref)
 {
   if (m_hide) return;
-  QString refName=ref->file();
+  QCString refName=ref->file();
   if (refName.right(Doxygen::htmlFileExtension.length())!=
-      QString(Doxygen::htmlFileExtension))
+      QCString(Doxygen::htmlFileExtension))
   {
     refName+=Doxygen::htmlFileExtension;
   }
@@ -1946,7 +1946,7 @@ void HtmlDocVisitor::visitPost(DocSecRefList *s)
 
 //void HtmlDocVisitor::visitPre(DocLanguage *l)
 //{
-//  QString langId = Config_getEnum(OUTPUT_LANGUAGE);
+//  QCString langId = Config_getEnum(OUTPUT_LANGUAGE);
 //  if (l->id().lower()!=langId.lower())
 //  {
 //    pushEnabled();
@@ -1956,7 +1956,7 @@ void HtmlDocVisitor::visitPost(DocSecRefList *s)
 //
 //void HtmlDocVisitor::visitPost(DocLanguage *l) 
 //{
-//  QString langId = Config_getEnum(OUTPUT_LANGUAGE);
+//  QCString langId = Config_getEnum(OUTPUT_LANGUAGE);
 //  if (l->id().lower()!=langId.lower())
 //  {
 //    popEnabled();
@@ -2144,7 +2144,7 @@ void HtmlDocVisitor::visitPre(DocHtmlBlockQuote *b)
 {
   if (m_hide) return;
   forceEndParagraph(b);
-  QString attrs = htmlAttribsToString(b->attribs());
+  QCString attrs = htmlAttribsToString(b->attribs());
   if (attrs.isEmpty())
   {
     m_t << "<blockquote" << getDirHtmlClassOfNode(getTextDirByConfig(b), "doxtable")
diff --git a/src/index.cpp b/src/index.cpp
index f5faea4..1acd941 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -1943,6 +1943,11 @@ inline bool isId1(int c)
   return (c<127 && c>31); // printable ASCII character
 }
 
+static QCString letterToString(uint letter)
+{
+  return QString(QChar(letter)).utf8();
+}
+
 static QCString letterToLabel(uint startLetter)
 {
   char s[11]; // max 0x12345678 + '\0'
@@ -2101,7 +2106,7 @@ static void writeAlphabeticalClassList(OutputList &ol, ClassDef::CompoundType ct
     if (headerItems) alphaLinks += "&#160;|&#160;";
     headerItems++;
     QCString li = letterToLabel(*pLetter);
-    QCString ls = QString(QChar(*pLetter)).utf8();
+    QCString ls = letterToString(*pLetter);
     alphaLinks += (QCString)"<a class=\"qindex\" href=\"#letter_" +
                   li + "\">" +
                   ls + "</a>";
@@ -2244,7 +2249,7 @@ static void writeAlphabeticalClassList(OutputList &ol, ClassDef::CompoundType ct
               ol.writeString("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">"
                   "<tr>"
                   "<td><div class=\"ah\">&#160;&#160;");
-              ol.writeString(QString(QChar(cell->letter())).utf8());
+              ol.writeString(letterToString(cell->letter()));
               ol.writeString(         "&#160;&#160;</div>"
                   "</td>"
                   "</tr>"
@@ -2839,7 +2844,7 @@ static void writeMemberList(OutputList &ol,bool useSections,int page,
           if (!firstItem)    ol.endItemListItem();
           if (!firstSection) ol.endItemList();
           QCString cs = letterToLabel(ml->letter());
-          QCString cl = QString(QChar(ml->letter())).utf8();
+          QCString cl = letterToString(ml->letter());
           QCString anchor=(QCString)"index_"+convertToId(cs);
           QCString title=(QCString)"- "+cl+" -";
           ol.startSection(anchor,title,SectionInfo::Subsection);
@@ -3120,7 +3125,7 @@ static void writeQuickMemberIndex(OutputList &ol,
   {
     uint i = ml->letter();
     QCString is = letterToLabel(i);
-    QCString ci = QString(QChar(i)).utf8();
+    QCString ci = letterToString(i);
     QCString anchor;
     QCString extension=Doxygen::htmlFileExtension;
     if (!multiPage)
@@ -3210,7 +3215,7 @@ static void writeClassMemberIndexFiltered(OutputList &ol, ClassMemberHighlight h
       {
         fileName+="_"+letterToLabel(page);
       }
-      QCString cs = QString(QChar(page)).utf8();
+      QCString cs = letterToString(page);
       if (addToIndex)
       {
         Doxygen::indexList->addContentsItem(FALSE,cs,0,fileName,0,FALSE,TRUE);
@@ -3389,7 +3394,7 @@ static void writeFileMemberIndexFiltered(OutputList &ol, FileMemberHighlight hl)
       {
         fileName+="_"+letterToLabel(page);
       }
-      QCString cs = QString(QChar(page)).utf8();
+      QCString cs = letterToString(page);
       if (addToIndex)
       {
         Doxygen::indexList->addContentsItem(FALSE,cs,0,fileName,0,FALSE,TRUE);
@@ -3565,7 +3570,7 @@ static void writeNamespaceMemberIndexFiltered(OutputList &ol,
       {
         fileName+="_"+letterToLabel(page);
       }
-      QCString cs = QString(QChar(page)).utf8();
+      QCString cs = letterToString(page);
       if (addToIndex)
       {
         Doxygen::indexList->addContentsItem(FALSE,cs,0,fileName,0,FALSE,TRUE);
@@ -5200,7 +5205,7 @@ void renderMemberIndicesAsJs(FTextStream &t,
           if (!firstLetter) t << "," << endl;
           uint letter = ml->letter();
           QCString is = letterToLabel(letter);
-          QCString ci = QString(QChar(letter)).utf8();
+          QCString ci = letterToString(letter);
           QCString anchor;
           QCString extension=Doxygen::htmlFileExtension;
           QCString fullName = getInfo(i)->fname;
diff --git a/src/mandocvisitor.cpp b/src/mandocvisitor.cpp
index 997b24e..21e7cb9 100644
--- a/src/mandocvisitor.cpp
+++ b/src/mandocvisitor.cpp
@@ -905,25 +905,6 @@ void ManDocVisitor::visitPost(DocSecRefList *)
   m_t << ".PP" << endl;
 }
 
-//void ManDocVisitor::visitPre(DocLanguage *l)
-//{
-//  QString langId = Config_getEnum(OUTPUT_LANGUAGE);
-//  if (l->id().lower()!=langId.lower())
-//  {
-//    pushEnabled();
-//    m_hide = TRUE;
-//  }
-//}
-//
-//void ManDocVisitor::visitPost(DocLanguage *l) 
-//{
-//  QString langId = Config_getEnum(OUTPUT_LANGUAGE);
-//  if (l->id().lower()!=langId.lower())
-//  {
-//    popEnabled();
-//  }
-//}
-
 void ManDocVisitor::visitPre(DocParamSect *s)
 {
   if (m_hide) return;
diff --git a/src/markdown.cpp b/src/markdown.cpp
index e63bf10..ce28540 100644
--- a/src/markdown.cpp
+++ b/src/markdown.cpp
@@ -2590,7 +2590,7 @@ void MarkdownFileParser::parseInput(const char *fileName,
   QCString docs = fileBuf;
   QCString id;
   QCString title=extractPageTitle(docs,id).stripWhiteSpace();
-  if (QString(id).startsWith("autotoc_md")) id = "";
+  if (id.startsWith("autotoc_md")) id = "";
   g_indentLevel=title.isEmpty() ? 0 : -1;
   QCString titleFn = QFileInfo(fileName).baseName().utf8();
   QCString fn      = QFileInfo(fileName).fileName().utf8();
diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp
index 229a817..f32936e 100644
--- a/src/rtfgen.cpp
+++ b/src/rtfgen.cpp
@@ -3049,7 +3049,9 @@ void RTFGenerator::endInlineMemberDoc()
 void RTFGenerator::writeLineNumber(const char *,const char *,const char *,int l)
 {
   DoxyCodeLineOpen = TRUE;
-  t << QString("%1").arg(l,5) << " ";
+  QCString lineNumber;
+  lineNumber.sprintf("%05d",l);
+  t << lineNumber << " ";
 }
 void RTFGenerator::startCodeLine(bool)
 {
diff --git a/src/sortdict.h b/src/sortdict.h
index 4db330f..52eccd3 100644
--- a/src/sortdict.h
+++ b/src/sortdict.h
@@ -237,10 +237,6 @@ class SDict
     {
       return m_dict->find(key);
     }
-    T *find(const QString &key)
-    {
-      return m_dict->find(key);
-    }
     int findAt(const QCString &key)
     {
       T *item = find(key);
diff --git a/src/tclscanner.l b/src/tclscanner.l
index a680cf9..e763575 100644
--- a/src/tclscanner.l
+++ b/src/tclscanner.l
@@ -425,7 +425,7 @@ static struct
   int code_linenumbers; // if true create line numbers in code
   const char *code_font; // used font to codify
   bool config_autobrief; // value of configuration option
-  QMap<QString,QString> config_subst; // map of configuration option values
+  QMap<QCString,QCString> config_subst; // map of configuration option values
   QCString input_string; // file contents
   int input_position; // position in file
   QCString file_name; // name of used file
@@ -464,7 +464,7 @@ static struct
 
 // scanner functions
 static int yyread(char *buf,int max_size);
-static tcl_scan *tcl_scan_start(char type, QString content, QCString ns, Entry *entry_cls, Entry *entry_fn);
+static tcl_scan *tcl_scan_start(char type, QCString content, QCString ns, Entry *entry_cls, Entry *entry_fn);
 static void tcl_scan_end();
 static void tcl_comment(int what,const char *text);
 static void tcl_word(int what,const char *text);
@@ -729,7 +729,7 @@ static void tcl_codify(const char *s,const char *str)
 }
 
 //! Codify 'str' with special font class 's'.
-static void tcl_codify(const char *s,const QString &str)
+static void tcl_codify(const char *s,const QCString &str)
 {
   if (tcl.code==NULL) return;
   tcl_codify(s,str);
@@ -1135,10 +1135,10 @@ D
 
 //! Start new scan context for given 'content'.
 // @return created new scan context.
-static tcl_scan *tcl_scan_start(char type, QString content, QCString ns, Entry *entry_cl, Entry *entry_fn)
+static tcl_scan *tcl_scan_start(char type, QCString content, QCString ns, Entry *entry_cl, Entry *entry_fn)
 {
   tcl_scan *myScan=tcl.scan.at(0);
-tcl_inf("line=%d type=%d '%s'\n",tcl.line_body0,type,content.ascii());
+tcl_inf("line=%d type=%d '%s'\n",tcl.line_body0,type,content.data());
 
   myScan->line1=yylineno;
   yy_push_state(TOP);
@@ -1167,7 +1167,7 @@ tcl_inf("line=%d type=%d '%s'\n",tcl.line_body0,type,content.ascii());
   myScan->entry_cl = entry_cl;
   myScan->entry_fn = entry_fn;
   myScan->entry_scan = tcl.entry_current;
-  myScan->buffer_state=yy_scan_string(content.ascii());
+  myScan->buffer_state=yy_scan_string(content.data());
   myScan->line0=tcl.line_body0;
   myScan->line1=tcl.line_body1;
   myScan->after.clear();
@@ -2562,7 +2562,7 @@ tcl_inf("->\n");
   if (myStr.left(2)=="::") myStr = myStr.mid(2);
   if (tcl.config_subst.contains(myStr))
   {
-    myStr=tcl.config_subst[myStr].utf8();
+    myStr=tcl.config_subst[myStr];
   }
   if (myStr=="private")
   {
@@ -2598,7 +2598,7 @@ tcl_inf("->\n");
     if (myStr.left(2)=="::") myStr = myStr.mid(2);
     if (tcl.config_subst.contains(myStr))
     {
-      myStr=tcl.config_subst[myStr].utf8();
+      myStr=tcl.config_subst[myStr];
     }
   }
   if (myStr=="proc")
@@ -3018,7 +3018,7 @@ void TclLanguageScanner::parseCode(CodeOutputInterface & codeOutIntf,
     }
   }
 
-  QString myStr="Codifying..";
+  QCString myStr="Codifying..";
   if (scopeName)
   {
     myStr +=" scope=";
@@ -3041,7 +3041,7 @@ void TclLanguageScanner::parseCode(CodeOutputInterface & codeOutIntf,
     myStr+=" file=";
     myStr+=fileDef->fileName();
   }
-tcl_inf("%s (%d,%d) %d %d\n",myStr.ascii(),startLine,endLine,isExampleBlock,inlineFragment);
+tcl_inf("%s (%d,%d) %d %d\n",myStr.data(),startLine,endLine,isExampleBlock,inlineFragment);
 //tcl_inf("%s\n"input.data());
   tcl_init();
   tcl.collectXRefs = collectXRefs;