From 8a7647bd12f383730c886b34c431ae976ec5ff83 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Mon, 24 Feb 2020 14:46:26 +0100
Subject: issue #7583 External Links in Inheritance Diagrams open in the Image
 Frame.

When having a function it opens in the current frame and uses the complete frame. Images (e.g. inherited diagrams) are displayed in a small "sub frame" and when displaying the link here it is not readable and furthermore the user doesn't know anything about the "sub frame". In case of an image the link should be displayed in the parent frame of the image.
---
 src/diagram.cpp        | 2 +-
 src/dotfilepatcher.cpp | 2 +-
 src/util.cpp           | 9 +++++++--
 src/util.h             | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

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 25ca13e..92f593c 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -8163,10 +8163,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)
diff --git a/src/util.h b/src/util.h
index b9628e9..19827b5 100644
--- a/src/util.h
+++ b/src/util.h
@@ -437,7 +437,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);
-- 
cgit v0.12


From 57662b4051d9c861e089072ed3dc6409f81ff3f7 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Thu, 27 Feb 2020 13:56:11 +0100
Subject: Problem with temporary / intermediate directory  in doxyparse

When we want to use doxyparse under Windows we get the message like:
```
error: tag OUTPUT_DIRECTORY: Output directory '/tmp/doxyparse-9848' does not exist and cannot be created
```
as this is a *nix type path and the '/tmp', normally doesn't exists on Windows, better to see what is the real temporary directory (on all systems) and make everything system independent.
---
 addon/doxyparse/doxyparse.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 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;
-- 
cgit v0.12


From 5a0cfa3bd29d8643c7744d03d8fba4ae990aa260 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Thu, 27 Feb 2020 14:14:57 +0100
Subject: Problem in case using PREDEFINED with comma and using +=

In pull request #7603 the problem regarding `PREDEFINED = A(x,y)`, but the same patch must be applied to the construct `PREDEFINED += A(x,y)`
---
 src/configimpl.l | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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:
-- 
cgit v0.12