Release-1.8.0-20120408

1 files changed, 53 insertions, 53 deletions

diff --git a/src/tagreader.cpp b/src/tagreader.cpp
index 226a726..01c1fe4 100644
--- a/src/tagreader.cpp
+++ b/src/tagreader.cpp
@@ -42,9 +42,9 @@
 class TagAnchorInfo
 {
   public:
-    TagAnchorInfo(const QString &f,const QString &l) : label(l), fileName(f) {}
-    QString label;
-    QString fileName;
+    TagAnchorInfo(const QCString &f,const QCString &l) : label(l), fileName(f) {}
+    QCString label;
+    QCString fileName;
 };
 
 class TagAnchorInfoList : public QList<TagAnchorInfo>
@@ -59,12 +59,12 @@ class TagMemberInfo
 {
   public:
     TagMemberInfo() : prot(Public), virt(Normal), isStatic(FALSE) {}
-    QString type;
-    QString name;
-    QString anchorFile;
-    QString anchor;
-    QString arglist;
-    QString kind;
+    QCString type;
+    QCString name;
+    QCString anchorFile;
+    QCString anchor;
+    QCString arglist;
+    QCString kind;
     TagAnchorInfoList docAnchors;
     Protection prot;
     Specifier virt;
@@ -78,12 +78,12 @@ class TagClassInfo
     enum Kind { Class, Struct, Union, Interface, Exception, Protocol, Category };
     TagClassInfo() { bases=0, templateArguments=0; members.setAutoDelete(TRUE); isObjC=FALSE; }
    ~TagClassInfo() { delete bases; delete templateArguments; }
-    QString name;
-    QString filename;
+    QCString name;
+    QCString filename;
     TagAnchorInfoList docAnchors;
     QList<BaseInfo> *bases;
     QList<TagMemberInfo> members;
-    QList<QString> *templateArguments;
+    QList<QCString> *templateArguments;
     QStringList classList;
     Kind kind;
     bool isObjC;
@@ -94,8 +94,8 @@ class TagNamespaceInfo
 {
   public:
     TagNamespaceInfo() { members.setAutoDelete(TRUE); }
-    QString name;
-    QString filename;
+    QCString name;
+    QCString filename;
     QStringList classList;
     QStringList namespaceList;
     TagAnchorInfoList docAnchors;
@@ -107,8 +107,8 @@ class TagPackageInfo
 {
   public:
     TagPackageInfo() { members.setAutoDelete(TRUE); }
-    QString name;
-    QString filename;
+    QCString name;
+    QCString filename;
     TagAnchorInfoList docAnchors;
     QList<TagMemberInfo> members;
     QStringList classList;
@@ -117,9 +117,9 @@ class TagPackageInfo
 class TagIncludeInfo
 {
   public:
-    QString id;
-    QString name;
-    QString text;
+    QCString id;
+    QCString name;
+    QCString text;
     bool isLocal;
     bool isImported;
 };
@@ -129,9 +129,9 @@ class TagFileInfo
 {
   public:
     TagFileInfo() { members.setAutoDelete(TRUE); includes.setAutoDelete(TRUE); }
-    QString name;
-    QString path;
-    QString filename;
+    QCString name;
+    QCString path;
+    QCString filename;
     TagAnchorInfoList docAnchors;
     QList<TagMemberInfo> members;
     QStringList classList;
@@ -144,9 +144,9 @@ class TagGroupInfo
 {
   public:
     TagGroupInfo() { members.setAutoDelete(TRUE); }
-    QString name;
-    QString title;
-    QString filename;
+    QCString name;
+    QCString title;
+    QCString filename;
     TagAnchorInfoList docAnchors;
     QList<TagMemberInfo> members;
     QStringList subgroupList;
@@ -161,9 +161,9 @@ class TagGroupInfo
 class TagPageInfo
 {
   public:
-    QString name;
-    QString title;
-    QString filename;
+    QCString name;
+    QCString title;
+    QCString filename;
     TagAnchorInfoList docAnchors;
 };
 
@@ -171,9 +171,9 @@ class TagPageInfo
 class TagDirInfo
 {
   public:
-    QString name;
-    QString filename;
-    QString path;
+    QCString name;
+    QCString filename;
+    QCString path;
     QStringList subdirList;
     QStringList fileList;
     TagAnchorInfoList docAnchors;
@@ -235,7 +235,7 @@ class TagFileParser : public QXmlDefaultHandler
 
     void setFileName( const QString &fileName )
     {
-      m_inputFileName = fileName;
+      m_inputFileName = fileName.utf8();
     }
 
     void warn(const char *fmt)
@@ -361,10 +361,10 @@ class TagFileParser : public QXmlDefaultHandler
     void startMember( const QXmlAttributes& attrib)
     {
       m_curMember = new TagMemberInfo;
-      m_curMember->kind = attrib.value("kind");
-      QString protStr   = attrib.value("protection");
-      QString virtStr   = attrib.value("virtualness");
-      QString staticStr = attrib.value("static");
+      m_curMember->kind = attrib.value("kind").utf8();
+      QCString protStr   = attrib.value("protection").utf8();
+      QCString virtStr   = attrib.value("virtualness").utf8();
+      QCString staticStr = attrib.value("static").utf8();
       if (protStr=="protected")
       {
         m_curMember->prot = Protected;
@@ -479,7 +479,7 @@ class TagFileParser : public QXmlDefaultHandler
 
     void startDocAnchor(const QXmlAttributes& attrib )
     {
-      m_fileName = attrib.value("file");
+      m_fileName = attrib.value("file").utf8();
       m_curString = "";
     }
 
@@ -562,10 +562,10 @@ class TagFileParser : public QXmlDefaultHandler
       if (m_state==InFile && m_curFile)
       {
         m_curIncludes = new TagIncludeInfo;
-        m_curIncludes->id = attrib.value("id");
-        m_curIncludes->name = attrib.value("name");
-        m_curIncludes->isLocal = attrib.value("local")=="yes" ? TRUE : FALSE;
-        m_curIncludes->isImported = attrib.value("imported")=="yes" ? TRUE : FALSE;
+        m_curIncludes->id = attrib.value("id").utf8();
+        m_curIncludes->name = attrib.value("name").utf8();
+        m_curIncludes->isLocal = attrib.value("local").utf8()=="yes" ? TRUE : FALSE;
+        m_curIncludes->isImported = attrib.value("imported").utf8()=="yes" ? TRUE : FALSE;
         m_curFile->includes.append(m_curIncludes);
       }
       else
@@ -586,10 +586,10 @@ class TagFileParser : public QXmlDefaultHandler
       {
         if (m_curClass->templateArguments==0) 
         {
-          m_curClass->templateArguments = new QList<QString>;
+          m_curClass->templateArguments = new QList<QCString>;
           m_curClass->templateArguments->setAutoDelete(TRUE);
         }
-        m_curClass->templateArguments->append(new QString(m_curString));
+        m_curClass->templateArguments->append(new QCString(m_curString));
       }
       else
       {
@@ -759,7 +759,7 @@ class TagFileParser : public QXmlDefaultHandler
                        const QString&name, const QXmlAttributes& attrib )
     {
       //printf("startElement `%s'\n",name.data());
-      StartElementHandler *handler = m_startElementHandlers[name];
+      StartElementHandler *handler = m_startElementHandlers[name.utf8()];
       if (handler)
       {
         (*handler)(attrib);
@@ -774,7 +774,7 @@ class TagFileParser : public QXmlDefaultHandler
     bool endElement( const QString&, const QString&, const QString& name )
     {
       //printf("endElement `%s'\n",name.data());
-      EndElementHandler *handler = m_endElementHandlers[name];
+      EndElementHandler *handler = m_endElementHandlers[name.utf8()];
       if (handler)
       {
         (*handler)();
@@ -788,7 +788,7 @@ class TagFileParser : public QXmlDefaultHandler
 
     bool characters ( const QString & ch ) 
     {
-      m_curString+=ch;
+      m_curString+=ch.utf8();
       return TRUE;
     }
 
@@ -818,12 +818,12 @@ class TagFileParser : public QXmlDefaultHandler
     TagMemberInfo             *m_curMember;
     TagIncludeInfo            *m_curIncludes;
     QCString                   m_curString;
-    QString                    m_tagName;
-    QString                    m_fileName;
+    QCString                   m_tagName;
+    QCString                   m_fileName;
     State                      m_state;
     QStack<State>              m_stateStack;
     QXmlLocator               *m_locator;
-    QString                    m_inputFileName;
+    QCString                   m_inputFileName;
 };
 
 /*! Error handler for the XML tag file parser. 
@@ -1148,7 +1148,7 @@ void TagFileParser::buildMemberList(Entry *ce,QList<TagMemberInfo> &members)
   }
 }
 
-static QString stripPath(const QString &s)
+static QCString stripPath(const QCString &s)
 {
   int i=s.findRev('/');
   if (i!=-1)
@@ -1210,8 +1210,8 @@ void TagFileParser::buildLists(Entry *root)
       ArgumentList *al = new ArgumentList;
       ce->tArgLists->append(al);
       
-      QListIterator<QString> sli(*tci->templateArguments);
-      QString *argName;
+      QListIterator<QCString> sli(*tci->templateArguments);
+      QCString *argName;
       for (;(argName=sli.current());++sli)
       {
         Argument *a = new Argument;
@@ -1239,7 +1239,7 @@ void TagFileParser::buildLists(Entry *root)
     ti->fileName = tfi->filename;
     fe->tagInfo  = ti;
     
-    QString fullName = m_tagName+":"+tfi->path+stripPath(tfi->name);
+    QCString fullName = m_tagName+":"+tfi->path+stripPath(tfi->name);
     fe->fileName = fullName;
     //printf("new FileDef() filename=%s\n",tfi->filename.data());
     FileDef *fd = new FileDef(m_tagName+":"+tfi->path,