diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-09 12:36:22 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-10 08:08:45 +0200 |
commit | cc96c1fdc1b62f8b61567f5df63e892953c87f10 (patch) | |
tree | 23592daf915f767caa8eed6f14930f5d1027bcb2 /include/unotools | |
parent | aef704d8077226b13a28e664db59d27017241afe (diff) |
convert EItem to scoped enum
and drop read-only enumerators:
enum EItem E_APEARCFG
enum EItem E_FLTRCFG
enum EItem E_FONTSUBSTCONFIG
enum EItem E_LANGUAGEOPTIONS
enum EItem E_SEARCHOPT
Change-Id: Ie3baaecec3d1c30404b4fb0d948e25d4bb2f3f93
Diffstat (limited to 'include/unotools')
-rw-r--r-- | include/unotools/itemholderbase.hxx | 71 |
1 files changed, 33 insertions, 38 deletions
diff --git a/include/unotools/itemholderbase.hxx b/include/unotools/itemholderbase.hxx index b8b075c21e19..13a11f7e5789 100644 --- a/include/unotools/itemholderbase.hxx +++ b/include/unotools/itemholderbase.hxx @@ -30,63 +30,58 @@ struct ItemHolderMutexBase ::osl::Mutex m_aLock; }; -enum EItem +enum class EItem { - E_ACCESSIBILITYOPTIONS , // 2 - E_APEARCFG , // 2 + AccessibilityOptions , // 2 - E_CJKOPTIONS , // 2 - E_CMDOPTIONS , - E_COLORCFG , // 2 - E_COMPATIBILITY , - E_CTLOPTIONS , // 2 + CJKOptions , // 2 + CmdOptions , + ColorConfig , // 2 + Compatibility , + CTLOptions , // 2 - E_DEFAULTOPTIONS , - E_DYNAMICMENUOPTIONS , + DefaultOptions , + DynamicMenuOptions , - E_EVENTCFG , - E_EXTENDEDSECURITYOPTIONS , + EventConfig , + ExtendedSecurityOptions , - E_FLTRCFG , - E_FONTOPTIONS , - E_FONTSUBSTCONFIG , // 2 + FontOptions , - E_HELPOPTIONS , // 2 - E_HISTORYOPTIONS , + HelpOptions , // 2 + HistoryOptions , - E_LANGUAGEOPTIONS , // 2 - E_LINGUCFG , + LinguConfig , - E_MENUOPTIONS , - E_MISCCFG , // 2 - E_MISCOPTIONS , - E_MODULEOPTIONS , + MenuOptions , + MiscConfig , // 2 + MiscOptions , + ModuleOptions , - E_OPTIONSDLGOPTIONS , + OptionsDialogOptions , - E_PATHOPTIONS , - E_PRINTOPTIONS , // 2 - E_PRINTFILEOPTIONS , // 2 - E_PRINTWARNINGOPTIONS , + PathOptions , + PrintOptions , // 2 + PrintFileOptions , // 2 + PrintWarningOptions , - E_SAVEOPTIONS , - E_SEARCHOPT , - E_SECURITYOPTIONS , - E_SYSLOCALEOPTIONS , // 2 + SaveOptions , + SecurityOptions , + SysLocaleOptions , // 2 - E_USEROPTIONS , // 2 + UserOptions , // 2 - E_VIEWOPTIONS_DIALOG , - E_VIEWOPTIONS_TABDIALOG , - E_VIEWOPTIONS_TABPAGE , - E_VIEWOPTIONS_WINDOW + ViewOptionsDialog , + ViewOptionsTabDialog , + ViewOptionsTabPage , + ViewOptionsWindow }; struct TItemInfo { TItemInfo() : pItem(nullptr) - , eItem(E_USEROPTIONS) + , eItem(EItem::UserOptions) { } |