diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2014-01-18 10:59:12 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-01-18 10:59:12 (GMT) |
commit | 56deb9cc29c501e3429cec07ec159cf1a6dd3dfe (patch) | |
tree | 873a5254d4551284d50421774c3bcbc19a133c06 /src | |
parent | 31505eb34565b2e39d113b7f5460645d02ad6d2e (diff) | |
parent | 76833018f203368d012b473913d9f898ef104869 (diff) | |
download | Doxygen-56deb9cc29c501e3429cec07ec159cf1a6dd3dfe.zip Doxygen-56deb9cc29c501e3429cec07ec159cf1a6dd3dfe.tar.gz Doxygen-56deb9cc29c501e3429cec07ec159cf1a6dd3dfe.tar.bz2 |
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src')
-rw-r--r-- | src/sqlite3gen.cpp | 30 | ||||
-rw-r--r-- | src/util.cpp | 4 |
2 files changed, 20 insertions, 14 deletions
diff --git a/src/sqlite3gen.cpp b/src/sqlite3gen.cpp index d22d915..94afed7 100644 --- a/src/sqlite3gen.cpp +++ b/src/sqlite3gen.cpp @@ -708,14 +708,15 @@ static void generateSqlite3ForMember(sqlite3*db,MemberDef *md,Definition *def) if (id_bfile == -1) { sqlite3_clear_bindings(i_s_memberdef); - return; } + else + { + bindIntParameter(i_s_memberdef,":id_ibfile",id_bfile); + bindIntParameter(i_s_memberdef,":bline",md->getStartBodyLine()); - bindIntParameter(i_s_memberdef,":id_ibfile",id_bfile); - bindIntParameter(i_s_memberdef,":bline",md->getStartBodyLine()); - - // XXX implement getStartBodyColumn - bindIntParameter(i_s_memberdef,":bcolumn",1); + // XXX implement getStartBodyColumn + bindIntParameter(i_s_memberdef,":bcolumn",1); + } } } } @@ -724,7 +725,7 @@ static void generateSqlite3ForMember(sqlite3*db,MemberDef *md,Definition *def) { sqlite3_clear_bindings(i_s_memberdef); } - /*int id_src =*/ sqlite3_last_insert_rowid(db); + sqlite3_last_insert_rowid(db); // + source references // The cross-references in initializers only work when both the src and dst @@ -825,8 +826,9 @@ static void generateSqlite3ForClass(sqlite3 *db, ClassDef *cd) bindIntParameter(i_s_compounddef,":line",cd->getDefLine()); bindIntParameter(i_s_compounddef,":column",cd->getDefColumn()); - if (-1==step(db,i_s_compounddef)) - return; + if (-1==step(db,i_s_compounddef)) { + sqlite3_clear_bindings(i_s_compounddef); + } // + list of direct super classes if (cd->baseClasses()) @@ -848,8 +850,10 @@ static void generateSqlite3ForClass(sqlite3 *db, ClassDef *cd) bindTextParameter(i_s_basecompoundref,":base",bcd->classDef->displayName()); } bindTextParameter(i_s_basecompoundref,":derived",cd->displayName()); - if (-1==step(db,i_s_basecompoundref)) + if (-1==step(db,i_s_basecompoundref)) { + sqlite3_clear_bindings(i_s_basecompoundref); continue; + } } } @@ -865,8 +869,10 @@ static void generateSqlite3ForClass(sqlite3 *db, ClassDef *cd) bindTextParameter(i_s_derivedcompoundref,":refid",bcd->classDef->getOutputFileBase()); bindIntParameter(i_s_derivedcompoundref,":prot",bcd->prot); bindIntParameter(i_s_derivedcompoundref,":virt",bcd->virt); - if (-1==step(db,i_s_derivedcompoundref)) + if (-1==step(db,i_s_derivedcompoundref)) { + sqlite3_reset(i_s_derivedcompoundref); continue; + } } } @@ -888,7 +894,7 @@ static void generateSqlite3ForClass(sqlite3 *db, ClassDef *cd) bindIntParameter(i_s_includes,":id_src",id_file); bindTextParameter(i_s_includes,":dst",nm); if (-1==step(db,i_s_includes)) - return; + sqlite3_clear_bindings(i_s_basecompoundref); } } } diff --git a/src/util.cpp b/src/util.cpp index a4600d1..91f6fda 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -5765,7 +5765,7 @@ QCString convertCharEntitiesToUTF8(const QCString &s) entityMap.insert("delta", "\xCE\xB4"); entityMap.insert("epsilon", "\xCE\xB5"); entityMap.insert("zeta", "\xCE\xB6"); - entityMap.insert("eta", "\xCE\xB8"); + entityMap.insert("eta", "\xCE\xB7"); entityMap.insert("theta", "\xCE\xB8"); entityMap.insert("iota", "\xCE\xB9"); entityMap.insert("kappa", "\xCE\xBA"); @@ -5786,7 +5786,7 @@ QCString convertCharEntitiesToUTF8(const QCString &s) entityMap.insert("sect", "\xC2\xA7"); entityMap.insert("deg", "\xC2\xB0"); entityMap.insert("prime", "\xE2\x80\xB2"); - entityMap.insert("Prime", "\xE2\x80\xB2"); + entityMap.insert("Prime", "\xE2\x80\xB3"); entityMap.insert("infin", "\xE2\x88\x9E"); entityMap.insert("empty", "\xE2\x88\x85"); entityMap.insert("plusmn", "\xC2\xB1"); |