From 2a539e12679a244389c781f6146d7f6bd9c82048 Mon Sep 17 00:00:00 2001 From: ahoogol Date: Wed, 28 Jun 2017 16:05:54 +0430 Subject: Fixed compile errors in clang and gcc --- src/docparser.cpp | 24 ++++++++++++------------ src/docparser.h | 30 +++++++++++++++--------------- src/dot.cpp | 2 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/docparser.cpp b/src/docparser.cpp index 0cd27c0..1081e1e 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -7221,21 +7221,21 @@ static QCString processCopyDoc(const char *data,uint &len) //--------------------------------------------------------------------------- QString::Direction getTextDirByConfig(const QString &text) { - auto configDir = Config_getEnum(OUTPUT_TEXT_DIRECTION); + QCString configDir = Config_getEnum(OUTPUT_TEXT_DIRECTION); if (configDir == "None") return QString::DirNeutral; if (configDir == "Context") return text.basicDirection(); if (configDir == "LTR") { - auto textDir = text.direction(); + QString::Direction textDir = text.direction(); if (textDir == QString::DirMixed) return QString::DirLTR; return textDir; } if (configDir == "RTL") { - auto textDir = text.direction(); + QString::Direction textDir = text.direction(); if (textDir == QString::DirMixed) return QString::DirRTL; return textDir; @@ -7245,21 +7245,21 @@ QString::Direction getTextDirByConfig(const QString &text) QString::Direction getTextDirByConfig(const DocNode *node) { - auto configDir = Config_getEnum(OUTPUT_TEXT_DIRECTION); + QCString configDir = Config_getEnum(OUTPUT_TEXT_DIRECTION); if (configDir == "None") return QString::DirNeutral; if (configDir == "Context") return node->getTextBasicDir(); if (configDir == "LTR") { - auto textDir = node->getTextDir(); + QString::Direction textDir = node->getTextDir(); if (textDir == QString::DirMixed) return QString::DirLTR; return textDir; } if (configDir == "RTL") { - auto textDir = node->getTextDir(); + QString::Direction textDir = node->getTextDir(); if (textDir == QString::DirMixed) return QString::DirRTL; return textDir; @@ -7269,21 +7269,21 @@ QString::Direction getTextDirByConfig(const DocNode *node) QString::Direction getTextDirByConfig(const DocPara *para, int nodeIndex) { - auto configDir = Config_getEnum(OUTPUT_TEXT_DIRECTION); + QCString configDir = Config_getEnum(OUTPUT_TEXT_DIRECTION); if (configDir == "None") return QString::DirNeutral; if (configDir == "Context") return para->getTextBasicDir(nodeIndex); if (configDir == "LTR") { - auto textDir = para->getTextDir(nodeIndex); + QString::Direction textDir = para->getTextDir(nodeIndex); if (textDir == QString::DirMixed) return QString::DirLTR; return textDir; } if (configDir == "RTL") { - auto textDir = para->getTextDir(nodeIndex); + QString::Direction textDir = para->getTextDir(nodeIndex); if (textDir == QString::DirMixed) return QString::DirRTL; return textDir; @@ -7301,9 +7301,9 @@ QCString getDirHtmlClassOfNode(QString::Direction textDir, const char *initValue else classFromDir = ""; - if (initValue != nullptr && !classFromDir.isEmpty()) + if (initValue != NULL && !classFromDir.isEmpty()) return QCString(" class=\"") + initValue + " " + classFromDir + "\""; - if (initValue != nullptr) + if (initValue != NULL) return QCString(" class=\"") + initValue + "\""; if (!classFromDir.isEmpty()) return QCString(" class=\"") + classFromDir + "\""; @@ -7314,7 +7314,7 @@ QCString getDirHtmlClassOfPage(QCString pageTitle) { QCString result = ""; result += " class=\"PageDoc"; - auto titleDir = getTextDirByConfig(pageTitle); + QString::Direction titleDir = getTextDirByConfig(pageTitle); if (titleDir == QString::DirLTR) result += " PageDocLTR-title"; else if (titleDir == QString::DirRTL) diff --git a/src/docparser.h b/src/docparser.h index c6b3b23..ebfed88 100644 --- a/src/docparser.h +++ b/src/docparser.h @@ -37,7 +37,7 @@ class SectionDict; QString::Direction getTextDirByConfig(const QString &text); QString::Direction getTextDirByConfig(const DocNode *node); QString::Direction getTextDirByConfig(const DocPara *para, int nodeIndex); -QCString getDirHtmlClassOfNode(QString::Direction textDir, const char *initValue = nullptr); +QCString getDirHtmlClassOfNode(QString::Direction textDir, const char *initValue = NULL); QCString getDirHtmlClassOfPage(QCString pageTitle); QCString getHtmlDirEmbedingChar(QString::Direction textDir); QCString getJsDirEmbedingChar(QString::Direction textDir); @@ -198,10 +198,10 @@ template class CompAccept : public DocNode QString::Direction getTextDir(int nodeIndex) const { unsigned char resultDir = QString::DirNeutral; - for (int i = nodeIndex; i < m_children.count(); i++) + for (uint i = nodeIndex; i < m_children.count(); i++) { - auto node = m_children.at(i); - auto nodeDir = node->getTextDir(); + DocNode* node = m_children.at(i); + QString::Direction nodeDir = node->getTextDir(); resultDir |= nodeDir; if (resultDir == QString::DirMixed) return QString::DirMixed; @@ -210,20 +210,20 @@ template class CompAccept : public DocNode } QString::Direction getTextBasicDir(int nodeIndex) const { - for (int i = nodeIndex; i < m_children.count(); i++) + for (uint i = nodeIndex; i < m_children.count(); i++) { - auto node = m_children.at(i); - auto nodeDir = node->getTextBasicDir(); + DocNode* node = m_children.at(i); + QString::Direction nodeDir = node->getTextBasicDir(); if (nodeDir != QString::DirNeutral) return nodeDir; } return QString::DirNeutral; } - QString::Direction getTextDir() const override + virtual QString::Direction getTextDir() const { return getTextDir(0); } - QString::Direction getTextBasicDir() const override + virtual QString::Direction getTextBasicDir() const { return getTextBasicDir(0); } @@ -242,8 +242,8 @@ class DocWord : public DocNode QCString word() const { return m_word; } Kind kind() const { return Kind_Word; } void accept(DocVisitor *v) { v->visit(this); } - QString::Direction getTextDir() const override { return QString(word()).direction(); }; - QString::Direction getTextBasicDir() const override { return QString(word()).basicDirection(); }; + virtual QString::Direction getTextDir() const { return QString(word()).direction(); }; + virtual QString::Direction getTextBasicDir() const { return QString(word()).basicDirection(); }; private: QCString m_word; @@ -265,8 +265,8 @@ class DocLinkedWord : public DocNode QCString anchor() const { return m_anchor; } QCString tooltip() const { return m_tooltip; } void accept(DocVisitor *v) { v->visit(this); } - QString::Direction getTextDir() const override { return QString(word()).direction(); }; - QString::Direction getTextBasicDir() const override { return QString(word()).basicDirection(); }; + virtual QString::Direction getTextDir() const { return QString(word()).direction(); }; + virtual QString::Direction getTextBasicDir() const { return QString(word()).basicDirection(); }; private: QCString m_word; @@ -287,8 +287,8 @@ class DocURL : public DocNode Kind kind() const { return Kind_URL; } void accept(DocVisitor *v) { v->visit(this); } bool isEmail() const { return m_isEmail; } - QString::Direction getTextDir() const override { return QString::DirLTR; }; - QString::Direction getTextBasicDir() const override { return QString::DirLTR; }; + virtual QString::Direction getTextDir() const { return QString::DirLTR; }; + virtual QString::Direction getTextBasicDir() const { return QString::DirLTR; }; private: QCString m_url; diff --git a/src/dot.cpp b/src/dot.cpp index 5c65eef..62e2c82 100644 --- a/src/dot.cpp +++ b/src/dot.cpp @@ -1527,7 +1527,7 @@ static QCString convertLabel(const QCString &l) if (p.isEmpty()) return QCString(); QString result; QChar c,pc=0; - int idx = 0; + uint idx = 0; int len=p.length(); int charsLeft=len; int sinceLast=0; -- cgit v0.12