a8ae7fd · unity8 · git.iko.soy

git.iko.soy/unity8

Changed the type of setActive argument from QVector<AbstractFilterOption *>::size_type to unsigned int.

Approved by PS Jenkins bot, Albert Astals Cid.

commita8ae7fdb82b4f26aff91b988e7cc033df8836897 authorPawel Stolowski <pawel.stolowski@canonical.com> dateFri 23 Aug 2013, 13:22 (13 years ago) parent127a1d7 7dd1fe0

3 files changed+5−3

compare with xenial

unifiedsplit

plugins/Unity/genericoptionsmodel.cpp+2−2 plugins/Unity/genericoptionsmodel.h+1−1 plugins/Unity/plugin.cpp+2

plugins/Unity/genericoptionsmodel.cpp+2−2

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

7676 return m_options.size ();

7777}

7878

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

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

8080{

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

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

8282 {

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

8484 }

plugins/Unity/genericoptionsmodel.h+1−1

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

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

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

5151

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

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

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

5454

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

plugins/Unity/plugin.cpp+2

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

3333#include "categories.h"

3434#include "categoryresults.h"

3535#include "bottombarvisibilitycommunicatorshell.h"

36+#include "genericoptionsmodel.h"

3637

3738// libqtdee

3839#include "deelistmodel.h"

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

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

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

4950 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.");

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

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

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