From b5ba77ebd72c7e994a30eda5422dffde730561ec Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Wed, 18 Sep 2013 22:13:40 +0200 Subject: Fixed a number of compiler warnings reported by newer clang compiler --- qtools/qtextcodec.cpp | 2 +- qtools/qxml.h | 12 ++++++------ src/docbookgen.cpp | 4 +--- src/docparser.h | 5 +---- src/dot.cpp | 6 +++--- src/dot.h | 4 +--- src/doxygen.cpp | 9 ++++++--- src/filedef.h | 1 - src/ftvhelp.cpp | 2 +- src/htmldocvisitor.cpp | 4 ++-- src/htmldocvisitor.h | 3 +-- src/htmlgen.cpp | 4 ++-- src/pagedef.h | 1 - src/vhdlparser.y | 2 +- 14 files changed, 26 insertions(+), 33 deletions(-) diff --git a/qtools/qtextcodec.cpp b/qtools/qtextcodec.cpp index bb8bff4..9721c25 100644 --- a/qtools/qtextcodec.cpp +++ b/qtools/qtextcodec.cpp @@ -1967,7 +1967,7 @@ public: int heuristicNameMatch(const char* hint) const; private: - int forwardIndex; + //int forwardIndex; }; diff --git a/qtools/qxml.h b/qtools/qxml.h index 0797b94..b44e42c 100644 --- a/qtools/qxml.h +++ b/qtools/qxml.h @@ -117,7 +117,7 @@ private: QValueStack > nsStack; QMap ns; - QXmlNamespaceSupportPrivate *d; + //QXmlNamespaceSupportPrivate *d; }; @@ -150,7 +150,7 @@ private: QStringList localnameList; QStringList valueList; - QXmlAttributesPrivate *d; + //QXmlAttributesPrivate *d; friend class QXmlSimpleReader; }; @@ -175,7 +175,7 @@ private: QString input; - QXmlInputSourcePrivate *d; + //QXmlInputSourcePrivate *d; }; // @@ -202,7 +202,7 @@ private: QString pub; QString sys; - QXmlParseExceptionPrivate *d; + //QXmlParseExceptionPrivate *d; }; @@ -392,7 +392,7 @@ public: private: QXmlSimpleReader* reader; - QXmlLocatorPrivate *d; + //QXmlLocatorPrivate *d; }; // @@ -511,7 +511,7 @@ public: QString errorString(); private: - QXmlDefaultHandlerPrivate *d; + //QXmlDefaultHandlerPrivate *d; }; #ifdef _WS_QWS_ diff --git a/src/docbookgen.cpp b/src/docbookgen.cpp index df922b3..f869dfb 100644 --- a/src/docbookgen.cpp +++ b/src/docbookgen.cpp @@ -191,8 +191,7 @@ class DocbookCodeGenerator : public CodeOutputInterface { public: DocbookCodeGenerator(FTextStream &t) : m_t(t), m_lineNumber(-1), - m_insideCodeLine(FALSE), m_normalHLNeedStartTag(TRUE), - m_insideSpecialHL(FALSE) {} + m_insideCodeLine(FALSE), m_insideSpecialHL(FALSE) {} virtual ~DocbookCodeGenerator() {} void codify(const char *text) @@ -291,7 +290,6 @@ class DocbookCodeGenerator : public CodeOutputInterface bool m_isMemberRef; int col; bool m_insideCodeLine; - bool m_normalHLNeedStartTag; bool m_insideSpecialHL; }; diff --git a/src/docparser.h b/src/docparser.h index b80e5e1..f8cc718 100644 --- a/src/docparser.h +++ b/src/docparser.h @@ -983,8 +983,7 @@ class DocParamSect : public CompAccept, public DocNode In=1, Out=2, InOut=3, Unspecified=0 }; DocParamSect(DocNode *parent,Type t) - : m_type(t), m_dir(Unspecified), - m_hasInOutSpecifier(FALSE), m_hasTypeSpecifier(FALSE) + : m_type(t), m_hasInOutSpecifier(FALSE), m_hasTypeSpecifier(FALSE) { m_parent = parent; } int parse(const QCString &cmdName,bool xmlContext,Direction d); Kind kind() const { return Kind_ParamSect; } @@ -995,7 +994,6 @@ class DocParamSect : public CompAccept, public DocNode private: Type m_type; - Direction m_dir; bool m_hasInOutSpecifier; bool m_hasTypeSpecifier; }; @@ -1189,7 +1187,6 @@ class DocHtmlCaption : public CompAccept, public DocNode private: HtmlAttribList m_attribs; - bool m_atTop; }; /** Node representing a HTML table row */ diff --git a/src/dot.cpp b/src/dot.cpp index 7d9e795..8d9ba3f 100644 --- a/src/dot.cpp +++ b/src/dot.cpp @@ -1180,8 +1180,8 @@ uint DotRunnerQueue::count() const //-------------------------------------------------------------------- -DotWorkerThread::DotWorkerThread(int id,DotRunnerQueue *queue) - : m_id(id), m_queue(queue) +DotWorkerThread::DotWorkerThread(DotRunnerQueue *queue) + : m_queue(queue) { m_cleanupItems.setAutoDelete(TRUE); } @@ -1235,7 +1235,7 @@ DotManager::DotManager() : m_dotMaps(1007) if (numThreads==0) numThreads = QMAX(2,QThread::idealThreadCount()+1); for (i=0;istart(); if (thread->isRunning()) { diff --git a/src/dot.h b/src/dot.h index a02b32d..75474ed 100644 --- a/src/dot.h +++ b/src/dot.h @@ -236,7 +236,6 @@ class DotCallGraph DotNode *m_startNode; static int m_curNodeNumber; QDict *m_usedNodes; - int m_recDepth; bool m_inverse; QCString m_diskName; Definition * m_scope; @@ -406,11 +405,10 @@ class DotRunnerQueue class DotWorkerThread : public QThread { public: - DotWorkerThread(int id,DotRunnerQueue *queue); + DotWorkerThread(DotRunnerQueue *queue); void run(); void cleanup(); private: - int m_id; DotRunnerQueue *m_queue; QList m_cleanupItems; }; diff --git a/src/doxygen.cpp b/src/doxygen.cpp index dff1882..8473676 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -2787,10 +2787,13 @@ static void addVariable(EntryNav *rootNav,int isFuncPtr=-1) root->type=root->name; static const QRegExp reName("[a-z_A-Z][a-z_A-Z0-9]*"); - int l; + int l=0; int i=root->args.isEmpty() ? -1 : reName.match(root->args,0,&l); - root->name=root->args.mid(i,l); - root->args=root->args.mid(i+l,root->args.find(')',i+l)-i-l); + if (i!=-1) + { + root->name=root->args.mid(i,l); + root->args=root->args.mid(i+l,root->args.find(')',i+l)-i-l); + } //printf("new: type=`%s' name=`%s' args=`%s'\n", // root->type.data(),root->name.data(),root->args.data()); } diff --git a/src/filedef.h b/src/filedef.h index f6e5bad..9ccffc6 100644 --- a/src/filedef.h +++ b/src/filedef.h @@ -294,7 +294,6 @@ class DirEntry private: EntryKind m_kind; FileDef *m_fd; - int num; bool m_isLast; }; diff --git a/src/ftvhelp.cpp b/src/ftvhelp.cpp index c0ea2bd..5a5d020 100644 --- a/src/ftvhelp.cpp +++ b/src/ftvhelp.cpp @@ -890,7 +890,7 @@ static void generateBriefDoc(FTextStream &t,Definition *def) def,0,brief,FALSE,FALSE,0,TRUE,TRUE); QCString relPath = relativePathToRoot(def->getOutputFileBase()); HtmlCodeGenerator htmlGen(t,relPath); - HtmlDocVisitor *visitor = new HtmlDocVisitor(t,htmlGen,def,0); + HtmlDocVisitor *visitor = new HtmlDocVisitor(t,htmlGen,def); root->accept(visitor); delete visitor; delete root; diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index 6fe4f35..76d06ce 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -136,9 +136,9 @@ static QString htmlAttribsToString(const HtmlAttribList &attribs) //------------------------------------------------------------------------- HtmlDocVisitor::HtmlDocVisitor(FTextStream &t,CodeOutputInterface &ci, - Definition *ctx,MemberDef *md) + Definition *ctx) : DocVisitor(DocVisitor_Html), m_t(t), m_ci(ci), m_insidePre(FALSE), - m_hide(FALSE), m_ctx(ctx), m_md(md) + m_hide(FALSE), m_ctx(ctx) { if (ctx) m_langExt=ctx->getDefFileExtension(); } diff --git a/src/htmldocvisitor.h b/src/htmldocvisitor.h index 3624224..9ba236b 100644 --- a/src/htmldocvisitor.h +++ b/src/htmldocvisitor.h @@ -33,7 +33,7 @@ class CodeOutputInterface; class HtmlDocVisitor : public DocVisitor { public: - HtmlDocVisitor(FTextStream &t,CodeOutputInterface &ci,Definition *ctx,MemberDef *md); + HtmlDocVisitor(FTextStream &t,CodeOutputInterface &ci,Definition *ctx); //-------------------------------------- // visitor functions for leaf nodes @@ -165,7 +165,6 @@ class HtmlDocVisitor : public DocVisitor bool m_hide; QStack m_enabled; Definition *m_ctx; - MemberDef *m_md; QCString m_langExt; }; diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index 6fe61fc..2987e6e 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -2748,9 +2748,9 @@ void HtmlGenerator::endParamList() t << ""; } -void HtmlGenerator::writeDoc(DocNode *n,Definition *ctx,MemberDef *md) +void HtmlGenerator::writeDoc(DocNode *n,Definition *ctx,MemberDef *) { - HtmlDocVisitor *visitor = new HtmlDocVisitor(t,m_codeGen,ctx,md); + HtmlDocVisitor *visitor = new HtmlDocVisitor(t,m_codeGen,ctx); n->accept(visitor); delete visitor; } diff --git a/src/pagedef.h b/src/pagedef.h index f0e96c2..25a42dd 100644 --- a/src/pagedef.h +++ b/src/pagedef.h @@ -70,7 +70,6 @@ class PageDef : public Definition void writePageDocumentation(OutputList &ol); QCString m_fileName; QCString m_title; - GroupDef *m_inGroup; PageSDict *m_subPageDict; // list of pages in the group Definition *m_pageScope; int m_nestingLevel; diff --git a/src/vhdlparser.y b/src/vhdlparser.y index 4432a7d..4e53193 100644 --- a/src/vhdlparser.y +++ b/src/vhdlparser.y @@ -1448,7 +1448,7 @@ mark_comp: dot_name { $$=$1; } comp_1: t_LeftParen t_Identifier t_RightParen { $$="("+$2+")"; } -vcomp_stat: t_CONFIGURATION { $$="configurátion";yyLineNr=s_str.iLine; } +vcomp_stat: t_CONFIGURATION { $$="configuration";yyLineNr=s_str.iLine; } vcomp_stat: t_ENTITY { $$="entity";yyLineNr=s_str.iLine; } vcomp_stat: t_COMPONENT { $$="component";yyLineNr=s_str.iLine; } -- cgit v0.12