summaryrefslogtreecommitdiffstats
path: root/src/classdef.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-01-19 12:40:36 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-01-19 12:40:36 (GMT)
commita9f93437b6b2b9686e1b4f2e691782c6ebe99c26 (patch)
tree73954c82fd10611ace85b0bd53f2fb1caad53c72 /src/classdef.cpp
parent9214d84a513a34f9e6137ee779c528504790e58d (diff)
downloadDoxygen-a9f93437b6b2b9686e1b4f2e691782c6ebe99c26.zip
Doxygen-a9f93437b6b2b9686e1b4f2e691782c6ebe99c26.tar.gz
Doxygen-a9f93437b6b2b9686e1b4f2e691782c6ebe99c26.tar.bz2
Fixed issues with SEPARATE_MEMBER_PAGES and INLINE_SIMPLE_STRUCTS
Diffstat (limited to 'src/classdef.cpp')
-rw-r--r--src/classdef.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp
index b8501ad..419e387 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -3410,10 +3410,11 @@ QCString ClassDef::compoundTypeString() const
QCString ClassDef::getOutputFileBase() const
{
- if (!Doxygen::generatingXmlOutput)
+ static bool inlineGroupedClasses = Config_getBool("INLINE_GROUPED_CLASSES");
+ static bool inlineSimpleClasses = Config_getBool("INLINE_SIMPLE_STRUCTS");
+ static bool separateMemberPages = Config_getBool("SEPARATE_MEMBER_PAGES");
+ if (!Doxygen::generatingXmlOutput && !separateMemberPages)
{
- static bool inlineGroupedClasses = Config_getBool("INLINE_GROUPED_CLASSES");
- static bool inlineSimpleClasses = Config_getBool("INLINE_SIMPLE_STRUCTS");
Definition *scope=0;
if (inlineGroupedClasses && partOfGroups()!=0)
{