a8ae7fd · unity8 · git.iko.soy

plugins/Unity/genericoptionsmodel.cpp+2−2

compare with xenial

unifiedsplit

@@ -76,9 +76,9 @@ int GenericOptionsModel::rowCount(const QModelIndex& /* parent */) const

76 return m_options.size ();

77}

78

79−void GenericOptionsModel::setActive(QVector<AbstractFilterOption *>::size_type idx, bool value)

79+void GenericOptionsModel::setActive(int idx, bool value)

80{

81− if (idx < m_options.size())

81+ if (idx >= 0 && idx < m_options.size())

82 {

83 m_options[idx]->setActive(value);

84 }

plugins/Unity/genericoptionsmodel.h+1−1

@@ -49,7 +49,7 @@ public:

49 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;

50 int rowCount(const QModelIndex& parent = QModelIndex()) const override;

51

52− Q_INVOKABLE void setActive(QVector<AbstractFilterOption *>::size_type idx, bool value);

52+ Q_INVOKABLE void setActive(int idx, bool value);

53 Q_INVOKABLE void setActive(const QString &id, bool value);

54

55 AbstractFilterOption* getRawOption(QVector<AbstractFilterOption *>::size_type idx) const;

plugins/Unity/plugin.cpp+2

@@ -33,6 +33,7 @@

33#include "categories.h"

34#include "categoryresults.h"

35#include "bottombarvisibilitycommunicatorshell.h"

36+#include "genericoptionsmodel.h"

36

37

37// libqtdee

38// libqtdee

38#include "deelistmodel.h"

39#include "deelistmodel.h"

@@ -47,6 +48,7 @@ void UnityPlugin::registerTypes(const char *uri)

47 qmlRegisterUncreatableType<PreviewAction>(uri, 0, 1, "PreviewAction", "Can't create PreviewAction object in QML.");

48 qmlRegisterUncreatableType<PreviewAction>(uri, 0, 1, "PreviewAction", "Can't create PreviewAction object in QML.");

48 qmlRegisterUncreatableType<PreviewInfoHint>(uri, 0, 1, "PreviewInfoHint", "Can't create PreviewInfoHint object in QML.");

49 qmlRegisterUncreatableType<PreviewInfoHint>(uri, 0, 1, "PreviewInfoHint", "Can't create PreviewInfoHint object in QML.");

49 qmlRegisterUncreatableType<SocialPreviewComment>(uri, 0, 1, "SocialPreviewComment", "Can't create SocialPreviewComment object in QML.");

50 qmlRegisterUncreatableType<SocialPreviewComment>(uri, 0, 1, "SocialPreviewComment", "Can't create SocialPreviewComment object in QML.");

51+ qmlRegisterUncreatableType<GenericOptionsModel>(uri, 0, 1, "GenericOptionsModel", "Can't create options model in QML.");

50 qmlRegisterType<Scope>(uri, 0, 1, "Scope");

52 qmlRegisterType<Scope>(uri, 0, 1, "Scope");

51 qmlRegisterType<Scopes>(uri, 0, 1, "Scopes");

53 qmlRegisterType<Scopes>(uri, 0, 1, "Scopes");

52 qmlRegisterType<Categories>(uri, 0, 1, "Categories");

54 qmlRegisterType<Categories>(uri, 0, 1, "Categories");