napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamares] Slight refactor, move into NamedEnumTable

Browse Source 
- expand documentation on find()
 - make find() methods
This commit is contained in:
Adriaan de Groot 2019-01-11 14:30:21 +01:00
parent fb44113561
commit 9c2a6b03e4
1 changed files with 56 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/libcalamares/utils/NamedEnum.h
View File

@ -41,16 +41,33 @@ struct NamedEnumTable
using enum_t = T; using enum_t = T;
using pair_t = std::pair< string_t, enum_t >; using pair_t = std::pair< string_t, enum_t >;
using type = std::initializer_list< pair_t >; using type = std::initializer_list< pair_t >;
} ;
/** @brief Find a name @p s in the @p table. */ type table;
template<typename T>
typename NamedEnumTable<T>::enum_t find( const typename NamedEnumTable<T>::type& table, const QString& s, bool& ok ) /** @brief Create a table of named enum values.
*
* Use braced-initialisation for NamedEnum, and remember that the
* elements of the list are **pairs**, e.g.
*
* static const NamedEnumTable<Colors> c{ {"red", Colors::Red } };
*/
NamedEnumTable( type v ) : table( v ) { /* static_assert( v.size() > 0 ); */ };
/** @brief Find a name @p s in the table.
*
* Searches case-insensitively.
*
* If the name @p s is not found, @p ok is set to false and
* the first enum value in the table is returned. Otherwise,
* @p ok is set to true and the corresponding value is returned.
*
*/
enum_t find( const string_t& s, bool& ok ) const
{ {
ok = false; ok = false;
for ( const auto p : table ) for ( const auto p : table )
if ( s == p.first ) if ( 0 == QString::compare( s, p.first, Qt::CaseInsensitive ) )
{ {
ok = true; ok = true;
return p.second; return p.second;
@ -60,9 +77,13 @@ typename NamedEnumTable<T>::enum_t find( const typename NamedEnumTable<T>::type&
return table.begin()->second; return table.begin()->second;
} }
/** @brief Find a value @p s in the @p table. */ /** @brief Find a value @p s in the table.
template<typename T> *
typename NamedEnumTable<T>::enum_t find( const typename NamedEnumTable<T>::type& table, const T s, bool& ok ) * If the value @p s is not found, @p ok is set to false and
* an empty string is returned. Otherwise, @p is set to true
* and the corresponding name is returned.
*/
string_t find( enum_t s, bool& ok ) const
{ {
ok = false; ok = false;
@ -74,8 +95,9 @@ typename NamedEnumTable<T>::enum_t find( const typename NamedEnumTable<T>::type&
} }
// ok is still false // ok is still false
return QString(); return string_t();
} }
} ;
/** @brief Smashes an enum value to its underlying type. */ /** @brief Smashes an enum value to its underlying type. */
template<typename E> template<typename E>