Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
doxverilog
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
doxverilog
Commits
b5ba77eb
Commit
b5ba77eb
authored
Sep 18, 2013
by
Dimitri van Heesch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a number of compiler warnings reported by newer clang compiler
parent
35fb0290
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
26 additions
and
33 deletions
+26
-33
qtextcodec.cpp
qtools/qtextcodec.cpp
+1
-1
qxml.h
qtools/qxml.h
+6
-6
docbookgen.cpp
src/docbookgen.cpp
+1
-3
docparser.h
src/docparser.h
+1
-4
dot.cpp
src/dot.cpp
+3
-3
dot.h
src/dot.h
+1
-3
doxygen.cpp
src/doxygen.cpp
+6
-3
filedef.h
src/filedef.h
+0
-1
ftvhelp.cpp
src/ftvhelp.cpp
+1
-1
htmldocvisitor.cpp
src/htmldocvisitor.cpp
+2
-2
htmldocvisitor.h
src/htmldocvisitor.h
+1
-2
htmlgen.cpp
src/htmlgen.cpp
+2
-2
pagedef.h
src/pagedef.h
+0
-1
vhdlparser.y
src/vhdlparser.y
+1
-1
No files found.
qtools/qtextcodec.cpp
View file @
b5ba77eb
...
@@ -1967,7 +1967,7 @@ public:
...
@@ -1967,7 +1967,7 @@ public:
int
heuristicNameMatch
(
const
char
*
hint
)
const
;
int
heuristicNameMatch
(
const
char
*
hint
)
const
;
private
:
private
:
int
forwardIndex
;
//
int forwardIndex;
};
};
...
...
qtools/qxml.h
View file @
b5ba77eb
...
@@ -117,7 +117,7 @@ private:
...
@@ -117,7 +117,7 @@ private:
QValueStack
<
QMap
<
QString
,
QString
>
>
nsStack
;
QValueStack
<
QMap
<
QString
,
QString
>
>
nsStack
;
QMap
<
QString
,
QString
>
ns
;
QMap
<
QString
,
QString
>
ns
;
QXmlNamespaceSupportPrivate
*
d
;
//
QXmlNamespaceSupportPrivate *d;
};
};
...
@@ -150,7 +150,7 @@ private:
...
@@ -150,7 +150,7 @@ private:
QStringList
localnameList
;
QStringList
localnameList
;
QStringList
valueList
;
QStringList
valueList
;
QXmlAttributesPrivate
*
d
;
//
QXmlAttributesPrivate *d;
friend
class
QXmlSimpleReader
;
friend
class
QXmlSimpleReader
;
};
};
...
@@ -175,7 +175,7 @@ private:
...
@@ -175,7 +175,7 @@ private:
QString
input
;
QString
input
;
QXmlInputSourcePrivate
*
d
;
//
QXmlInputSourcePrivate *d;
};
};
//
//
...
@@ -202,7 +202,7 @@ private:
...
@@ -202,7 +202,7 @@ private:
QString
pub
;
QString
pub
;
QString
sys
;
QString
sys
;
QXmlParseExceptionPrivate
*
d
;
//
QXmlParseExceptionPrivate *d;
};
};
...
@@ -392,7 +392,7 @@ public:
...
@@ -392,7 +392,7 @@ public:
private
:
private
:
QXmlSimpleReader
*
reader
;
QXmlSimpleReader
*
reader
;
QXmlLocatorPrivate
*
d
;
//
QXmlLocatorPrivate *d;
};
};
//
//
...
@@ -511,7 +511,7 @@ public:
...
@@ -511,7 +511,7 @@ public:
QString
errorString
();
QString
errorString
();
private
:
private
:
QXmlDefaultHandlerPrivate
*
d
;
//
QXmlDefaultHandlerPrivate *d;
};
};
#ifdef _WS_QWS_
#ifdef _WS_QWS_
...
...
src/docbookgen.cpp
View file @
b5ba77eb
...
@@ -191,8 +191,7 @@ class DocbookCodeGenerator : public CodeOutputInterface
...
@@ -191,8 +191,7 @@ class DocbookCodeGenerator : public CodeOutputInterface
{
{
public
:
public
:
DocbookCodeGenerator
(
FTextStream
&
t
)
:
m_t
(
t
),
m_lineNumber
(
-
1
),
DocbookCodeGenerator
(
FTextStream
&
t
)
:
m_t
(
t
),
m_lineNumber
(
-
1
),
m_insideCodeLine
(
FALSE
),
m_normalHLNeedStartTag
(
TRUE
),
m_insideCodeLine
(
FALSE
),
m_insideSpecialHL
(
FALSE
)
{}
m_insideSpecialHL
(
FALSE
)
{}
virtual
~
DocbookCodeGenerator
()
{}
virtual
~
DocbookCodeGenerator
()
{}
void
codify
(
const
char
*
text
)
void
codify
(
const
char
*
text
)
...
@@ -291,7 +290,6 @@ class DocbookCodeGenerator : public CodeOutputInterface
...
@@ -291,7 +290,6 @@ class DocbookCodeGenerator : public CodeOutputInterface
bool
m_isMemberRef
;
bool
m_isMemberRef
;
int
col
;
int
col
;
bool
m_insideCodeLine
;
bool
m_insideCodeLine
;
bool
m_normalHLNeedStartTag
;
bool
m_insideSpecialHL
;
bool
m_insideSpecialHL
;
};
};
...
...
src/docparser.h
View file @
b5ba77eb
...
@@ -983,8 +983,7 @@ class DocParamSect : public CompAccept<DocParamSect>, public DocNode
...
@@ -983,8 +983,7 @@ class DocParamSect : public CompAccept<DocParamSect>, public DocNode
In
=
1
,
Out
=
2
,
InOut
=
3
,
Unspecified
=
0
In
=
1
,
Out
=
2
,
InOut
=
3
,
Unspecified
=
0
};
};
DocParamSect
(
DocNode
*
parent
,
Type
t
)
DocParamSect
(
DocNode
*
parent
,
Type
t
)
:
m_type
(
t
),
m_dir
(
Unspecified
),
:
m_type
(
t
),
m_hasInOutSpecifier
(
FALSE
),
m_hasTypeSpecifier
(
FALSE
)
m_hasInOutSpecifier
(
FALSE
),
m_hasTypeSpecifier
(
FALSE
)
{
m_parent
=
parent
;
}
{
m_parent
=
parent
;
}
int
parse
(
const
QCString
&
cmdName
,
bool
xmlContext
,
Direction
d
);
int
parse
(
const
QCString
&
cmdName
,
bool
xmlContext
,
Direction
d
);
Kind
kind
()
const
{
return
Kind_ParamSect
;
}
Kind
kind
()
const
{
return
Kind_ParamSect
;
}
...
@@ -995,7 +994,6 @@ class DocParamSect : public CompAccept<DocParamSect>, public DocNode
...
@@ -995,7 +994,6 @@ class DocParamSect : public CompAccept<DocParamSect>, public DocNode
private
:
private
:
Type
m_type
;
Type
m_type
;
Direction
m_dir
;
bool
m_hasInOutSpecifier
;
bool
m_hasInOutSpecifier
;
bool
m_hasTypeSpecifier
;
bool
m_hasTypeSpecifier
;
};
};
...
@@ -1189,7 +1187,6 @@ class DocHtmlCaption : public CompAccept<DocHtmlCaption>, public DocNode
...
@@ -1189,7 +1187,6 @@ class DocHtmlCaption : public CompAccept<DocHtmlCaption>, public DocNode
private
:
private
:
HtmlAttribList
m_attribs
;
HtmlAttribList
m_attribs
;
bool
m_atTop
;
};
};
/** Node representing a HTML table row */
/** Node representing a HTML table row */
...
...
src/dot.cpp
View file @
b5ba77eb
...
@@ -1180,8 +1180,8 @@ uint DotRunnerQueue::count() const
...
@@ -1180,8 +1180,8 @@ uint DotRunnerQueue::count() const
//--------------------------------------------------------------------
//--------------------------------------------------------------------
DotWorkerThread
::
DotWorkerThread
(
int
id
,
DotRunnerQueue
*
queue
)
DotWorkerThread
::
DotWorkerThread
(
DotRunnerQueue
*
queue
)
:
m_
id
(
id
),
m_
queue
(
queue
)
:
m_queue
(
queue
)
{
{
m_cleanupItems
.
setAutoDelete
(
TRUE
);
m_cleanupItems
.
setAutoDelete
(
TRUE
);
}
}
...
@@ -1235,7 +1235,7 @@ DotManager::DotManager() : m_dotMaps(1007)
...
@@ -1235,7 +1235,7 @@ DotManager::DotManager() : m_dotMaps(1007)
if
(
numThreads
==
0
)
numThreads
=
QMAX
(
2
,
QThread
::
idealThreadCount
()
+
1
);
if
(
numThreads
==
0
)
numThreads
=
QMAX
(
2
,
QThread
::
idealThreadCount
()
+
1
);
for
(
i
=
0
;
i
<
numThreads
;
i
++
)
for
(
i
=
0
;
i
<
numThreads
;
i
++
)
{
{
DotWorkerThread
*
thread
=
new
DotWorkerThread
(
i
,
m_queue
);
DotWorkerThread
*
thread
=
new
DotWorkerThread
(
m_queue
);
thread
->
start
();
thread
->
start
();
if
(
thread
->
isRunning
())
if
(
thread
->
isRunning
())
{
{
...
...
src/dot.h
View file @
b5ba77eb
...
@@ -236,7 +236,6 @@ class DotCallGraph
...
@@ -236,7 +236,6 @@ class DotCallGraph
DotNode
*
m_startNode
;
DotNode
*
m_startNode
;
static
int
m_curNodeNumber
;
static
int
m_curNodeNumber
;
QDict
<
DotNode
>
*
m_usedNodes
;
QDict
<
DotNode
>
*
m_usedNodes
;
int
m_recDepth
;
bool
m_inverse
;
bool
m_inverse
;
QCString
m_diskName
;
QCString
m_diskName
;
Definition
*
m_scope
;
Definition
*
m_scope
;
...
@@ -406,11 +405,10 @@ class DotRunnerQueue
...
@@ -406,11 +405,10 @@ class DotRunnerQueue
class
DotWorkerThread
:
public
QThread
class
DotWorkerThread
:
public
QThread
{
{
public
:
public
:
DotWorkerThread
(
int
id
,
DotRunnerQueue
*
queue
);
DotWorkerThread
(
DotRunnerQueue
*
queue
);
void
run
();
void
run
();
void
cleanup
();
void
cleanup
();
private
:
private
:
int
m_id
;
DotRunnerQueue
*
m_queue
;
DotRunnerQueue
*
m_queue
;
QList
<
DotRunner
::
CleanupItem
>
m_cleanupItems
;
QList
<
DotRunner
::
CleanupItem
>
m_cleanupItems
;
};
};
...
...
src/doxygen.cpp
View file @
b5ba77eb
...
@@ -2787,10 +2787,13 @@ static void addVariable(EntryNav *rootNav,int isFuncPtr=-1)
...
@@ -2787,10 +2787,13 @@ static void addVariable(EntryNav *rootNav,int isFuncPtr=-1)
root
->
type
=
root
->
name
;
root
->
type
=
root
->
name
;
static
const
QRegExp
reName
(
"[a-z_A-Z][a-z_A-Z0-9]*"
);
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
);
int
i
=
root
->
args
.
isEmpty
()
?
-
1
:
reName
.
match
(
root
->
args
,
0
,
&
l
);
if
(
i
!=-
1
)
{
root
->
name
=
root
->
args
.
mid
(
i
,
l
);
root
->
name
=
root
->
args
.
mid
(
i
,
l
);
root
->
args
=
root
->
args
.
mid
(
i
+
l
,
root
->
args
.
find
(
')'
,
i
+
l
)
-
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",
//printf("new: type=`%s' name=`%s' args=`%s'\n",
// root->type.data(),root->name.data(),root->args.data());
// root->type.data(),root->name.data(),root->args.data());
}
}
...
...
src/filedef.h
View file @
b5ba77eb
...
@@ -294,7 +294,6 @@ class DirEntry
...
@@ -294,7 +294,6 @@ class DirEntry
private
:
private
:
EntryKind
m_kind
;
EntryKind
m_kind
;
FileDef
*
m_fd
;
FileDef
*
m_fd
;
int
num
;
bool
m_isLast
;
bool
m_isLast
;
};
};
...
...
src/ftvhelp.cpp
View file @
b5ba77eb
...
@@ -890,7 +890,7 @@ static void generateBriefDoc(FTextStream &t,Definition *def)
...
@@ -890,7 +890,7 @@ static void generateBriefDoc(FTextStream &t,Definition *def)
def
,
0
,
brief
,
FALSE
,
FALSE
,
0
,
TRUE
,
TRUE
);
def
,
0
,
brief
,
FALSE
,
FALSE
,
0
,
TRUE
,
TRUE
);
QCString
relPath
=
relativePathToRoot
(
def
->
getOutputFileBase
());
QCString
relPath
=
relativePathToRoot
(
def
->
getOutputFileBase
());
HtmlCodeGenerator
htmlGen
(
t
,
relPath
);
HtmlCodeGenerator
htmlGen
(
t
,
relPath
);
HtmlDocVisitor
*
visitor
=
new
HtmlDocVisitor
(
t
,
htmlGen
,
def
,
0
);
HtmlDocVisitor
*
visitor
=
new
HtmlDocVisitor
(
t
,
htmlGen
,
def
);
root
->
accept
(
visitor
);
root
->
accept
(
visitor
);
delete
visitor
;
delete
visitor
;
delete
root
;
delete
root
;
...
...
src/htmldocvisitor.cpp
View file @
b5ba77eb
...
@@ -136,9 +136,9 @@ static QString htmlAttribsToString(const HtmlAttribList &attribs)
...
@@ -136,9 +136,9 @@ static QString htmlAttribsToString(const HtmlAttribList &attribs)
//-------------------------------------------------------------------------
//-------------------------------------------------------------------------
HtmlDocVisitor
::
HtmlDocVisitor
(
FTextStream
&
t
,
CodeOutputInterface
&
ci
,
HtmlDocVisitor
::
HtmlDocVisitor
(
FTextStream
&
t
,
CodeOutputInterface
&
ci
,
Definition
*
ctx
,
MemberDef
*
md
)
Definition
*
ctx
)
:
DocVisitor
(
DocVisitor_Html
),
m_t
(
t
),
m_ci
(
ci
),
m_insidePre
(
FALSE
),
:
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
();
if
(
ctx
)
m_langExt
=
ctx
->
getDefFileExtension
();
}
}
...
...
src/htmldocvisitor.h
View file @
b5ba77eb
...
@@ -33,7 +33,7 @@ class CodeOutputInterface;
...
@@ -33,7 +33,7 @@ class CodeOutputInterface;
class
HtmlDocVisitor
:
public
DocVisitor
class
HtmlDocVisitor
:
public
DocVisitor
{
{
public
:
public
:
HtmlDocVisitor
(
FTextStream
&
t
,
CodeOutputInterface
&
ci
,
Definition
*
ctx
,
MemberDef
*
md
);
HtmlDocVisitor
(
FTextStream
&
t
,
CodeOutputInterface
&
ci
,
Definition
*
ctx
);
//--------------------------------------
//--------------------------------------
// visitor functions for leaf nodes
// visitor functions for leaf nodes
...
@@ -165,7 +165,6 @@ class HtmlDocVisitor : public DocVisitor
...
@@ -165,7 +165,6 @@ class HtmlDocVisitor : public DocVisitor
bool
m_hide
;
bool
m_hide
;
QStack
<
bool
>
m_enabled
;
QStack
<
bool
>
m_enabled
;
Definition
*
m_ctx
;
Definition
*
m_ctx
;
MemberDef
*
m_md
;
QCString
m_langExt
;
QCString
m_langExt
;
};
};
...
...
src/htmlgen.cpp
View file @
b5ba77eb
...
@@ -2748,9 +2748,9 @@ void HtmlGenerator::endParamList()
...
@@ -2748,9 +2748,9 @@ void HtmlGenerator::endParamList()
t
<<
"</dl>"
;
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
);
n
->
accept
(
visitor
);
delete
visitor
;
delete
visitor
;
}
}
...
...
src/pagedef.h
View file @
b5ba77eb
...
@@ -70,7 +70,6 @@ class PageDef : public Definition
...
@@ -70,7 +70,6 @@ class PageDef : public Definition
void
writePageDocumentation
(
OutputList
&
ol
);
void
writePageDocumentation
(
OutputList
&
ol
);
QCString
m_fileName
;
QCString
m_fileName
;
QCString
m_title
;
QCString
m_title
;
GroupDef
*
m_inGroup
;
PageSDict
*
m_subPageDict
;
// list of pages in the group
PageSDict
*
m_subPageDict
;
// list of pages in the group
Definition
*
m_pageScope
;
Definition
*
m_pageScope
;
int
m_nestingLevel
;
int
m_nestingLevel
;
...
...
src/vhdlparser.y
View file @
b5ba77eb
...
@@ -1448,7 +1448,7 @@ mark_comp: dot_name { $$=$1; }
...
@@ -1448,7 +1448,7 @@ mark_comp: dot_name { $$=$1; }
comp_1: t_LeftParen t_Identifier t_RightParen { $$="("+$2+")"; }
comp_1: t_LeftParen t_Identifier t_RightParen { $$="("+$2+")"; }
vcomp_stat: t_CONFIGURATION { $$="configurtion";yyLineNr=s_str.iLine; }
vcomp_stat: t_CONFIGURATION { $$="configur
a
tion";yyLineNr=s_str.iLine; }
vcomp_stat: t_ENTITY { $$="entity";yyLineNr=s_str.iLine; }
vcomp_stat: t_ENTITY { $$="entity";yyLineNr=s_str.iLine; }
vcomp_stat: t_COMPONENT { $$="component";yyLineNr=s_str.iLine; }
vcomp_stat: t_COMPONENT { $$="component";yyLineNr=s_str.iLine; }
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment