refs #584 Moved hash related stuff to dictionary.h

This also means moving Mixin::Icon from CContainerBase one step down the inheritance hierarchy
to resolve what would otherwise have been a circular include dependency.
This commit is contained in:
Mathew Sutcliffe
2016-02-08 00:29:08 +00:00
parent c7a0aa2fb4
commit 3bdcd7e386
12 changed files with 100 additions and 107 deletions

View File

@@ -14,6 +14,7 @@
#include "iterator.h"
#include "containerbase.h"
#include "icon.h"
#include <QScopedPointer>
#include <algorithm>
#include <type_traits>
@@ -31,7 +32,9 @@ namespace BlackMisc
* Can take any suitable container class as its implementation at runtime.
*/
template <class T>
class CSequence : public CContainerBase<CSequence, T, Iterators::ConstBidirectionalIterator<T>>
class CSequence :
public CContainerBase<CSequence, T, Iterators::ConstBidirectionalIterator<T>>,
public Mixin::Icon<CSequence<T>>
{
public:
//! \brief STL compatibility