diff options
| -rw-r--r-- | addon/doxyparse/doxyparse.cpp | 15 | ||||
| -rw-r--r-- | src/configimpl.l | 9 | ||||
| -rw-r--r-- | src/diagram.cpp | 2 | ||||
| -rw-r--r-- | src/dotfilepatcher.cpp | 2 | ||||
| -rw-r--r-- | src/util.cpp | 9 | ||||
| -rw-r--r-- | src/util.h | 2 |
6 files changed, 27 insertions, 12 deletions
diff --git a/addon/doxyparse/doxyparse.cpp b/addon/doxyparse/doxyparse.cpp index 515d2ba..78a91d3 100644 --- a/addon/doxyparse/doxyparse.cpp +++ b/addon/doxyparse/doxyparse.cpp @@ -44,6 +44,7 @@ #include <qcstring.h> #include <qregexp.h> #include "namespacedef.h" +#include "portable.h" class Doxyparse : public CodeOutputInterface { @@ -449,12 +450,14 @@ int main(int argc,char **argv) { // we need a place to put intermediate files std::ostringstream tmpdir; -#if !defined(_WIN32) || defined(__CYGWIN__) - unsigned int pid = (uint)getpid(); -#else - unsigned int pid = (uint)GetCurrentProcessId(); -#endif - tmpdir << "/tmp/doxyparse-" << pid; + unsigned int pid = Portable::pid(); + if (Portable::getenv("TMP")) + tmpdir << Portable::getenv("TMP") << "/doxyparse-" << pid; + else if (Portable::getenv("TEMP")) + tmpdir << Portable::getenv("TEMP") << "/doxyparse-" << pid; + else + tmpdir << "doxyparse-" << pid; + Config_getString(OUTPUT_DIRECTORY)= tmpdir.str().c_str(); // enable HTML (fake) output to omit warning about missing output format Config_getBool(GENERATE_HTML)=TRUE; diff --git a/src/configimpl.l b/src/configimpl.l index dfdeb4a..4ea877b 100644 --- a/src/configimpl.l +++ b/src/configimpl.l @@ -832,7 +832,14 @@ static void readIncludeFile(const char *incName) case ConfigOption::O_List: l = ((ConfigList *)option)->valueRef(); elemStr=""; - BEGIN(GetStrList); + if (cmd == "PREDEFINED") + { + BEGIN(GetStrList1); + } + else + { + BEGIN(GetStrList); + } break; case ConfigOption::O_Enum: case ConfigOption::O_String: diff --git a/src/diagram.cpp b/src/diagram.cpp index 18817e9..25b2c06 100644 --- a/src/diagram.cpp +++ b/src/diagram.cpp @@ -261,7 +261,7 @@ static void writeMapArea(FTextStream &t,const ClassDef *cd,QCString relPath, t << "<area "; if (!ref.isEmpty()) { - t << externalLinkTarget(); + t << externalLinkTarget(true); } t << "href=\""; t << externalRef(relPath,ref,TRUE); diff --git a/src/dotfilepatcher.cpp b/src/dotfilepatcher.cpp index efc6341..7a65d89 100644 --- a/src/dotfilepatcher.cpp +++ b/src/dotfilepatcher.cpp @@ -173,7 +173,7 @@ static QCString replaceRef(const QCString &buf,const QCString relPath, QCString url = link.mid(marker+1); if (!ref.isEmpty()) { - result = externalLinkTarget(); + result = externalLinkTarget(true); if (result != "") setTarget = TRUE; } result+= href+"=\""; diff --git a/src/util.cpp b/src/util.cpp index 767f44a..fae2e90 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -8145,10 +8145,15 @@ void writeSummaryLink(OutputList &ol,const char *label,const char *title, } #endif -QCString externalLinkTarget() +QCString externalLinkTarget(const bool parent) { static bool extLinksInWindow = Config_getBool(EXT_LINKS_IN_WINDOW); - if (extLinksInWindow) return "target=\"_blank\" "; else return ""; + if (extLinksInWindow) + return "target=\"_blank\" "; + else if (parent) + return "target=\"_parent\" "; + else + return ""; } QCString externalRef(const QCString &relPath,const QCString &ref,bool href) @@ -440,7 +440,7 @@ QCString filterTitle(const QCString &title); bool patternMatch(const QFileInfo &fi,const QStrList *patList); -QCString externalLinkTarget(); +QCString externalLinkTarget(const bool parent = false); QCString externalRef(const QCString &relPath,const QCString &ref,bool href); int nextUtf8CharPosition(const QCString &utf8Str,int len,int startPos); const char *writeUtf8Char(FTextStream &t,const char *s); |