diff options
| -rw-r--r-- | jquery/README | 2 | ||||
| -rw-r--r-- | src/doxygen.cpp | 6 | ||||
| -rw-r--r-- | src/portable.cpp | 1 | ||||
| -rw-r--r-- | src/sqlite3gen.cpp | 6 | ||||
| -rw-r--r-- | src/util.cpp | 2 |
5 files changed, 12 insertions, 5 deletions
diff --git a/jquery/README b/jquery/README index b2b8259..6f39c34 100644 --- a/jquery/README +++ b/jquery/README @@ -1,6 +1,6 @@ Doxygen's jquery.js script is composed of minified versions of the following packages: -- jquery 3.3.1: https://jquery.com/download/ +- jquery 3.4.1: https://jquery.com/download/ - jquery.ui 1.12.1: https://github.com/jquery/jquery-ui modules required: - jquery.ui.core all diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 84a4900..c7fce01 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -5551,7 +5551,7 @@ static bool findGlobalMember(Entry *root, NamespaceDef *rnd = 0; if (!namespaceName.isEmpty()) rnd = Doxygen::namespaceSDict->find(namespaceName); - ArgumentList *mdAl = md->argumentList(); + const ArgumentList *mdAl = const_cast<const MemberDef *>(md)->argumentList(); bool matching= (mdAl==0 && root->argList->count()==0) || md->isVariable() || md->isTypedef() || /* in case of function pointers */ @@ -6721,10 +6721,10 @@ static void findMember(Entry *root, if (rmn) { MemberNameIterator rmni(*rmn); - MemberDef *rmd; + const MemberDef *rmd; while ((rmd=rmni.current()) && !found) // see if we got another member with matching arguments { - ArgumentList *rmdAl = rmd->argumentList(); + const ArgumentList *rmdAl = rmd->argumentList(); // check for matching argument lists if ( matchArguments2(rmd->getOuterScope(),rmd->getFileDef(),rmdAl, diff --git a/src/portable.cpp b/src/portable.cpp index e2bdf6e..3d64638 100644 --- a/src/portable.cpp +++ b/src/portable.cpp @@ -463,6 +463,7 @@ void portable_correct_path(void) { #if defined(_WIN32) && !defined(__CYGWIN__) const char *p = portable_getenv("PATH"); + if (!p) return; // no path nothing to correct QCString result = substitute(p,'/','\\'); if (result!=p) portable_setenv("PATH",result.data()); #endif diff --git a/src/sqlite3gen.cpp b/src/sqlite3gen.cpp index 9805d7f..5a8e81d 100644 --- a/src/sqlite3gen.cpp +++ b/src/sqlite3gen.cpp @@ -2009,7 +2009,11 @@ static void generateSqlite3ForClass(const ClassDef *cd) if (nm.isEmpty() && ii->fileDef) nm = ii->fileDef->docName(); if (!nm.isEmpty()) { - int header_id=insertPath(ii->fileDef->absFilePath(),!ii->fileDef->isReference()); + int header_id=-1; + if (ii->fileDef) + { + insertPath(ii->fileDef->absFilePath(),!ii->fileDef->isReference()); + } DBG_CTX(("-----> ClassDef includeInfo for %s\n", nm.data())); DBG_CTX((" local : %d\n", ii->local)); DBG_CTX((" imported : %d\n", ii->imported)); diff --git a/src/util.cpp b/src/util.cpp index 338b10c..fa973ba 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -5479,6 +5479,8 @@ QCString escapeCharsInString(const char *name,bool allowDots,bool allowUnderscor case '$': growBuf.addStr("_0B"); break; case '\\': growBuf.addStr("_0C"); break; case '@': growBuf.addStr("_0D"); break; + case ']': growBuf.addStr("_0E"); break; + case '[': growBuf.addStr("_0F"); break; default: if (c<0) { |