git.iko.soy/unity8
on xenial help sign in
Some fixes after review.
commitbb6329c0a1c9f54ced7f40b6ae5caf351516b04c authorPawel Stolowski <pawel.stolowski@canonical.com> dateFri 12 Jul 2013, 14:16 (13 years ago) parent6ac0b67
3 files changed+4−9
compare with xenial
unifiedsplit
plugins/Unity/combinedfilteroption.cpp+1−6 plugins/Unity/combinedfilteroptions.h+2−2 plugins/Unity/ratingfilteroption.h+1−1
plugins/Unity/combinedfilteroption.cpp+1−6
@@ -18,7 +18,6 @@
1818 */
1919
2020#include "combinedfilteroption.h"
21−#include <QDebug>
2221
2322CombinedFilterOption::CombinedFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1, unity::dash::FilterOption::Ptr unityFilterOption2, QObject *parent)
2423 : AbstractFilterOption(parent),
@@ -109,11 +108,7 @@ void CombinedFilterOption::onActiveChanged(bool /*active*/)
109108
110109void CombinedFilterOption::setUnityFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1, unity::dash::FilterOption::Ptr unityFilterOption2)
111110{
112− for (int i=0; i<2; i++) {
113− if (m_unityFilterOption[0] != nullptr) {
114− m_signals.disconnectAll();
115− }
116− }
111+ m_signals.disconnectAll();
117112
118113 m_unityFilterOption[0] = unityFilterOption1;
119114 m_unityFilterOption[1] = unityFilterOption2;
plugins/Unity/combinedfilteroptions.h+2−2
@@ -17,8 +17,8 @@
1717 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1818 */
1919
20−#ifndef COMBINEDOPTIONSWRAPPER_H
21−#define COMBINEDOPTIONSWRAPPER_H
20+#ifndef COMBINEDFILTEROPTIONS_H
21+#define COMBINEDFILTEROPTIONS_H
2222
2323// Qt
2424#include <QObject>
plugins/Unity/ratingfilteroption.h+1−1
@@ -42,8 +42,8 @@ Q_SIGNALS:
4242
4343private:
4444 bool m_active;
45− float m_value;
4645 QString m_id;
46+ float m_value;
4747};
4848
4949Q_DECLARE_METATYPE(RatingFilterOption*)