865b871 · unity8 · git.iko.soy

git.iko.soy/unity8

Various minor cleanups.

commit865b871c2460c00f21945894a54a0fe7679695d3 authorPawel Stolowski <pawel.stolowski@canonical.com> dateTue 13 Aug 2013, 11:46 (13 years ago) parentc3e124d

11 files changed+38−25

compare with xenial

unifiedsplit

plugins/Unity/checkoptionfilter.h−1 plugins/Unity/filter.cpp+16−2 plugins/Unity/filteroption.cpp+6−6 plugins/Unity/filters.cpp+1−6 plugins/Unity/filters.h+5−5 plugins/Unity/genericoptionsmodel.h+1 plugins/Unity/multirangefilter.cpp+2−2 plugins/Unity/multirangefilter.h−1 plugins/Unity/ratingfilteroption.cpp+1−1 plugins/Unity/ratingfilteroption.h+3 plugins/Unity/ratingsfilter.cpp+3−1

plugins/Unity/checkoptionfilter.h−1

@@ -29,7 +29,6 @@

2929

3030// Local

3131#include "filter.h"

32−#include "filteroption.h"

3332#include "signalslist.h"

3433

3534class Q_DECL_EXPORT CheckOptionFilter : public Filter

plugins/Unity/filter.cpp+16−2

@@ -44,45 +44,59 @@ Filter::Filter(QObject *parent) :

4444

4545QString Filter::id() const

4646{

47+ if (!m_unityFilter)

48+ return QString::Null();

4749 return QString::fromStdString(m_unityFilter->id());

4850}

4951

5052QString Filter::name() const

5153{

54+ if (!m_unityFilter)

55+ return QString::Null();

5256 return QString::fromStdString(m_unityFilter->name());

5357}

5458

5559QString Filter::iconHint() const

5660{

61+ if (!m_unityFilter)

62+ return QString::Null();

5763 return QString::fromStdString(m_unityFilter->icon_hint());

5864}

5965

6066QString Filter::rendererName() const

6167{

68+ if (!m_unityFilter)

69+ return QString::Null();

6270 return QString::fromStdString(m_unityFilter->renderer_name());

6371}

6472

6573bool Filter::visible() const

6674{

75+ if (!m_unityFilter)

76+ return false;

6777 return m_unityFilter->visible();

6878}

6979

7080bool Filter::collapsed() const

7181{

82+ if (!m_unityFilter)

83+ return false;

7284 return m_unityFilter->collapsed();

7385}

7486

7587bool Filter::filtering() const

7688{

89+ if (!m_unityFilter)

90+ return false;

7791 return m_unityFilter->filtering();

7892}

7993

8094void Filter::clear()

8195{

82− m_unityFilter->Clear();

96+ if (m_unityFilter)

97+ m_unityFilter->Clear();

8398}

8499

85−

86100void Filter::setUnityFilter(unity::dash::Filter::Ptr unityFilter)

87101{

88102 if (m_unityFilter != nullptr) {

plugins/Unity/filteroption.cpp+6−6

@@ -70,19 +70,19 @@ void FilterOption::setUnityFilterOption(unity::dash::FilterOption::Ptr unityFilt

7070 << m_unityFilterOption->active.changed.connect(sigc::mem_fun(this, &FilterOption::onActiveChanged));

7171}

7272

73−void FilterOption::onIdChanged(const std::string &/* id */)

73+void FilterOption::onIdChanged(const std::string &id)

7474{

75− Q_EMIT idChanged(id());

75+ Q_EMIT idChanged(QString::fromStdString(id));

7676}

7777

78−void FilterOption::onNameChanged(const std::string &/* name */)

78+void FilterOption::onNameChanged(const std::string &name)

7979{

80− Q_EMIT nameChanged(name());

80+ Q_EMIT nameChanged(QString::fromStdString(name));

8181}

8282

83−void FilterOption::onIconHintChanged(const std::string &/* iconHint */)

83+void FilterOption::onIconHintChanged(const std::string &iconHint)

8484{

85− Q_EMIT iconHintChanged(iconHint());

85+ Q_EMIT iconHintChanged(QString::fromStdString(iconHint));

8686}

8787

8888void FilterOption::onActiveChanged(bool active)

plugins/Unity/filters.cpp+1−6

@@ -27,9 +27,6 @@

2727// Qt

2828#include <QDebug>

2929

30−// libunity-core

31−#include <UnityCore/Filters.h>

32−

3330Filters::Filters(unity::dash::Filters::Ptr unityFilters, QObject *parent) :

3431 QAbstractListModel(parent), m_unityFilters(unityFilters)

3532{

@@ -155,9 +152,7 @@ void Filters::removeFilter(int index)

155152

156153int Filters::indexForFilter(unity::dash::Filter::Ptr unityFilter)

157154{

158− // TODO: use a map

159− int index;

160− for (index=0; index<m_filters.count(); index++) {

155+ for (int index=0; index<m_filters.count(); index++) {

161156 if (m_filters[index]->hasUnityFilter(unityFilter)) {

162157 return index;

163158 }

plugins/Unity/filters.h+5−5

@@ -55,13 +55,9 @@ public:

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

5656 QHash<int, QByteArray> roleNames() const override;

5757

58− Q_INVOKABLE Filter* getFilter(const QString& id) const;

58+ Filter* getFilter(const QString& id) const;

5959

6060private:

61− unity::dash::Filters::Ptr m_unityFilters;

62− QList<Filter*> m_filters;

63− QHash<int, QByteArray> m_roles;

64−

6561 void onFilterAdded(unity::dash::Filter::Ptr unityFilter);

6662 void onFilterChanged(unity::dash::Filter::Ptr unityFilter);

6763 void onFilterRemoved(unity::dash::Filter::Ptr unityFilter);

@@ -70,6 +66,10 @@ private:

7066 void removeFilter(int index);

7167

7268 int indexForFilter(unity::dash::Filter::Ptr unityFilter);

69+

70+ unity::dash::Filters::Ptr m_unityFilters;

71+ QList<Filter*> m_filters;

72+ QHash<int, QByteArray> m_roles;

7373};

7474

7575Q_DECLARE_METATYPE(Filters*)

plugins/Unity/genericoptionsmodel.h+1

@@ -67,6 +67,7 @@ protected:

6767 int indexOf(const QString &option_id);

6868

6969 QVector<AbstractFilterOption *> m_options;

70+

7071private:

7172 void setupRoles();

7273 QHash<int, QByteArray> m_roles;

plugins/Unity/multirangefilter.cpp+2−2

@@ -42,7 +42,7 @@ void MultiRangeFilter::setUnityFilter(unity::dash::Filter::Ptr filter)

4242 onOptionsChanged(m_unityMultiRangeFilter->options);

4343}

4444

45−void MultiRangeFilter::onOptionsChanged(unity::dash::MultiRangeFilter::Options /* options */)

45+void MultiRangeFilter::onOptionsChanged(unity::dash::MultiRangeFilter::Options options)

4646{

4747 if (m_options != nullptr) {

4848 m_signals.disconnectAll();

@@ -50,7 +50,7 @@ void MultiRangeFilter::onOptionsChanged(unity::dash::MultiRangeFilter::Options /

5050 m_options = nullptr;

5151 }

5252

53− m_options = new UnityOptionsModel(this, m_unityMultiRangeFilter->options,

53+ m_options = new UnityOptionsModel(this, options,

5454 m_unityMultiRangeFilter->option_added,

5555 m_unityMultiRangeFilter->option_removed);

5656

plugins/Unity/multirangefilter.h−1

@@ -30,7 +30,6 @@

3030

3131// Local

3232#include "filter.h"

33−#include "filteroption.h"

3433#include "signalslist.h"

3534

3635class GenericOptionsModel;

plugins/Unity/ratingfilteroption.cpp+1−1

@@ -17,6 +17,7 @@

1717 * along with this program. If not, see <http://www.gnu.org/licenses/>.

1818 */

1919

20+// self

2021#include "ratingfilteroption.h"

2122

2223RatingFilterOption::RatingFilterOption(const QString &id, float value, QObject *parent) :

@@ -32,7 +33,6 @@ QString RatingFilterOption::id() const

3233 return m_id;

3334}

3435

35−

3636QString RatingFilterOption::name() const

3737{

3838 return QString::Null();

plugins/Unity/ratingfilteroption.h+3

@@ -20,12 +20,15 @@

2020#ifndef RATINGFILTEROPTION_H

2121#define RATINGFILTEROPTION_H

2222

23+// local

2324#include "abstractfilteroption.h"

2425

2526class Q_DECL_EXPORT RatingFilterOption : public AbstractFilterOption

2627{

2728 Q_OBJECT

2829

30+ Q_PROPERTY(float value READ value CONSTANT)

31+

2932public:

3033 explicit RatingFilterOption(const QString &id, float ratingValue, QObject *parent = nullptr);

3134

plugins/Unity/ratingsfilter.cpp+3−1

@@ -65,6 +65,8 @@ void RatingsFilter::onActiveChanged(AbstractFilterOption *option)

6565 RatingFilterOption *ratingOption = dynamic_cast<RatingFilterOption*>(option);

6666 if (ratingOption != nullptr)

6767 {

68− m_unityRatingsFilter->rating = ratingOption->active() ? ratingOption->value() : 0.0f;

68+ const float val = ratingOption->active() ? ratingOption->value() : 0.0f;

69+ m_unityRatingsFilter->rating = val;

70+ Q_EMIT ratingChanged(val);

6971 }

7072}