diff options
author | Noel Grandin <noel@peralex.com> | 2016-08-22 11:19:52 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-08-23 09:54:16 +0200 |
commit | e0b61fdd35462ff679743dff1203fb5dd50e86a4 (patch) | |
tree | 46720d942ff6c656da2b79204294469510591d69 /include | |
parent | ba263e124ce263c3c893542062d9c473f5aae589 (diff) |
convert SdrIterMode to scoped enum
Change-Id: Iaa4631039e6b96627d8e547f21136f107e157d8a
Diffstat (limited to 'include')
-rw-r--r-- | include/svx/svditer.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/svx/svditer.hxx b/include/svx/svditer.hxx index cfbec5fe920b..f4d935989ead 100644 --- a/include/svx/svditer.hxx +++ b/include/svx/svditer.hxx @@ -30,10 +30,10 @@ class SdrObject; class SdrMarkList; // SdrObjListIter methods: -// IM_FLAT : Flat over the list -// IM_DEEPWITHGROUPS : With recursive descent parser, Next() also returns group objects -// IM_DEEPNOGROUPS : With recursive descent parser, Next() returns no group objects -enum SdrIterMode { IM_FLAT, IM_DEEPWITHGROUPS, IM_DEEPNOGROUPS}; +// SdrIterMode::Flat : Flat over the list +// SdrIterMode::DeepWithGroups : With recursive descent parser, Next() also returns group objects +// SdrIterMode::DeepNoGroups : With recursive descent parser, Next() returns no group objects +enum class SdrIterMode { Flat, DeepWithGroups, DeepNoGroups }; class SVX_DLLPUBLIC SdrObjListIter { @@ -46,7 +46,7 @@ class SVX_DLLPUBLIC SdrObjListIter void ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, bool bUseZOrder); public: - explicit SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode = IM_DEEPNOGROUPS, bool bReverse = false); + explicit SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode = SdrIterMode::DeepNoGroups, bool bReverse = false); /** This variant lets the user choose the order in which to travel over the objects. @param bUseZOrder @@ -54,14 +54,14 @@ public: Otherwise the navigation position as returned by SdrObject::GetNavigationPosition() is used. */ - SdrObjListIter(const SdrObjList& rObjList, bool bUseZOrder, SdrIterMode eMode = IM_DEEPNOGROUPS); + SdrObjListIter(const SdrObjList& rObjList, bool bUseZOrder, SdrIterMode eMode = SdrIterMode::DeepNoGroups); /* SJ: the following function can now be used with every SdrObject and is no longer limited to group objects */ - explicit SdrObjListIter(const SdrObject& rObj, SdrIterMode eMode = IM_DEEPNOGROUPS); + explicit SdrObjListIter(const SdrObject& rObj, SdrIterMode eMode = SdrIterMode::DeepNoGroups); /** Iterates over a list of marked objects received from the SdrMarkView. */ - explicit SdrObjListIter(const SdrMarkList& rMarkList, SdrIterMode eMode = IM_DEEPNOGROUPS); + explicit SdrObjListIter(const SdrMarkList& rMarkList, SdrIterMode eMode = SdrIterMode::DeepNoGroups); void Reset() { mnIndex = (mbReverse ? maObjList.size() : 0L); } bool IsMore() const { return (mbReverse ? mnIndex != 0 : ( mnIndex < maObjList.size())); } |