bb6329c · unity8 · git.iko.soy

plugins/Unity/combinedfilteroption.cpp+1−6

compare with xenial

unifiedsplit

@@ -18,7 +18,6 @@

18 */

19

20#include "combinedfilteroption.h"

21−#include <QDebug>

22

21

23CombinedFilterOption::CombinedFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1, unity::dash::FilterOption::Ptr unityFilterOption2, QObject *parent)

22CombinedFilterOption::CombinedFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1, unity::dash::FilterOption::Ptr unityFilterOption2, QObject *parent)

24 : AbstractFilterOption(parent),

23 : AbstractFilterOption(parent),

@@ -109,11 +108,7 @@ void CombinedFilterOption::onActiveChanged(bool /*active*/)

109

108

110void CombinedFilterOption::setUnityFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1, unity::dash::FilterOption::Ptr unityFilterOption2)

109void CombinedFilterOption::setUnityFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1, unity::dash::FilterOption::Ptr unityFilterOption2)

111{

110{

112− for (int i=0; i<2; i++) {

113− if (m_unityFilterOption[0] != nullptr) {

114− m_signals.disconnectAll();

111+ m_signals.disconnectAll();

115− }

116− }

117

112

118 m_unityFilterOption[0] = unityFilterOption1;

113 m_unityFilterOption[0] = unityFilterOption1;

119 m_unityFilterOption[1] = unityFilterOption2;

114 m_unityFilterOption[1] = unityFilterOption2;

plugins/Unity/combinedfilteroptions.h+2−2

@@ -17,8 +17,8 @@

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

18 */

19

20−#ifndef COMBINEDOPTIONSWRAPPER_H

20+#ifndef COMBINEDFILTEROPTIONS_H

21−#define COMBINEDOPTIONSWRAPPER_H

21+#define COMBINEDFILTEROPTIONS_H

22

23// Qt

24#include <QObject>

plugins/Unity/ratingfilteroption.h+1−1

@@ -42,8 +42,8 @@ Q_SIGNALS:

42

43private:

44 bool m_active;

45− float m_value;

46 QString m_id;

45 QString m_id;

46+ float m_value;

47};

48

49Q_DECLARE_METATYPE(RatingFilterOption*)