git.iko.soy/unity8
on xenial help sign in
Few more fixes
c74ed71Michal Hruby
plugins/Unity/categories.cpp+1
compare with xenial
unifiedsplit
@@ -3,6 +3,7 @@
3 *
3 *
4 * Authors:
4 * Authors:
5 * Michał Sawicz <michal.sawicz@canonical.com>
5 * Michał Sawicz <michal.sawicz@canonical.com>
6+ * Michal Hruby <michal.hruby@canonical.com>
6 *
7 *
7 * This program is free software; you can redistribute it and/or modify
8 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
9 * it under the terms of the GNU General Public License as published by
plugins/Unity/categories.h+1
@@ -3,6 +3,7 @@
3 *
3 *
4 * Authors:
4 * Authors:
5 * Michał Sawicz <michal.sawicz@canonical.com>
5 * Michał Sawicz <michal.sawicz@canonical.com>
6+ * Michal Hruby <michal.hruby@canonical.com>
6 *
7 *
7 * This program is free software; you can redistribute it and/or modify
8 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
9 * it under the terms of the GNU General Public License as published by
plugins/Unity/categoryresults.cpp+6−6
@@ -2,7 +2,7 @@
2 * Copyright (C) 2013 Canonical, Ltd.
2 * Copyright (C) 2013 Canonical, Ltd.
3 *
3 *
4 * Authors:
4 * Authors:
5− * Michał Sawicz <michal.sawicz@canonical.com>
5+ * Michał Hruby <michal.hruby@canonical.com>
6 *
6 *
7 * This program is free software; you can redistribute it and/or modify
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
8 * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ enum ResultsColumn {
35
35
36CategoryResults::CategoryResults(QObject* parent)
36CategoryResults::CategoryResults(QObject* parent)
37 : DeeListModel(parent)
37 : DeeListModel(parent)
38− , m_category_index(-1)
38+ , m_categoryIndex(-1)
39{
39{
40 m_roles[CategoryResults::RoleUri] = "uri";
40 m_roles[CategoryResults::RoleUri] = "uri";
41 m_roles[CategoryResults::RoleIconHint] = "icon";
41 m_roles[CategoryResults::RoleIconHint] = "icon";
@@ -49,14 +49,14 @@ CategoryResults::CategoryResults(QObject* parent)
49
49
50int CategoryResults::categoryIndex() const
50int CategoryResults::categoryIndex() const
51{
51{
52− return m_category_index;
52+ return m_categoryIndex;
53}
53}
54
54
55void CategoryResults::setCategoryIndex(int index)
55void CategoryResults::setCategoryIndex(int index)
56{
56{
57− if (m_category_index != index) {
57+ if (m_categoryIndex != index) {
58− m_category_index = index;
58+ m_categoryIndex = index;
59− Q_EMIT categoryIndexChanged(m_category_index);
59+ Q_EMIT categoryIndexChanged(m_categoryIndex);
60 }
60 }
61}
61}
62
62
plugins/Unity/categoryresults.h+2−2
@@ -2,7 +2,7 @@
2 * Copyright (C) 2013 Canonical, Ltd.
2 * Copyright (C) 2013 Canonical, Ltd.
3 *
3 *
4 * Authors:
4 * Authors:
5− * Michał Sawicz <michal.sawicz@canonical.com>
5+ * Michal Hruby <michal.hruby@canonical.com>
6 *
6 *
7 * This program is free software; you can redistribute it and/or modify
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
8 * it under the terms of the GNU General Public License as published by
@@ -61,7 +61,7 @@ Q_SIGNALS:
61
61
62private:
62private:
63 QHash<int, QByteArray> m_roles;
63 QHash<int, QByteArray> m_roles;
64− int m_category_index;
64+ int m_categoryIndex;
65};
65};
66
66
67#endif // CATEGORY_RESULTS_H
67#endif // CATEGORY_RESULTS_H
plugins/Unity/scope.cpp+1
@@ -3,6 +3,7 @@
3 *
3 *
4 * Authors:
4 * Authors:
5 * Florian Boucault <florian.boucault@canonical.com>
5 * Florian Boucault <florian.boucault@canonical.com>
6+ * Michal Hruby <michal.hruby@canonical.com>
6 *
7 *
7 * This program is free software; you can redistribute it and/or modify
8 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
9 * it under the terms of the GNU General Public License as published by