diff options
| author | Andrew <forkk@forkk.net> | 2013-03-28 11:37:12 -0500 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-03-28 11:37:12 -0500 |
| commit | ebb2c54975e3f0b7b891532e8e72d2ef760f96c4 (patch) | |
| tree | 973de7066457a1faddffd3834eb0c260d5191ec2 /libutil/include/cmdutils.h | |
| parent | 168ed3e8e58a8e5065ffa720f8d45f4cee0f2069 (diff) | |
| parent | 1f13f0c665001a1a79f00cdad1e63e6c9802e55f (diff) | |
| download | MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.gz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.lz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.xz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.zip | |
Merge branch 'master' of git://github.com/peterix/MultiMC5
Conflicts:
CMakeLists.txt
gui/mainwindow.cpp
Diffstat (limited to 'libutil/include/cmdutils.h')
| -rw-r--r-- | libutil/include/cmdutils.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/libutil/include/cmdutils.h b/libutil/include/cmdutils.h index 32261dd7..83397e73 100644 --- a/libutil/include/cmdutils.h +++ b/libutil/include/cmdutils.h @@ -73,15 +73,6 @@ enum LIBUTIL_EXPORT Enum }; } -namespace OptionType -{ -enum LIBUTIL_EXPORT Enum -{ - Switch, - Option -}; -} - /** * @brief The ParsingError class */ @@ -210,6 +201,12 @@ public: private: FlagStyle::Enum m_flagStyle; ArgumentStyle::Enum m_argStyle; + + enum OptionType + { + otSwitch, + otOption + }; // Important: the common part MUST BE COMMON ON ALL THREE structs struct CommonDef { @@ -226,7 +223,7 @@ private: QString metavar; QVariant def; // option - OptionType::Enum type; + OptionType type; QChar flag; }; |