diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2015-01-03 19:08:51 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2015-01-03 19:08:51 (GMT) |
commit | fcc8e1f75c7c1a2ccb5ab6e42d3b6843589dc764 (patch) | |
tree | 94d0c995b22ac3deebdeec838992be6c1e7b1f8c /src | |
parent | 70afeb96108b77cb68de746b3037cc775b00a45b (diff) | |
parent | d03e4c2ae1864c6f27a4341449ce97133aeb6847 (diff) | |
download | Doxygen-fcc8e1f75c7c1a2ccb5ab6e42d3b6843589dc764.zip Doxygen-fcc8e1f75c7c1a2ccb5ab6e42d3b6843589dc764.tar.gz Doxygen-fcc8e1f75c7c1a2ccb5ab6e42d3b6843589dc764.tar.bz2 |
Merge pull request #272 from albert-github/feature/bug_unused
Remove unused local and static global variables
Diffstat (limited to 'src')
-rw-r--r-- | src/cite.cpp | 1 | ||||
-rw-r--r-- | src/classdef.cpp | 1 | ||||
-rw-r--r-- | src/code.l | 1 | ||||
-rw-r--r-- | src/config.l | 8 | ||||
-rw-r--r-- | src/declinfo.l | 1 | ||||
-rw-r--r-- | src/dirdef.cpp | 3 | ||||
-rw-r--r-- | src/docbookgen.cpp | 5 | ||||
-rw-r--r-- | src/docbookvisitor.cpp | 1 | ||||
-rw-r--r-- | src/docparser.cpp | 4 | ||||
-rw-r--r-- | src/dot.cpp | 10 | ||||
-rw-r--r-- | src/doxygen.cpp | 2 | ||||
-rw-r--r-- | src/filedef.cpp | 2 | ||||
-rw-r--r-- | src/fortranscanner.l | 1 | ||||
-rw-r--r-- | src/htags.cpp | 1 | ||||
-rw-r--r-- | src/htmldocvisitor.cpp | 1 | ||||
-rw-r--r-- | src/index.cpp | 1 | ||||
-rw-r--r-- | src/mangen.cpp | 1 | ||||
-rw-r--r-- | src/markdown.cpp | 1 | ||||
-rw-r--r-- | src/memberdef.cpp | 1 | ||||
-rw-r--r-- | src/msc.cpp | 2 | ||||
-rw-r--r-- | src/perlmodgen.cpp | 1 | ||||
-rw-r--r-- | src/portable.cpp | 5 | ||||
-rw-r--r-- | src/pycode.l | 1 | ||||
-rw-r--r-- | src/pyscanner.l | 3 | ||||
-rw-r--r-- | src/scanner.l | 8 | ||||
-rw-r--r-- | src/searchindex.cpp | 2 | ||||
-rw-r--r-- | src/tclscanner.l | 5 | ||||
-rw-r--r-- | src/template.cpp | 1 | ||||
-rw-r--r-- | src/util.cpp | 4 | ||||
-rw-r--r-- | src/vhdlcode.l | 6 | ||||
-rw-r--r-- | src/vhdldocgen.cpp | 21 | ||||
-rw-r--r-- | src/vhdljjparser.cpp | 6 | ||||
-rw-r--r-- | src/xmldocvisitor.cpp | 2 |
33 files changed, 12 insertions, 101 deletions
diff --git a/src/cite.cpp b/src/cite.cpp index e42a6d6..2ea6300 100644 --- a/src/cite.cpp +++ b/src/cite.cpp @@ -63,7 +63,6 @@ void CiteDict::writeLatexBibliography(FTextStream &t) t << "\\bibliographystyle{" << style << "}\n" "\\bibliography{"; QStrList &citeDataList = Config_getList("CITE_BIB_FILES"); - QCString latexOutputDir = Config_getString("LATEX_OUTPUT")+"/"; int i = 0; const char *bibdata = citeDataList.first(); while (bibdata) diff --git a/src/classdef.cpp b/src/classdef.cpp index 5c42f57..c69a6ab 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -4031,7 +4031,6 @@ int ClassDef::countMemberDeclarations(MemberListType lt,ClassDef *inheritedFrom, static bool inlineInheritedMembers = Config_getBool("INLINE_INHERITED_MEMB"); if (!inlineInheritedMembers) // show inherited members as separate lists { - QPtrDict<void> visited(17); count+=countInheritedDecMembers(lt,inheritedFrom,invert,showAlways,visitedClasses); } } @@ -1236,7 +1236,6 @@ static void generateMemberLink(CodeOutputInterface &ol,const QCString &varName, { int vi; QCString vn=varName; - QCString scope; if ((vi=vn.findRev("::"))!=-1 || (vi=vn.findRev('.'))!=-1) // explicit scope A::b(), probably static member { ClassDef *jcd = getClass(vn.left(vi)); diff --git a/src/config.l b/src/config.l index 2adbbc7..a10626e 100644 --- a/src/config.l +++ b/src/config.l @@ -431,19 +431,11 @@ static bool *b=0; static QStrList *l=0; static int lastState; static QCString elemStr; -static QCString includeName; static QStrList includePathList; static QStack<ConfigFileState> includeStack; static int includeDepth; static bool config_upd = FALSE; -static QCString tabSizeString; -static QCString maxInitLinesString; -static QCString colsInAlphaIndexString; -static QCString enumValuesPerLineString; -static QCString treeViewWidthString; -static QCString maxDotGraphWidthString; -static QCString maxDotGraphHeightString; static QCString encoding; static Config *config; diff --git a/src/declinfo.l b/src/declinfo.l index f238be3..a90077e 100644 --- a/src/declinfo.l +++ b/src/declinfo.l @@ -45,7 +45,6 @@ static QCString funcTempList; static QCString type; static QCString name; static QCString args; -static QCString tmpType; static int sharpCount; static bool classTempListFound; static bool funcTempListFound; diff --git a/src/dirdef.cpp b/src/dirdef.cpp index 37b4c55..067daa0 100644 --- a/src/dirdef.cpp +++ b/src/dirdef.cpp @@ -80,8 +80,6 @@ void DirDef::addFile(FileDef *fd) static QCString encodeDirName(const QCString &anchor) { - QCString result; - // convert to md5 hash uchar md5_sig[16]; QCString sigStr(33); @@ -90,6 +88,7 @@ static QCString encodeDirName(const QCString &anchor) return sigStr; // old algorithm +// QCString result; // int l = anchor.length(),i; // for (i=0;i<l;i++) diff --git a/src/docbookgen.cpp b/src/docbookgen.cpp index edcafdb..8530f31 100644 --- a/src/docbookgen.cpp +++ b/src/docbookgen.cpp @@ -589,11 +589,9 @@ static void generateDocbookForMember(MemberDef *md,FTextStream &t,Definition *de t << "_1" << md->anchor() << "\">" << convertToXML(md->name()) << "</link>"; t << " (" << endl; ArgumentList *declAl = md->declArgumentList(); - ArgumentList *defAl = md->argumentList(); if (declAl && declAl->count()>0) { ArgumentListIterator declAli(*declAl); - ArgumentListIterator defAli(*defAl); Argument *a; int cnt=0; for (declAli.toFirst();(a=declAli.current());++declAli) @@ -812,7 +810,7 @@ static void generateDocbookForMember(MemberDef *md,FTextStream &t,Definition *de } } -static void generateDocbookSection(Definition *d,FTextStream &t,MemberList *ml,const char *kind, +static void generateDocbookSection(Definition *d,FTextStream &t,MemberList *ml,const char *, bool detailed=0, const char *header=0,const char *documentation=0) { if (ml==0) return; @@ -820,7 +818,6 @@ static void generateDocbookSection(Definition *d,FTextStream &t,MemberList *ml,c MemberDef *md; int count=0; int doc_count=0; - QCString compkind = kind; QCString title, desctitle; for (mli.toFirst();(md=mli.current());++mli) diff --git a/src/docbookvisitor.cpp b/src/docbookvisitor.cpp index 90262e3..29b3ea5 100644 --- a/src/docbookvisitor.cpp +++ b/src/docbookvisitor.cpp @@ -1326,7 +1326,6 @@ void DocbookDocVisitor::writeDotFile(const QCString &baseName, DocVerbatim *s) shortName=shortName.right(shortName.length()-i-1); } QCString outDir = Config_getString("DOCBOOK_OUTPUT"); - QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); writeDotGraphFromFile(baseName+".dot",outDir,shortName,GOF_BITMAP); visitPreStart(m_t, s->hasCaption(), baseName + ".dot", s->width(),s->height()); visitCaption(this, s->children()); diff --git a/src/docparser.cpp b/src/docparser.cpp index 540eb91..5208bbe 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -846,7 +846,6 @@ static int handleStyleArgument(DocNode *parent,QList<DocNode> &children, const QCString &cmdName) { DBG(("handleStyleArgument(%s)\n",qPrint(cmdName))); - QCString tokenName = g_token->name; int tok=doctokenizerYYlex(); if (tok!=TK_WHITESPACE) { @@ -1180,7 +1179,6 @@ static void handleParameterType(DocNode *parent,QList<DocNode> &children,const Q { QCString name = g_token->name; int p=0,i; - QCString type; while ((i=paramTypes.find('|',p))!=-1) { g_token->name = paramTypes.mid(p,i-p); @@ -2139,7 +2137,6 @@ DocXRefItem::DocXRefItem(DocNode *parent,int id,const char *key) : bool DocXRefItem::parse() { - QCString listName; RefList *refList = Doxygen::xrefLists->find(m_key); if (refList && ( @@ -2573,7 +2570,6 @@ DocCite::DocCite(DocNode *parent,const QCString &target,const QCString &) //cont { static uint numBibFiles = Config_getList("CITE_BIB_FILES").count(); m_parent = parent; - QCString anchor; //printf("DocCite::DocCite(target=%s)\n",target.data()); ASSERT(!target.isEmpty()); m_relPath = g_relPath; diff --git a/src/dot.cpp b/src/dot.cpp index 20dd1e6..036cc86 100644 --- a/src/dot.cpp +++ b/src/dot.cpp @@ -156,8 +156,6 @@ static const char svgZoomFooter[] = //-------------------------------------------------------------------- -static const int maxCmdLine = 40960; - /*! mapping from protection levels to color names */ static const char *normalEdgeColorMap[] = { @@ -3148,8 +3146,6 @@ QCString DotClassGraph::writeGraph(FTextStream &out, regenerate=TRUE; if (graphFormat==GOF_BITMAP) // run dot to create a bitmap image { - QCString dotArgs(maxCmdLine); - DotRunner *dotRun = new DotRunner(absDotName, d.absPath().data(),TRUE,absImgName); dotRun->addJob(imgExt,absImgName); @@ -3507,7 +3503,6 @@ QCString DotInclDepGraph::writeGraph(FTextStream &out, if (graphFormat==GOF_BITMAP) { // run dot to create a bitmap image - QCString dotArgs(maxCmdLine); DotRunner *dotRun = new DotRunner(absDotName,d.absPath().data(),TRUE,absImgName); dotRun->addJob(imgExt,absImgName); if (generateImageMap) dotRun->addJob(MAP_CMD,absMapName); @@ -3820,7 +3815,6 @@ QCString DotCallGraph::writeGraph(FTextStream &out, GraphOutputFormat graphForma if (graphFormat==GOF_BITMAP) { // run dot to create a bitmap image - QCString dotArgs(maxCmdLine); DotRunner *dotRun = new DotRunner(absDotName,d.absPath().data(),TRUE,absImgName); dotRun->addJob(imgExt,absImgName); if (generateImageMap) dotRun->addJob(MAP_CMD,absMapName); @@ -3985,7 +3979,6 @@ QCString DotDirDeps::writeGraph(FTextStream &out, if (graphFormat==GOF_BITMAP) { // run dot to create a bitmap image - QCString dotArgs(maxCmdLine); DotRunner *dotRun = new DotRunner(absDotName,d.absPath().data(),TRUE,absImgName); dotRun->addJob(imgExt,absImgName); if (generateImageMap) dotRun->addJob(MAP_CMD,absMapName); @@ -4513,7 +4506,6 @@ QCString DotGroupCollaboration::writeGraph( FTextStream &t, QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); QCString baseName = m_diskName; QCString imgName = baseName+"."+imgExt; - QCString mapName = baseName+".map"; QCString absPath = d.absPath().data(); QCString absBaseName = absPath+"/"+baseName; QCString absDotName = absBaseName+".dot"; @@ -4540,8 +4532,6 @@ QCString DotGroupCollaboration::writeGraph( FTextStream &t, if (graphFormat==GOF_BITMAP) // run dot to create a bitmap image { - QCString dotArgs(maxCmdLine); - DotRunner *dotRun = new DotRunner(absDotName,d.absPath().data(),FALSE); dotRun->addJob(imgExt,absImgName); if (writeImageMap) dotRun->addJob(MAP_CMD,absMapName); diff --git a/src/doxygen.cpp b/src/doxygen.cpp index b1b7c08..30ee02b 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -2458,7 +2458,6 @@ static MemberDef *addVariableToFile( // see if the function is inside a namespace NamespaceDef *nd = 0; - QCString nscope; if (!scope.isEmpty()) { if (scope.find('@')!=-1) return 0; // anonymous scope! @@ -5493,7 +5492,6 @@ static bool findGlobalMember(EntryNav *rootNav, { Debug::print(Debug::FindMembers,0,"4. Try to add member `%s' to scope `%s'\n", md->name().data(),namespaceName.data()); - QCString nsName = nd ? nd->name().data() : ""; NamespaceDef *rnd = 0; if (!namespaceName.isEmpty()) rnd = Doxygen::namespaceSDict->find(namespaceName); diff --git a/src/filedef.cpp b/src/filedef.cpp index dd97c1c..c582a4b 100644 --- a/src/filedef.cpp +++ b/src/filedef.cpp @@ -1296,7 +1296,6 @@ void FileDef::addIncludedUsingDirectives() visited=TRUE; //printf("( FileDef::addIncludedUsingDirectives for file %s\n",name().data()); - NamespaceList nl; if (m_includeList) // file contains #includes { { @@ -1542,7 +1541,6 @@ static Directory *findDirNode(Directory *root,const QCString &name) static void mergeFileDef(Directory *root,FileDef *fd) { - QCString rootPath = root->name(); QCString filePath = fd->absFilePath(); //printf("merging %s\n",filePath.data()); Directory *dirNode = findDirNode(root,filePath); diff --git a/src/fortranscanner.l b/src/fortranscanner.l index 1ffd987..3c35a7d 100644 --- a/src/fortranscanner.l +++ b/src/fortranscanner.l @@ -165,7 +165,6 @@ static ScanVar v_type = V_IGNORE; // type of parsed variable static QList<Entry> moduleProcedures; // list of all interfaces which contain unresolved // module procedures static QCString docBlock; -static QCString docBlockName; static bool docBlockInBody = FALSE; static bool docBlockJavaStyle; diff --git a/src/htags.cpp b/src/htags.cpp index cbf4aa8..9535be7 100644 --- a/src/htags.cpp +++ b/src/htags.cpp @@ -105,7 +105,6 @@ bool Htags::execute(const QCString &htmldir) bool Htags::loadFilemap(const QCString &htmlDir) { QCString fileMapName = htmlDir+"/HTML/FILEMAP"; - QCString fileMap; QFileInfo fi(fileMapName); /* * Construct FILEMAP dictionary using QDict. diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index cd6b635..ebef0d4 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -1063,7 +1063,6 @@ void HtmlDocVisitor::visitPost(DocPara *p) } } - QCString context; // if the last element of a paragraph is something that should be outside of // the paragraph (<ul>,<dl>,<table>) then that will already have ended the // paragraph and we don't need to do it here diff --git a/src/index.cpp b/src/index.cpp index bc0b48e..9f7542f 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -1601,7 +1601,6 @@ static void writeAnnotatedClassList(OutputList &ol) } if (cd->isLinkableInProject() && cd->templateMaster()==0) { - QCString type=cd->compoundTypeString(); ol.startIndexKey(); if (cd->getLanguage()==SrcLangExt_VHDL) { diff --git a/src/mangen.cpp b/src/mangen.cpp index dc02ccf..b5c2d4d 100644 --- a/src/mangen.cpp +++ b/src/mangen.cpp @@ -107,7 +107,6 @@ ManGenerator::~ManGenerator() void ManGenerator::init() { - QCString ext = getExtension(); QCString &manOutput = Config_getString("MAN_OUTPUT"); QDir d(manOutput); diff --git a/src/markdown.cpp b/src/markdown.cpp index 414aa19..ee66127 100644 --- a/src/markdown.cpp +++ b/src/markdown.cpp @@ -810,7 +810,6 @@ static int processLink(GrowBuf &out,const char *data,int,int size) { return 0; } - static QRegExp re("^[@\\]ref "); if (isToc) // special case for [TOC] { if (g_current) g_current->stat=TRUE; diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 375260e..9198960 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -2553,7 +2553,6 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, QCString cname = container->name(); QCString cfname = getOutputFileBase(); - QCString cfiname = container->getOutputFileBase(); // get member name QCString doxyName=name(); diff --git a/src/msc.cpp b/src/msc.cpp index f9e919c..3dd8841 100644 --- a/src/msc.cpp +++ b/src/msc.cpp @@ -169,7 +169,6 @@ QCString getMscImageMapFromFile(const QCString& inFile, const QCString& outDir, QCString mscExe = Config_getString("MSCGEN_PATH")+"mscgen"+portable_commandExtension(); QCString mscArgs = "-T ismap -i \""; mscArgs+=inFile; - QFileInfo fi(inFile); mscArgs+="\" -o \""; mscArgs+=outFile + "\""; @@ -201,7 +200,6 @@ void writeMscImageMapFromFile(FTextStream &t,const QCString &inFile, ) { QCString mapName = baseName+".map"; - QCString mapFile = inFile+".map"; t << "<img src=\"" << relPath << baseName << "."; switch (format) { diff --git a/src/perlmodgen.cpp b/src/perlmodgen.cpp index c636cdf..c903d3d 100644 --- a/src/perlmodgen.cpp +++ b/src/perlmodgen.cpp @@ -1371,7 +1371,6 @@ void PerlModDocVisitor::visitPost(DocParBlock *) static void addTemplateArgumentList(ArgumentList *al,PerlModOutput &output,const char *) { - QCString indentStr; if (!al) return; output.openList("template_parameters"); diff --git a/src/portable.cpp b/src/portable.cpp index 7f6be6e..ff29303 100644 --- a/src/portable.cpp +++ b/src/portable.cpp @@ -194,7 +194,10 @@ uint portable_pid() return pid; } -static char **last_environ; +#if defined(_WIN32) && !defined(__CYGWIN__) +#else + static char **last_environ; +#endif void portable_setenv(const char *name,const char *value) { diff --git a/src/pycode.l b/src/pycode.l index 585b587..4f9e396 100644 --- a/src/pycode.l +++ b/src/pycode.l @@ -79,7 +79,6 @@ static int g_paramParens; static bool g_exampleBlock; static QCString g_exampleName; -static QCString g_exampleFile; static QCString g_type; static QCString g_name; diff --git a/src/pyscanner.l b/src/pyscanner.l index 1ac7b7a..6b68849 100644 --- a/src/pyscanner.l +++ b/src/pyscanner.l @@ -83,7 +83,6 @@ static Specifier virt; static int docBlockContext; static QCString docBlock; -static QCString docBlockName; static bool docBlockInBody; static bool docBlockJavaStyle; static bool docBrief; @@ -97,7 +96,6 @@ static int g_indent = 0; static int g_curIndent = 0; static QDict<QCString> g_packageNameCache(257); -static QCString g_packageScope; static char g_atomStart; static char g_atomEnd; @@ -931,7 +929,6 @@ STARTDOCSYMS "##" "=" { // default value // TODO: this rule is too simple, need to be able to // match things like =")" as well! - QCString defVal=&yytext[1]; g_defVal.resize(0); g_braceCount=0; BEGIN(FunctionParamDefVal); diff --git a/src/scanner.l b/src/scanner.l index d012b93..821959c 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -83,7 +83,6 @@ static int roundCount = 0 ; static int curlyCount = 0 ; static int squareCount = 0 ; static int padCount = 0 ; -static QCString slString; static Entry* current_root = 0 ; static Entry* global_root = 0 ; static Entry* current = 0 ; @@ -114,7 +113,6 @@ static QCString aliasName; static QCString baseName; static QCString* specName; static QCString formulaText; -static QCString formulaEnd; static bool useOverrideCommands = FALSE; static SrcLangExt language; @@ -162,13 +160,7 @@ static bool needsSemi; //static int depthIf; static int initBracketCount; -static QCString memberGroupRelates; -static QCString memberGroupInside; -static QCString xrefItemKey; -static QCString xrefItemTitle; -static QCString xrefListTitle; -static QCString g_skipBlockName; static QCString oldStyleArgType; static QCString docBackup; static QCString briefBackup; diff --git a/src/searchindex.cpp b/src/searchindex.cpp index 22727fe..d8ec491 100644 --- a/src/searchindex.cpp +++ b/src/searchindex.cpp @@ -310,7 +310,6 @@ void SearchIndex::write(const char *fileName) padding = size - padding; //int statsOffset = size; - QDictIterator<IndexWord> wdi(m_words); //IndexWord *iw; int *wordStatOffsets = new int[m_words.count()]; @@ -1077,7 +1076,6 @@ void writeJavascriptSearchIndex() for (li.toFirst();(dl=li.current());++li) { Definition *d = dl->getFirst(); - QCString id = d->localName(); if (!firstEntry) { diff --git a/src/tclscanner.l b/src/tclscanner.l index 198fd85..6ad2e26 100644 --- a/src/tclscanner.l +++ b/src/tclscanner.l @@ -1123,7 +1123,6 @@ D static tcl_scan *tcl_scan_start(char type, QString content, QCString ns, Entry *entry_cl, Entry *entry_fn) { tcl_scan *myScan=tcl.scan.at(0); - QCString myName; tcl_inf("line=%d type=%d '%s'\n",tcl.line_body0,type,content.ascii()); myScan->line1=yylineno; @@ -2298,7 +2297,7 @@ D static void tcl_command_ITCL_CLASS() { D - QCString myNs, myName, myStr; + QCString myNs, myName; Entry *myEntryCl; tcl_scan *myScan = tcl.scan.at(0); @@ -2327,7 +2326,7 @@ D static void tcl_command_OO_CLASS() { D - QCString myNs, myName, myStr; + QCString myNs, myName; //Entry *myEntryNs; Entry *myEntryCl; tcl_scan *myScan = tcl.scan.at(0); diff --git a/src/template.cpp b/src/template.cpp index a9fab94..2a73b89 100644 --- a/src/template.cpp +++ b/src/template.cpp @@ -2998,7 +2998,6 @@ class TemplateNodeRange : public TemplateNodeCreator<TemplateNodeRange> { c->push(); //int index = m_reversed ? list.count() : 0; - TemplateVariant v; const TemplateVariant *parentLoop = c->getRef("forloop"); uint index = 0; int i = m_down ? e : s; diff --git a/src/util.cpp b/src/util.cpp index 1639e0a..00173fb 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -3317,7 +3317,7 @@ static QCString getCanonicalTypeForIdentifier( { if (count>10) return word; // oops recursion - QCString symName,scope,result,templSpec,tmpName; + QCString symName,result,templSpec,tmpName; //DefinitionList *defList=0; if (tSpec && !tSpec->isEmpty()) templSpec = stripDeclKeywords(getCanonicalTemplateSpec(d,fs,*tSpec)); @@ -4111,8 +4111,6 @@ bool getDefs(const QCString &scName, if (!args) break; - QCString className = mmd->getClassDef()->name(); - ArgumentList *mmdAl = mmd->argumentList(); if (matchArguments2(mmd->getOuterScope(),mmd->getFileDef(),mmdAl, Doxygen::globalScope,mmd->getFileDef(),argList, diff --git a/src/vhdlcode.l b/src/vhdlcode.l index 5f328af..2b0841e 100644 --- a/src/vhdlcode.l +++ b/src/vhdlcode.l @@ -68,7 +68,6 @@ static bool g_startCode = FALSE; static QCString g_PrevString; static QCString g_CurrClass; static QDict<QCString>g_vhdlKeyDict; -static QCString g_tempClass; static QCString g_tempComp; static QCString g_PortMapComp; static MemberDef *g_vhdlMember; @@ -77,7 +76,6 @@ static QCString g_FuncProto; //----------------------------------------------------------- static CodeOutputInterface * g_code; -static QCString g_curClassName; static QCString g_parmType; static QCString g_parmName; static const char * g_inputString; //!< the code fragment as text @@ -90,9 +88,6 @@ static Definition *g_searchCtx; static QCString g_exampleName; static QCString g_exampleFile; -static QCString g_type; -static QCString g_name; -static QCString g_args; static QCString g_classScope; static QCString g_CurrScope; @@ -1055,7 +1050,6 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI <ClassesName>{FUNCNAME} { - QDict<QCString> mem; appStringLower(g_PrevString,vhdlcodeYYtext); g_CurrClass.resize(0); g_CurrClass.append(vhdlcodeYYtext); diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp index 093f446..170bf5b 100644 --- a/src/vhdldocgen.cpp +++ b/src/vhdldocgen.cpp @@ -70,7 +70,6 @@ static QDict<QCString> g_vhdlKeyDict0(17,FALSE); static QDict<QCString> g_vhdlKeyDict1(17,FALSE); static QDict<QCString> g_vhdlKeyDict2(17,FALSE); static QDict<QCString> g_vhdlKeyDict3(17,FALSE); -static QDict<QCString> g_xilinxUcfDict(17,FALSE); static void initUCF(Entry* root,const char* type,QCString & qcs,int line,QCString & fileName,QCString & brief); static void writeUCFLink(const MemberDef* mdef,OutputList &ol); @@ -170,7 +169,6 @@ static void createSVG() QCString dir="-o \""+ov+"/vhdl_design_overview.html\""; ov+="/vhdl_design.dot"; - QRegExp ep("[\\s]"); QCString vlargs="-Tsvg \""+ov+"\" "+dir ; if (portable_system("dot",vlargs)!=0) @@ -200,7 +198,6 @@ void VhdlDocGen::writeOverview() QCString ov =Config_getString("HTML_OUTPUT"); QCString fileName=ov+"/vhdl_design.dot"; QFile f(fileName); - QStringList qli; FTextStream t(&f); if (!f.open(IO_WriteOnly)) @@ -502,7 +499,6 @@ static QList<MemberDef>* getPorts(ClassDef *cd) static void writeTable(QList<MemberDef>* port,FTextStream & t) { - QCString space(" "); MemberDef *md; uint len=port->count(); @@ -712,7 +708,6 @@ ClassDef *VhdlDocGen::getClass(const char *name) ClassDef* VhdlDocGen::getPackageName(const QCString & name) { ClassDef* cd=0; - QStringList ql=QStringList::split(".",name,FALSE); cd=getClass(name); return cd; @@ -1123,7 +1118,6 @@ ClassDef* VhdlDocGen::findArchitecture(const ClassDef *cd) void VhdlDocGen::writeVhdlLink(const ClassDef* ccd ,OutputList& ol,QCString& type,QCString& nn,QCString& behav) { if (ccd==0) return; - QCString temp=ccd->getOutputFileBase(); ol.startBold(); ol.docify(type.data()); ol.endBold(); @@ -1181,7 +1175,6 @@ void VhdlDocGen::parseFuncProto(const char* text,QList<Argument>& qlist, if ((end-index)>0) { - QCString tt=s1.mid(index,(end-index+1)); temp=s1.mid(index+1,(end-index-1)); //getFuncParams(qlist,temp); } @@ -1816,8 +1809,6 @@ static void setGlobalType(MemberList *ml) MemberListIterator mmli(*ml); for ( ; (mdd=mmli.current()); ++mmli ) { - QCString l=mdd->typeString(); - if (qstrcmp(mdd->argsString(),"package")==0) { mdd->setMemberSpecifiers(VhdlDocGen::INSTANTIATION); @@ -1978,11 +1969,8 @@ void VhdlDocGen::writeVHDLDeclaration(MemberDef* mdef,OutputList &ol, ClassDef *cd,NamespaceDef *nd,FileDef *fd,GroupDef *gd, bool /*inGroup*/) { - static QRegExp reg("[%]"); - Definition *d=0; - ASSERT(cd!=0 || nd!=0 || fd!=0 || gd!=0 || mdef->getMemberSpecifiers()==VhdlDocGen::LIBRARY || mdef->getMemberSpecifiers()==VhdlDocGen::USE @@ -2657,7 +2645,6 @@ void VhdlDocGen::parseUCF(const char* input, Entry* entity,QCString fileName,b { QCString ucFile(input); int lineNo=0; - QCString newLine="\n"; QCString comment("#!"); QCString brief; @@ -2713,7 +2700,6 @@ void VhdlDocGen::parseUCF(const char* input, Entry* entity,QCString fileName,b static void initUCF(Entry* root,const char* type,QCString & qcs,int line,QCString & fileName,QCString & brief) { if (qcs.isEmpty())return; - QRegExp sp("\\s"); QRegExp reg("[\\s=]"); QCString n; // bool bo=(qstricmp(type,qcs.data())==0); @@ -2836,7 +2822,6 @@ QCString VhdlDocGen::parseForConfig(QCString & entity,QCString & arch) { int index; QCString label; - QCString ent("entity"); if (!entity.contains(":")) return ""; QRegExp exp("[:()\\s]"); @@ -2926,7 +2911,7 @@ void assignBinding(VhdlConfNode * conf) QListIterator<Entry> eli(instList); Entry *cur=0; ClassDef *archClass=0,*entClass=0; - QCString archName,entityName; + QCString archName; QCString arcBind,entBind; bool others,all; @@ -2991,7 +2976,7 @@ void assignBinding(VhdlConfNode * conf) { if (cur->exception.lower()==label || conf->isInlineConf) { - QCString sign,archy; + QCString archy; if (all || others) { @@ -3993,7 +3978,6 @@ void FlowChart::writeShape(FTextStream &t,const FlowChart* fl) } t<<getNodeName(fl->id).data(); - QCString q=getNodeType(fl->type); #ifdef DEBUGFLOW QCString qq(getNodeName(fl->id).data()); @@ -4049,7 +4033,6 @@ void FlowChart::writeShape(FTextStream &t,const FlowChart* fl) { if (fl->text.isEmpty()) return; bool var=(fl->type & FlowChart::VARIABLE_NO); - QCString repl("<BR ALIGN=\"LEFT\"/>"); QCString q=fl->text; if (exit) diff --git a/src/vhdljjparser.cpp b/src/vhdljjparser.cpp index c3f8663..f3bfb62 100644 --- a/src/vhdljjparser.cpp +++ b/src/vhdljjparser.cpp @@ -437,7 +437,6 @@ void VhdlParser::addCompInst(const char *n, const char* instName, const char* co void VhdlParser::addVhdlType(const char *n,int startLine,int section, uint64 spec,const char* args,const char* type,Protection prot) { - static QRegExp reg("[\\s]"); QCString name(n); if (isFuncProcProced() || VhdlDocGen::getFlowMember()) return; @@ -540,7 +539,6 @@ void VhdlParser::pushLabel( QCString &label,QCString & val) QCString VhdlParser::popLabel(QCString & q) { - QCString u=q; int i=q.findRev("|"); if (i<0) return ""; q = q.left(i); @@ -550,8 +548,7 @@ void VhdlParser::pushLabel( QCString &label,QCString & val) void VhdlParser::addConfigureNode(const char* a,const char*b, bool,bool isLeaf,bool inlineConf) { VhdlConfNode* co=0; - QCString ent,arch,lab; - QCString l=genLabels; + QCString ent; ent=a; if (b) @@ -606,7 +603,6 @@ void VhdlParser::addProto(const char *s1,const char *s2,const char *s3, const char *s4,const char *s5,const char *s6) { (void)s5; // avoid unused warning - static QRegExp reg("[\\s]"); QCString name=s2; QStringList ql=QStringList::split(",",name,FALSE); diff --git a/src/xmldocvisitor.cpp b/src/xmldocvisitor.cpp index 65711ab..c9a6fb8 100644 --- a/src/xmldocvisitor.cpp +++ b/src/xmldocvisitor.cpp @@ -44,8 +44,6 @@ static void visitPreStart(FTextStream &t, const char *cmd, const bool doCaption, const QCString &name, bool writeType, DocImage::Type type, const QCString &width, const QCString &height) { - QCString tmpStr; - t << "<" << cmd; if (writeType) { |