Commit b5ba77eb authored by Dimitri van Heesch's avatar Dimitri van Heesch

Fixed a number of compiler warnings reported by newer clang compiler

parent 35fb0290
......@@ -1967,7 +1967,7 @@ public:
int heuristicNameMatch(const char* hint) const;
private:
int forwardIndex;
//int forwardIndex;
};
......
......@@ -117,7 +117,7 @@ private:
QValueStack<QMap<QString, QString> > nsStack;
QMap<QString, QString> 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_
......
......@@ -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;
};
......
......@@ -983,8 +983,7 @@ class DocParamSect : public CompAccept<DocParamSect>, 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<DocParamSect>, public DocNode
private:
Type m_type;
Direction m_dir;
bool m_hasInOutSpecifier;
bool m_hasTypeSpecifier;
};
......@@ -1189,7 +1187,6 @@ class DocHtmlCaption : public CompAccept<DocHtmlCaption>, public DocNode
private:
HtmlAttribList m_attribs;
bool m_atTop;
};
/** Node representing a HTML table row */
......
......@@ -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;i<numThreads;i++)
{
DotWorkerThread *thread = new DotWorkerThread(i,m_queue);
DotWorkerThread *thread = new DotWorkerThread(m_queue);
thread->start();
if (thread->isRunning())
{
......
......@@ -236,7 +236,6 @@ class DotCallGraph
DotNode *m_startNode;
static int m_curNodeNumber;
QDict<DotNode> *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<DotRunner::CleanupItem> m_cleanupItems;
};
......
......@@ -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);
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());
}
......
......@@ -294,7 +294,6 @@ class DirEntry
private:
EntryKind m_kind;
FileDef *m_fd;
int num;
bool m_isLast;
};
......
......@@ -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;
......
......@@ -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();
}
......
......@@ -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<bool> m_enabled;
Definition *m_ctx;
MemberDef *m_md;
QCString m_langExt;
};
......
......@@ -2748,9 +2748,9 @@ void HtmlGenerator::endParamList()
t << "</dl>";
}
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;
}
......
......@@ -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;
......
......@@ -1448,7 +1448,7 @@ mark_comp: dot_name { $$=$1; }
comp_1: t_LeftParen t_Identifier t_RightParen { $$="("+$2+")"; }
vcomp_stat: t_CONFIGURATION { $$="configurtion";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; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment