Added type-safe wrapper class around low-level bitfield type

doxygen · doxygen · commit 6de442232cd7 · 2025-05-15T21:13:34.000+02:00
diff --git a/src/cite.h b/src/cite.h
@@ -22,6 +22,47 @@
 #include "qcstring.h"
 #include "construct.h"
 
+class CiteInfoOption
+{
+  public:
+    CiteInfoOption() {}
+    static CiteInfoOption makeNumber()      { return CiteInfoOption(NUMBER); }
+    static CiteInfoOption makeShortAuthor() { return CiteInfoOption(SHORTAUTHOR); }
+    static CiteInfoOption makeYear()        { return CiteInfoOption(YEAR); }
+    void setNoPar()               { m_bits |= NOPAR_BIT; }
+    void setNoCite()              { m_bits |= NOCITE_BIT; }
+
+    bool isUnknown() const        { return (m_bits & TypeMask)==0; }
+    bool isNumber() const         { return (m_bits & NUMBER)!=0; }
+    bool isShortAuthor() const    { return (m_bits & SHORTAUTHOR)!=0; }
+    bool isYear() const           { return (m_bits & YEAR)!=0; }
+
+    bool noPar() const            { return (m_bits & NOPAR_BIT)!=0; }
+    bool noCite() const           { return (m_bits & NOCITE_BIT)!=0; }
+
+    friend inline bool operator==(const CiteInfoOption &t1,const CiteInfoOption &t2) { return t1.m_bits==t2.m_bits; }
+    friend inline bool operator!=(const CiteInfoOption &t1,const CiteInfoOption &t2) { return !(operator==(t1,t2)); }
+
+  private:
+    CiteInfoOption(int bits) : m_bits(bits) {}
+
+    enum Bits
+    {
+      UNKNOWN     = 0,
+      NUMBER      = (1<<0),
+      SHORTAUTHOR = (1<<1),
+      YEAR        = (1<<2),
+
+      TypeMask    = 0x0000FFFF,
+      OptionMask  = 0xFFFF0000,
+
+      NOPAR_BIT   = (1<<16), //< Don't use square brackets
+      NOCITE_BIT  = (1<<17)  //< Don't create a link
+    };
+    unsigned int m_bits = UNKNOWN;
+};
+
+
 /// Citation-related data.
 struct CiteInfo
 {
@@ -31,16 +72,6 @@ struct CiteInfo
   virtual QCString text() const = 0;
   virtual QCString shortAuthor() const = 0;
   virtual QCString year() const = 0;
-
-  enum CiteOptionType {
-    UNKNOWN     = 0x00,
-    NUMBER      = 0x01,
-    SHORTAUTHOR = 0x02,
-    YEAR        = 0x04,
-
-    NOPAR_BIT   = 0x001000, //< Don't use square brackets
-    NOCITE_BIT  = 0x100000, //< Don't create a link
-  };
 };
 
 /**
diff --git a/src/docbookvisitor.cpp b/src/docbookvisitor.cpp
@@ -603,20 +603,20 @@ void DocbookDocVisitor::operator()(const DocCite &cite)
 {
 DB_VIS_C
   if (m_hide) return;
-  int opt = cite.option();
+  auto opt = cite.option();
   if (!cite.file().isEmpty())
   {
-    if (!(opt & CiteInfo::NOCITE_BIT)) startLink(cite.file(),filterId(cite.anchor()));
+    if (!opt.noCite()) startLink(cite.file(),filterId(cite.anchor()));
 
     filter(cite.getText());
 
-    if (!(opt & CiteInfo::NOCITE_BIT)) endLink();
+    if (!opt.noCite()) endLink();
   }
   else
   {
-    if (!(opt & CiteInfo::NOPAR_BIT)) filter("[");
+    if (!opt.noPar()) filter("[");
     filter(cite.target());
-    if (!(opt & CiteInfo::NOPAR_BIT)) filter("]");
+    if (!opt.noPar()) filter("]");
 
   }
 
diff --git a/src/docnode.cpp b/src/docnode.cpp
@@ -900,7 +900,7 @@ void DocRef::parse()
 
 //---------------------------------------------------------------------------
 
-DocCite::DocCite(DocParser *parser,DocNodeVariant *parent,const QCString &target,const QCString &,int opt) : DocNode(parser,parent)
+DocCite::DocCite(DocParser *parser,DocNodeVariant *parent,const QCString &target,const QCString &,CiteInfoOption opt) : DocNode(parser,parent)
 {
   size_t numBibFiles = Config_getList(CITE_BIB_FILES).size();
   //printf("DocCite::DocCite(target=%s)\n",qPrint(target));
@@ -939,20 +939,20 @@ DocCite::DocCite(DocParser *parser,DocNodeVariant *parent,const QCString &target
 QCString DocCite::getText() const
 {
   QCString txt;
-  int opt = m_option;
+  auto opt = m_option;
   const CitationManager &ct = CitationManager::instance();
   const CiteInfo *citeInfo = ct.find(m_target);
 
-  if (!(opt & CiteInfo::NOPAR_BIT))  txt += "[";
+  if (!opt.noPar())  txt += "[";
 
   if (citeInfo)
   {
-    if (opt & CiteInfo::NUMBER)  txt += citeInfo->text();
-    else if (opt & CiteInfo::SHORTAUTHOR)  txt += citeInfo->shortAuthor();
-    else if (opt & CiteInfo::YEAR)  txt += citeInfo->year();
+    if      (opt.isNumber())      txt += citeInfo->text();
+    else if (opt.isShortAuthor()) txt += citeInfo->shortAuthor();
+    else if (opt.isYear())        txt += citeInfo->year();
   }
 
-  if (!(opt & CiteInfo::NOPAR_BIT)) txt += "]";
+  if (!opt.noPar()) txt += "]";
   return txt;
 }
 
@@ -3329,9 +3329,7 @@ void DocPara::handleCite(char cmdChar,const QCString &cmdName)
   // get the argument of the cite command.
   Token tok=parser()->tokenizer.lex();
 
-  int option = CiteInfo::UNKNOWN;
-  bool nopar_bit = false;
-  bool nocite_bit = false;
+  CiteInfoOption option;
   if (tok.is(TokenRetval::TK_WORD) && parser()->context.token->name=="{")
   {
     parser()->tokenizer.setStateOptions();
@@ -3341,48 +3339,52 @@ void DocPara::handleCite(char cmdChar,const QCString &cmdName)
     {
       if (opt == "number")
       {
-        if (option != CiteInfo::UNKNOWN)
+        if (!option.isUnknown())
         {
           warn(parser()->context.fileName,parser()->tokenizer.getLineNr(),"Multiple options specified with \\{}, discarding '{}'", saveCmdName, opt);
         }
         else
         {
-          option = CiteInfo::NUMBER;
+          option = CiteInfoOption::makeNumber();
         }
       }
       else if (opt == "year")
       {
-        if (option != CiteInfo::UNKNOWN)
+        if (!option.isUnknown())
         {
           warn(parser()->context.fileName,parser()->tokenizer.getLineNr(),"Multiple options specified with \\{}, discarding '{}'", saveCmdName, opt);
         }
         else
         {
-          option = CiteInfo::YEAR;
+          option = CiteInfoOption::makeYear();
         }
       }
       else if (opt == "shortauthor")
       {
-        if (option != CiteInfo::UNKNOWN)
+        if (!option.isUnknown())
         {
           warn(parser()->context.fileName,parser()->tokenizer.getLineNr(),"Multiple options specified with \\{}, discarding '{}'", saveCmdName, opt);
         }
         else
         {
-          option = CiteInfo::SHORTAUTHOR;
+          option = CiteInfoOption::makeShortAuthor();
         }
       }
-      else if (opt == "nopar")  nopar_bit = true;
-      else if (opt == "nocite") nocite_bit = true;
+      else if (opt == "nopar")
+      {
+        option.setNoPar();
+      }
+      else if (opt == "nocite")
+      {
+        option.setNoCite();
+      }
       else
       {
         warn(parser()->context.fileName,parser()->tokenizer.getLineNr(),"Unkown option specified with \\{}, discarding '{}'", saveCmdName, opt);
       }
     }
 
-    if (option == CiteInfo::UNKNOWN) option = CiteInfo::NUMBER;
-    if (nopar_bit) option |= CiteInfo::NOPAR_BIT;
-    if (nocite_bit) option |= CiteInfo::NOCITE_BIT;
+    if (option.isUnknown()) option = CiteInfoOption::makeNumber();
 
     parser()->tokenizer.setStatePara();
     tok=parser()->tokenizer.lex();
@@ -3401,7 +3403,7 @@ void DocPara::handleCite(char cmdChar,const QCString &cmdName)
   }
   else
   {
-    option = CiteInfo::NUMBER;
+    option = CiteInfoOption::makeNumber();
   }
 
   parser()->tokenizer.setStateCite();
diff --git a/src/docnode.h b/src/docnode.h
@@ -32,6 +32,7 @@
 #include "section.h"
 #include "construct.h"
 #include "doctokenizer.h"
+#include "cite.h"
 
 class MemberDef;
 class Definition;
@@ -243,13 +244,13 @@ class DocAnchor : public DocNode
 class DocCite : public DocNode
 {
   public:
-    DocCite(DocParser *parser,DocNodeVariant *parent,const QCString &target,const QCString &context, int opt);
+    DocCite(DocParser *parser,DocNodeVariant *parent,const QCString &target,const QCString &context, CiteInfoOption opt);
     QCString file() const        { return m_file; }
     QCString relPath() const     { return m_relPath; }
     QCString ref() const         { return m_ref; }
     QCString anchor() const      { return m_anchor; }
     QCString target() const      { return m_target; }
-    int option() const           { return m_option; }
+    CiteInfoOption option() const  { return m_option; }
     QCString getText() const;
 
   private:
@@ -258,7 +259,7 @@ class DocCite : public DocNode
     QCString   m_ref;
     QCString   m_anchor;
     QCString   m_target;
-    int        m_option;
+    CiteInfoOption m_option;
 };
 
 
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
@@ -996,19 +996,19 @@ void HtmlDocVisitor::operator()(const DocSimpleSectSep &)
 void HtmlDocVisitor::operator()(const DocCite &cite)
 {
   if (m_hide) return;
-  int opt = cite.option();
+  auto opt = cite.option();
   if (!cite.file().isEmpty())
   {
-    if (!(opt & CiteInfo::NOCITE_BIT)) startLink(cite.ref(),cite.file(),cite.relPath(),cite.anchor());
+    if (!opt.noCite()) startLink(cite.ref(),cite.file(),cite.relPath(),cite.anchor());
     filter(cite.getText());
-    if (!(opt & CiteInfo::NOCITE_BIT)) endLink();
+    if (!opt.noCite()) endLink();
   }
   else
   {
     m_t << "<b>";
-    if (!(opt & CiteInfo::NOPAR_BIT)) filter("[");
+    if (!opt.noPar()) filter("[");
     filter(cite.target());
-    if (!(opt & CiteInfo::NOPAR_BIT)) filter("]");
+    if (!opt.noPar()) filter("]");
     m_t << "</b>";
   }
 }
diff --git a/src/latexdocvisitor.cpp b/src/latexdocvisitor.cpp
@@ -737,19 +737,19 @@ void LatexDocVisitor::operator()(const DocSimpleSectSep &)
 void LatexDocVisitor::operator()(const DocCite &cite)
 {
   if (m_hide) return;
-  int opt = cite.option();
+  auto opt = cite.option();
   QCString txt;
-  if (opt & CiteInfo::NOCITE_BIT)
+  if (opt.noCite())
   {
     if (!cite.file().isEmpty())
     {
       txt = cite.getText();
     }
     else
     {
-      if (!(opt & CiteInfo::NOPAR_BIT)) txt += "[";
+      if (!opt.noPar()) txt += "[";
       txt += cite.target();
-      if (!(opt & CiteInfo::NOPAR_BIT)) txt += "]";
+      if (!opt.noPar()) txt += "]";
     }
     m_t << "{\\bfseries ";
     filter(txt);
@@ -764,28 +764,28 @@ void LatexDocVisitor::operator()(const DocCite &cite)
       anchor = anchor.mid(anchorPrefix.length()); // strip prefix
 
       txt = "\\DoxyCite{" + anchor + "}";
-      if (opt & CiteInfo::NUMBER)
+      if (opt.isNumber())
       {
         txt += "{number}";
       }
-      else if (opt & CiteInfo::SHORTAUTHOR)
+      else if (opt.isShortAuthor())
       {
         txt += "{shortauthor}";
       }
-      else if (opt & CiteInfo::YEAR)
+      else if (opt.isYear())
       {
         txt += "{year}";
       }
-      if (!(opt & CiteInfo::NOPAR_BIT)) txt += "{1}";
+      if (!opt.noPar()) txt += "{1}";
       else txt += "{0}";
 
       m_t << txt;
     }
     else
     {
-      if (!(opt & CiteInfo::NOPAR_BIT)) txt += "[";
+      if (!opt.noPar()) txt += "[";
       txt += cite.target();
-      if (!(opt & CiteInfo::NOPAR_BIT)) txt += "]";
+      if (!opt.noPar()) txt += "]";
       m_t << "{\\bfseries ";
       filter(txt);
       m_t << "}";
diff --git a/src/mandocvisitor.cpp b/src/mandocvisitor.cpp
@@ -428,17 +428,17 @@ void ManDocVisitor::operator()(const DocCite &cite)
 {
   if (m_hide) return;
   m_t << "\\fB";
-  int opt = cite.option();
+  auto opt = cite.option();
   QCString txt;
   if (!cite.file().isEmpty())
   {
     txt = cite.getText();
   }
   else
   {
-    if (!(opt & CiteInfo::NOPAR_BIT)) txt += "[";
+    if (!opt.noPar()) txt += "[";
     txt += cite.target();
-    if (!(opt & CiteInfo::NOPAR_BIT)) txt += "]";
+    if (!opt.noPar()) txt += "]";
   }
   filter(txt);
   m_t << "\\fP";
diff --git a/src/perlmodgen.cpp b/src/perlmodgen.cpp
@@ -745,17 +745,17 @@ void PerlModDocVisitor::operator()(const DocSimpleSectSep &)
 void PerlModDocVisitor::operator()(const DocCite &cite)
 {
   openItem("cite");
-  int opt = cite.option();
+  auto opt = cite.option();
   QCString txt;
   if (!cite.file().isEmpty())
   {
     txt = cite.getText();
   }
   else
   {
-    if (!(opt & CiteInfo::NOPAR_BIT)) txt += "[";
+    if (!opt.noPar()) txt += "[";
     txt += cite.target();
-    if (!(opt & CiteInfo::NOPAR_BIT)) txt += "]";
+    if (!opt.noPar()) txt += "]";
   }
   m_output.addFieldQuotedString("text", txt);
   closeItem();
diff --git a/src/printdocvisitor.h b/src/printdocvisitor.h
@@ -254,17 +254,17 @@ class PrintDocVisitor
     void operator()(const DocCite &cite)
     {
       indent_leaf();
-      int opt = cite.option();
+      auto opt = cite.option();
       QCString txt;
       if (!cite.file().isEmpty())
       {
         txt = cite.getText();
       }
       else
       {
-        if (!(opt & CiteInfo::NOPAR_BIT)) txt += "[";
+        if (!opt.noPar()) txt += "[";
         txt += cite.target();
-        if (!(opt & CiteInfo::NOPAR_BIT)) txt += "]";
+        if (!opt.noPar()) txt += "]";
       }
       printf("<cite ref=\"%s\" file=\"%s\" "
              "anchor=\"%s\" text=\"%s\""
diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp
diff --git a/src/xmldocvisitor.cpp b/src/xmldocvisitor.cpp

Original file line number	Diff line number	Diff line change
`@@ -603,20 +603,20 @@ void DocbookDocVisitor::operator()(const DocCite &cite)`
`603`	`603`	`{`
`604`	`604`	`DB_VIS_C`
`605`	`605`	`if (m_hide) return;`
`606`		`- int opt = cite.option();`
	`606`	`+ auto opt = cite.option();`
`607`	`607`	`if (!cite.file().isEmpty())`
`608`	`608`	`{`
`609`		`- if (!(opt & CiteInfo::NOCITE_BIT)) startLink(cite.file(),filterId(cite.anchor()));`
	`609`	`+ if (!opt.noCite()) startLink(cite.file(),filterId(cite.anchor()));`
`610`	`610`
`611`	`611`	`filter(cite.getText());`
`612`	`612`
`613`		`- if (!(opt & CiteInfo::NOCITE_BIT)) endLink();`
	`613`	`+ if (!opt.noCite()) endLink();`
`614`	`614`	`}`
`615`	`615`	`else`
`616`	`616`	`{`
`617`		`- if (!(opt & CiteInfo::NOPAR_BIT)) filter("[");`
	`617`	`+ if (!opt.noPar()) filter("[");`
`618`	`618`	`filter(cite.target());`
`619`		`- if (!(opt & CiteInfo::NOPAR_BIT)) filter("]");`
	`619`	`+ if (!opt.noPar()) filter("]");`
`620`	`620`
`621`	`621`	`}`
`622`	`622`
Original file line number	Diff line number	Diff line change
`@@ -900,7 +900,7 @@ void DocRef::parse()`
`900`	`900`
`901`	`901`	`//---------------------------------------------------------------------------`
`902`	`902`
`903`		`-DocCite::DocCite(DocParser parser,DocNodeVariant parent,const QCString &target,const QCString &,int opt) : DocNode(parser,parent)`
	`903`	`+DocCite::DocCite(DocParser parser,DocNodeVariant parent,const QCString &target,const QCString &,CiteInfoOption opt) : DocNode(parser,parent)`
`904`	`904`	`{`
`905`	`905`	`size_t numBibFiles = Config_getList(CITE_BIB_FILES).size();`
`906`	`906`	`//printf("DocCite::DocCite(target=%s)\n",qPrint(target));`
`@@ -939,20 +939,20 @@ DocCite::DocCite(DocParser parser,DocNodeVariant parent,const QCString &target`
`939`	`939`	`QCString DocCite::getText() const`
`940`	`940`	`{`
`941`	`941`	`QCString txt;`
`942`		`- int opt = m_option;`
	`942`	`+ auto opt = m_option;`
`943`	`943`	`const CitationManager &ct = CitationManager::instance();`
`944`	`944`	`const CiteInfo *citeInfo = ct.find(m_target);`
`945`	`945`
`946`		`- if (!(opt & CiteInfo::NOPAR_BIT)) txt += "[";`
	`946`	`+ if (!opt.noPar()) txt += "[";`
`947`	`947`
`948`	`948`	`if (citeInfo)`
`949`	`949`	`{`
`950`		`- if (opt & CiteInfo::NUMBER) txt += citeInfo->text();`
`951`		`- else if (opt & CiteInfo::SHORTAUTHOR) txt += citeInfo->shortAuthor();`
`952`		`- else if (opt & CiteInfo::YEAR) txt += citeInfo->year();`
	`950`	`+ if (opt.isNumber()) txt += citeInfo->text();`
	`951`	`+ else if (opt.isShortAuthor()) txt += citeInfo->shortAuthor();`
	`952`	`+ else if (opt.isYear()) txt += citeInfo->year();`
`953`	`953`	`}`
`954`	`954`
`955`		`- if (!(opt & CiteInfo::NOPAR_BIT)) txt += "]";`
	`955`	`+ if (!opt.noPar()) txt += "]";`
`956`	`956`	`return txt;`
`957`	`957`	`}`
`958`	`958`
`@@ -3329,9 +3329,7 @@ void DocPara::handleCite(char cmdChar,const QCString &cmdName)`
`3329`	`3329`	`// get the argument of the cite command.`
`3330`	`3330`	`Token tok=parser()->tokenizer.lex();`
`3331`	`3331`
`3332`		`- int option = CiteInfo::UNKNOWN;`
`3333`		`- bool nopar_bit = false;`
`3334`		`- bool nocite_bit = false;`
	`3332`	`+ CiteInfoOption option;`
`3335`	`3333`	`if (tok.is(TokenRetval::TK_WORD) && parser()->context.token->name=="{")`
`3336`	`3334`	`{`
`3337`	`3335`	`parser()->tokenizer.setStateOptions();`
`@@ -3341,48 +3339,52 @@ void DocPara::handleCite(char cmdChar,const QCString &cmdName)`
`3341`	`3339`	`{`
`3342`	`3340`	`if (opt == "number")`
`3343`	`3341`	`{`
`3344`		`- if (option != CiteInfo::UNKNOWN)`
	`3342`	`+ if (!option.isUnknown())`
`3345`	`3343`	`{`
`3346`	`3344`	`warn(parser()->context.fileName,parser()->tokenizer.getLineNr(),"Multiple options specified with \\{}, discarding '{}'", saveCmdName, opt);`
`3347`	`3345`	`}`
`3348`	`3346`	`else`
`3349`	`3347`	`{`
`3350`		`- option = CiteInfo::NUMBER;`
	`3348`	`+ option = CiteInfoOption::makeNumber();`
`3351`	`3349`	`}`
`3352`	`3350`	`}`
`3353`	`3351`	`else if (opt == "year")`
`3354`	`3352`	`{`
`3355`		`- if (option != CiteInfo::UNKNOWN)`
	`3353`	`+ if (!option.isUnknown())`
`3356`	`3354`	`{`
`3357`	`3355`	`warn(parser()->context.fileName,parser()->tokenizer.getLineNr(),"Multiple options specified with \\{}, discarding '{}'", saveCmdName, opt);`
`3358`	`3356`	`}`
`3359`	`3357`	`else`
`3360`	`3358`	`{`
`3361`		`- option = CiteInfo::YEAR;`
	`3359`	`+ option = CiteInfoOption::makeYear();`
`3362`	`3360`	`}`
`3363`	`3361`	`}`
`3364`	`3362`	`else if (opt == "shortauthor")`
`3365`	`3363`	`{`
`3366`		`- if (option != CiteInfo::UNKNOWN)`
	`3364`	`+ if (!option.isUnknown())`
`3367`	`3365`	`{`
`3368`	`3366`	`warn(parser()->context.fileName,parser()->tokenizer.getLineNr(),"Multiple options specified with \\{}, discarding '{}'", saveCmdName, opt);`
`3369`	`3367`	`}`
`3370`	`3368`	`else`
`3371`	`3369`	`{`
`3372`		`- option = CiteInfo::SHORTAUTHOR;`
	`3370`	`+ option = CiteInfoOption::makeShortAuthor();`
`3373`	`3371`	`}`
`3374`	`3372`	`}`
`3375`		`- else if (opt == "nopar") nopar_bit = true;`
`3376`		`- else if (opt == "nocite") nocite_bit = true;`
	`3373`	`+ else if (opt == "nopar")`
	`3374`	`+ {`
	`3375`	`+ option.setNoPar();`
	`3376`	`+ }`
	`3377`	`+ else if (opt == "nocite")`
	`3378`	`+ {`
	`3379`	`+ option.setNoCite();`
	`3380`	`+ }`
`3377`	`3381`	`else`
`3378`	`3382`	`{`
`3379`	`3383`	`warn(parser()->context.fileName,parser()->tokenizer.getLineNr(),"Unkown option specified with \\{}, discarding '{}'", saveCmdName, opt);`
`3380`	`3384`	`}`
`3381`	`3385`	`}`
`3382`	`3386`
`3383`		`- if (option == CiteInfo::UNKNOWN) option = CiteInfo::NUMBER;`
`3384`		`- if (nopar_bit) option \|= CiteInfo::NOPAR_BIT;`
`3385`		`- if (nocite_bit) option \|= CiteInfo::NOCITE_BIT;`
	`3387`	`+ if (option.isUnknown()) option = CiteInfoOption::makeNumber();`
`3386`	`3388`
`3387`	`3389`	`parser()->tokenizer.setStatePara();`
`3388`	`3390`	`tok=parser()->tokenizer.lex();`
`@@ -3401,7 +3403,7 @@ void DocPara::handleCite(char cmdChar,const QCString &cmdName)`
`3401`	`3403`	`}`
`3402`	`3404`	`else`
`3403`	`3405`	`{`
`3404`		`- option = CiteInfo::NUMBER;`
	`3406`	`+ option = CiteInfoOption::makeNumber();`
`3405`	`3407`	`}`
`3406`	`3408`
`3407`	`3409`	`parser()->tokenizer.setStateCite();`
Original file line number	Diff line number	Diff line change
`@@ -996,19 +996,19 @@ void HtmlDocVisitor::operator()(const DocSimpleSectSep &)`
`996`	`996`	`void HtmlDocVisitor::operator()(const DocCite &cite)`
`997`	`997`	`{`
`998`	`998`	`if (m_hide) return;`
`999`		`- int opt = cite.option();`
	`999`	`+ auto opt = cite.option();`
`1000`	`1000`	`if (!cite.file().isEmpty())`
`1001`	`1001`	`{`
`1002`		`- if (!(opt & CiteInfo::NOCITE_BIT)) startLink(cite.ref(),cite.file(),cite.relPath(),cite.anchor());`
	`1002`	`+ if (!opt.noCite()) startLink(cite.ref(),cite.file(),cite.relPath(),cite.anchor());`
`1003`	`1003`	`filter(cite.getText());`
`1004`		`- if (!(opt & CiteInfo::NOCITE_BIT)) endLink();`
	`1004`	`+ if (!opt.noCite()) endLink();`
`1005`	`1005`	`}`
`1006`	`1006`	`else`
`1007`	`1007`	`{`
`1008`	`1008`	`m_t << "<b>";`
`1009`		`- if (!(opt & CiteInfo::NOPAR_BIT)) filter("[");`
	`1009`	`+ if (!opt.noPar()) filter("[");`
`1010`	`1010`	`filter(cite.target());`
`1011`		`- if (!(opt & CiteInfo::NOPAR_BIT)) filter("]");`
	`1011`	`+ if (!opt.noPar()) filter("]");`
`1012`	`1012`	`m_t << "</b>";`
`1013`	`1013`	`}`
`1014`	`1014`	`}`
Original file line number	Diff line number	Diff line change
`@@ -737,19 +737,19 @@ void LatexDocVisitor::operator()(const DocSimpleSectSep &)`
`737`	`737`	`void LatexDocVisitor::operator()(const DocCite &cite)`
`738`	`738`	`{`
`739`	`739`	`if (m_hide) return;`
`740`		`- int opt = cite.option();`
	`740`	`+ auto opt = cite.option();`
`741`	`741`	`QCString txt;`
`742`		`- if (opt & CiteInfo::NOCITE_BIT)`
	`742`	`+ if (opt.noCite())`
`743`	`743`	`{`
`744`	`744`	`if (!cite.file().isEmpty())`
`745`	`745`	`{`
`746`	`746`	`txt = cite.getText();`
`747`	`747`	`}`
`748`	`748`	`else`
`749`	`749`	`{`
`750`		`- if (!(opt & CiteInfo::NOPAR_BIT)) txt += "[";`
	`750`	`+ if (!opt.noPar()) txt += "[";`
`751`	`751`	`txt += cite.target();`
`752`		`- if (!(opt & CiteInfo::NOPAR_BIT)) txt += "]";`
	`752`	`+ if (!opt.noPar()) txt += "]";`
`753`	`753`	`}`
`754`	`754`	`m_t << "{\\bfseries ";`
`755`	`755`	`filter(txt);`
`@@ -764,28 +764,28 @@ void LatexDocVisitor::operator()(const DocCite &cite)`
`764`	`764`	`anchor = anchor.mid(anchorPrefix.length()); // strip prefix`
`765`	`765`
`766`	`766`	`txt = "\\DoxyCite{" + anchor + "}";`
`767`		`- if (opt & CiteInfo::NUMBER)`
	`767`	`+ if (opt.isNumber())`
`768`	`768`	`{`
`769`	`769`	`txt += "{number}";`
`770`	`770`	`}`
`771`		`- else if (opt & CiteInfo::SHORTAUTHOR)`
	`771`	`+ else if (opt.isShortAuthor())`
`772`	`772`	`{`
`773`	`773`	`txt += "{shortauthor}";`
`774`	`774`	`}`
`775`		`- else if (opt & CiteInfo::YEAR)`
	`775`	`+ else if (opt.isYear())`
`776`	`776`	`{`
`777`	`777`	`txt += "{year}";`
`778`	`778`	`}`
`779`		`- if (!(opt & CiteInfo::NOPAR_BIT)) txt += "{1}";`
	`779`	`+ if (!opt.noPar()) txt += "{1}";`
`780`	`780`	`else txt += "{0}";`
`781`	`781`
`782`	`782`	`m_t << txt;`
`783`	`783`	`}`
`784`	`784`	`else`
`785`	`785`	`{`
`786`		`- if (!(opt & CiteInfo::NOPAR_BIT)) txt += "[";`
	`786`	`+ if (!opt.noPar()) txt += "[";`
`787`	`787`	`txt += cite.target();`
`788`		`- if (!(opt & CiteInfo::NOPAR_BIT)) txt += "]";`
	`788`	`+ if (!opt.noPar()) txt += "]";`
`789`	`789`	`m_t << "{\\bfseries ";`
`790`	`790`	`filter(txt);`
`791`	`791`	`m_t << "}";`
Original file line number	Diff line number	Diff line change
`@@ -428,17 +428,17 @@ void ManDocVisitor::operator()(const DocCite &cite)`
`428`	`428`	`{`
`429`	`429`	`if (m_hide) return;`
`430`	`430`	`m_t << "\\fB";`
`431`		`- int opt = cite.option();`
	`431`	`+ auto opt = cite.option();`
`432`	`432`	`QCString txt;`
`433`	`433`	`if (!cite.file().isEmpty())`
`434`	`434`	`{`
`435`	`435`	`txt = cite.getText();`
`436`	`436`	`}`
`437`	`437`	`else`
`438`	`438`	`{`
`439`		`- if (!(opt & CiteInfo::NOPAR_BIT)) txt += "[";`
	`439`	`+ if (!opt.noPar()) txt += "[";`
`440`	`440`	`txt += cite.target();`
`441`		`- if (!(opt & CiteInfo::NOPAR_BIT)) txt += "]";`
	`441`	`+ if (!opt.noPar()) txt += "]";`
`442`	`442`	`}`
`443`	`443`	`filter(txt);`
`444`	`444`	`m_t << "\\fP";`
Original file line number	Diff line number	Diff line change
`@@ -745,17 +745,17 @@ void PerlModDocVisitor::operator()(const DocSimpleSectSep &)`
`745`	`745`	`void PerlModDocVisitor::operator()(const DocCite &cite)`
`746`	`746`	`{`
`747`	`747`	`openItem("cite");`
`748`		`- int opt = cite.option();`
	`748`	`+ auto opt = cite.option();`
`749`	`749`	`QCString txt;`
`750`	`750`	`if (!cite.file().isEmpty())`
`751`	`751`	`{`
`752`	`752`	`txt = cite.getText();`
`753`	`753`	`}`
`754`	`754`	`else`
`755`	`755`	`{`
`756`		`- if (!(opt & CiteInfo::NOPAR_BIT)) txt += "[";`
	`756`	`+ if (!opt.noPar()) txt += "[";`
`757`	`757`	`txt += cite.target();`
`758`		`- if (!(opt & CiteInfo::NOPAR_BIT)) txt += "]";`
	`758`	`+ if (!opt.noPar()) txt += "]";`
`759`	`759`	`}`
`760`	`760`	`m_output.addFieldQuotedString("text", txt);`
`761`	`761`	`closeItem();`
Original file line number	Diff line number	Diff line change
`@@ -254,17 +254,17 @@ class PrintDocVisitor`
`254`	`254`	`void operator()(const DocCite &cite)`
`255`	`255`	`{`
`256`	`256`	`indent_leaf();`
`257`		`- int opt = cite.option();`
	`257`	`+ auto opt = cite.option();`
`258`	`258`	`QCString txt;`
`259`	`259`	`if (!cite.file().isEmpty())`
`260`	`260`	`{`
`261`	`261`	`txt = cite.getText();`
`262`	`262`	`}`
`263`	`263`	`else`
`264`	`264`	`{`
`265`		`- if (!(opt & CiteInfo::NOPAR_BIT)) txt += "[";`
	`265`	`+ if (!opt.noPar()) txt += "[";`
`266`	`266`	`txt += cite.target();`
`267`		`- if (!(opt & CiteInfo::NOPAR_BIT)) txt += "]";`
	`267`	`+ if (!opt.noPar()) txt += "]";`
`268`	`268`	`}`
`269`	`269`	`printf("<cite ref=\"%s\" file=\"%s\" "`
`270`	`270`	`"anchor=\"%s\" text=\"%s\""`