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

@@ -18,7 +18,6 @@
#include "json.h"
#include "variant.h"
#include "dbus.h"
#include "icon.h"
#include <algorithm>
#include <QStringList>
@@ -56,8 +55,7 @@ namespace BlackMisc
public Mixin::MetaType<C<T>>,
public Mixin::DBusOperators<C<T>>,
public Mixin::JsonOperators<C<T>>,
public Mixin::String<C<T>>,
public Mixin::Icon<C<T>>
public Mixin::String<C<T>>
{
public: