diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-14 15:52:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-15 08:33:37 +0200 |
| commit | 0102b85e4e2506299e034e623b75f9400450eb90 (patch) | |
| tree | 6ff58b2410ad85b33ebba8b283610fd5fa092b87 /slideshow/source/inc | |
| parent | 602a07e110df440a02692b607b6fc08ddfb074d5 (diff) | |
convert DocTreeNode::NodeType to scoped enum
and drop unused enumerators
Change-Id: I0b9220cc2a70847ee43b63accec5bede3dbb99fa
Diffstat (limited to 'slideshow/source/inc')
| -rw-r--r-- | slideshow/source/inc/doctreenode.hxx | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/slideshow/source/inc/doctreenode.hxx b/slideshow/source/inc/doctreenode.hxx index 584832cc3b9d..f619a4b87659 100644 --- a/slideshow/source/inc/doctreenode.hxx +++ b/slideshow/source/inc/doctreenode.hxx @@ -47,25 +47,16 @@ namespace slideshow { public: /// Type of shape entity represented by this node - enum NodeType + enum class NodeType { - NODETYPE_INVALID=0, + Invalid=0, - /// This node represents a full shape - NODETYPE_FORMATTING_SHAPE=1, - /// This node represents a line - NODETYPE_FORMATTING_LINE=2, - - /// This node represents a full shape - NODETYPE_LOGICAL_SHAPE=128, /// This node represents a paragraph - NODETYPE_LOGICAL_PARAGRAPH=129, - /// This node represents a sentence - NODETYPE_LOGICAL_SENTENCE=130, + LogicalParagraph=129, /// This node represents a word - NODETYPE_LOGICAL_WORD=131, + LogicalWord=131, /// This node represents a character - NODETYPE_LOGICAL_CHARACTER_CELL=132 + LogicalCharacterCell=132 }; /** Create empty tree node @@ -73,7 +64,7 @@ namespace slideshow DocTreeNode() : mnStartIndex(-1), mnEndIndex(-1), - meType(NODETYPE_INVALID) + meType(NodeType::Invalid) { } @@ -109,7 +100,7 @@ namespace slideshow { mnStartIndex = -1; mnEndIndex = -1; - meType = NODETYPE_INVALID; + meType = NodeType::Invalid; } private: |