diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2018-07-23 07:47:36 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2018-07-23 07:47:36 (GMT) |
| commit | b6c724e8ab5caeef1e3d065e4c2fa05740d87859 (patch) | |
| tree | 176599f5de01035a777e7f541c44083d94a851ab /src | |
| parent | 30f7d0615e27a89e7124a46fbf6dc5b0731babd3 (diff) | |
| download | Doxygen-b6c724e8ab5caeef1e3d065e4c2fa05740d87859.zip Doxygen-b6c724e8ab5caeef1e3d065e4c2fa05740d87859.tar.gz Doxygen-b6c724e8ab5caeef1e3d065e4c2fa05740d87859.tar.bz2 | |
Minor fixes to local toc logic after feedback
Diffstat (limited to 'src')
| -rw-r--r-- | src/marshal.cpp | 6 | ||||
| -rw-r--r-- | src/types.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/marshal.cpp b/src/marshal.cpp index f13b6fd..fa29aed 100644 --- a/src/marshal.cpp +++ b/src/marshal.cpp @@ -740,15 +740,15 @@ LocalToc unmarshalLocalToc(StorageIntf *s) int htmlLevel = unmarshalInt(s); int latexLevel = unmarshalInt(s); int xmlLevel = unmarshalInt(s); - if ((mask & LocalToc::Html)!=0) + if ((mask & (1<<LocalToc::Html))!=0) { result.enableHtml(htmlLevel); } - if ((mask & LocalToc::Latex)!=0) + if ((mask & (1<<LocalToc::Latex))!=0) { result.enableLatex(latexLevel); } - if ((mask & LocalToc::Xml)!=0) + if ((mask & (1<<LocalToc::Xml))!=0) { result.enableXml(xmlLevel); } diff --git a/src/types.h b/src/types.h index 36f31fe..e58c8fc 100644 --- a/src/types.h +++ b/src/types.h @@ -224,7 +224,7 @@ class LocalToc public: enum Type { None = 0, // initial value - Html = 0, // index / also to be used as (1 << Definition::Html) + Html = 0, // index / also to be used as bit position in mask (1 << Html) Latex = 1, // ... Xml = 2, // ... numTocTypes = 3 // number of enum values @@ -249,9 +249,9 @@ class LocalToc } // getters - bool isHtmlEnabled() const { return (m_mask & Html)!=0; } - bool isLatexEnabled() const { return (m_mask & Latex)!=0; } - bool isXmlEnabled() const { return (m_mask & Xml)!=0; } + bool isHtmlEnabled() const { return (m_mask & (1<<Html))!=0; } + bool isLatexEnabled() const { return (m_mask & (1<<Latex))!=0; } + bool isXmlEnabled() const { return (m_mask & (1<<Xml))!=0; } bool nothingEnabled() const { return m_mask == None; } int htmlLevel() const { return m_level[Html]; } int latexLevel() const { return m_level[Latex]; } |