Renamed options to strip and nostrip

Author: doxygen

addon/doxyapp/doxyapp.cpp

@@ -133,7 +133,7 @@ static void findXRefSymbols(FileDef *fd)
                 QCString(),
                 fileToString(fd->absFilePath()),
                 lang,
-                Config_getBool(STRIP_CODE_COMMENTS),
+                FALSE,
                 FALSE,
                 QCString(),
                 fd);

addon/doxyparse/doxyparse.cpp

@@ -106,7 +106,7 @@ static void findXRefSymbols(FileDef *fd)
 
   // parse the source code
   intf->parseCode(parseList, QCString(), fileToString(fd->absFilePath()), lang,
-                  Config_getBool(STRIP_CODE_COMMENTS), FALSE, QCString(), fd);
+                  FALSE, FALSE, QCString(), fd);
 }
 
 static bool ignoreStaticExternalCall(const MemberDef *context, const MemberDef *md) {

doc/commands.dox

@@ -2731,10 +2731,11 @@ Commands for displaying examples
   tag of Doxygen's configuration file.
 
   You can add the option `lineno` to enable line numbers for the included code if desired.
-  You can add the option `stripcodecomments` that will always hide any special comments
-  from the included code irrespective of the setting of
-  \ref cfg_strip_code_comments "STRIP_CODE_COMMENTS" or you can add the option
-  `nostripcodecomments` that will always show the special comments.
+
+  You can add the option `strip` that will always hide any special comments
+  from the included code, overruling the
+  \ref cfg_strip_code_comments "STRIP_CODE_COMMENTS" setting, or add the option
+  `nostrip` to always show the special comments.
 
   The class and member declarations and definitions inside the code fragment
   are 'remembered' during the parsing of the comment block that contained
@@ -2803,11 +2804,11 @@ Commands for displaying examples
   - The `option` `doc` can be used to treat the file as documentation rather than code.
   - The `option` `local` can be used make Doxygen interpret the code as if it was in the
                class or namespace in which the include command appears, rather than the global namespace.
-  - The `option` `stripcodecomments` can be used so that any special comment will always be hidden
-  from the included code irrespective of the setting of
-  \ref cfg_strip_code_comments "STRIP_CODE_COMMENTS" or you can use the `option`
-  `nostripcodecomments` that will always show the special comments. These options have no effect in
-  combination with the `option` `doc`.
+  - The `option` `strip` can be used to always hide any special comments
+    from the included code, overruling the
+    \ref cfg_strip_code_comments "STRIP_CODE_COMMENTS" setting, and option
+    `nostrip` can be used to always show the special comments.
+  These options have no effect in combination with the `option` `doc`.
 
   When using option `doc`, there is also the option `raise` that can be specified to raise
   all sections found in the referenced file by a certain amount. For example
@@ -2956,11 +2957,11 @@ Commands for displaying examples
  - The `option` `doc` can be used to treat the file as documentation rather than code.
  - The `option` `local` can be used make Doxygen interpret the code as if it was in the
                class or namespace in which the include command appears, rather than the global namespace.
-  - The `option` `stripcodecomments` can be used so that any special comment will always be hidden
-  from the included code irrespective of the setting of
-  \ref cfg_strip_code_comments "STRIP_CODE_COMMENTS" or you can use the `option`
-  `nostripcodecomments` that will always show the special comments. These options have no effect in
-  combination with the `option` `doc`.
+ - The `option` `strip` can be used to always hide any special comments
+   from the included code, overruling the
+   \ref cfg_strip_code_comments "STRIP_CODE_COMMENTS" setting, and option
+   `nostrip` can be used to always show the special comments.
+  These options have no effect in combination with the `option` `doc`.
 
  When using option `doc`, there is also the option `raise` that can be specified to raise
  all sections found in the referenced file by a certain amount. For example

src/docnode.cpp

@@ -3602,7 +3602,7 @@ void DocPara::handleIncludeOperator(const QCString &cmdName,DocIncOperator::Type
   auto it2 = children().size()>=2 ? std::prev(it1)              : children().end();
   DocNodeVariant *n1 = it1!=children().end() ? &(*it1) : nullptr;
   DocNodeVariant *n2 = it2!=children().end() ? &(*it2) : nullptr;
-  //TODO get from context the stripCodeComments() 
+  //TODO get from context the stripCodeComments()
   bool stripCodeComments = Config_getBool(STRIP_CODE_COMMENTS);
   children().append<DocIncOperator>(parser(),thisVariant(),t,
                                     parser()->context.token->name,
@@ -3758,8 +3758,14 @@ void DocPara::handleInclude(const QCString &cmdName,DocInclude::Type t)
       return std::find(optList.begin(),optList.end(),kw)!=optList.end();
     };
     localScope = contains("local");
-    if (contains("nostripcodecomments")) stripCodeComments = false;
-    else if (contains("stripcodecomments")) stripCodeComments = true;
+    if (contains("nostrip"))
+    {
+      stripCodeComments = false;
+    }
+    else if (contains("strip"))
+    {
+      stripCodeComments = true;
+    }
 
     if (t==DocInclude::Include && contains("lineno"))
     {

src/docnode.h

@@ -496,8 +496,8 @@ class DocIncOperator : public DocNode
     QCString  m_context;
     bool     m_isFirst = false;
     bool     m_isLast = false;
-    bool     m_isExample = false;
     bool     m_stripCodeComments = true;
+    bool     m_isExample = false;
     QCString  m_exampleFile;
     QCString m_includeFileName;
 };