git.iko.soy/unity8
on xenial help sign in
reverting r 1076
6ab6bceMichael Zanetti
tests/mocks/QMenuModel/unitymenumodel.cpp+1−7
compare with xenial
unifiedsplit
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013-2014 Canonical, Ltd.
2+ * Copyright (C) 2013 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 *
15 *
16 * Authors: Nick Dedekind <nick.dedekind@canonical.com>
16 * Authors: Nick Dedekind <nick.dedekind@canonical.com>
17− * Daniel d'Andrada <daniel.dandrada@canonical.com>
18 */
17 */
19
18
20#include "unitymenumodel.h"
19#include "unitymenumodel.h"
@@ -241,8 +240,3 @@ void UnityMenuModel::registerAction(UnityMenuAction*)
241void UnityMenuModel::unregisterAction(UnityMenuAction*)
240void UnityMenuModel::unregisterAction(UnityMenuAction*)
242{
241{
243}
242}
244−
245−QByteArray UnityMenuModel::nameOwner() const
246−{
247− return QByteArray();
248−}
tests/mocks/QMenuModel/unitymenumodel.h+1−6
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013-2014 Canonical, Ltd.
2+ * Copyright (C) 2013 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 *
15 *
16 * Authors: Nick Dedekind <nick.dedekind@canonical.com>
16 * Authors: Nick Dedekind <nick.dedekind@canonical.com>
17− * Daniel d'Andrada <daniel.dandrada@canonical.com>
18 */
17 */
19
18
20#ifndef MOCK_UNITYMENUMODEL_H
19#ifndef MOCK_UNITYMENUMODEL_H
@@ -30,7 +29,6 @@ class Q_DECL_EXPORT UnityMenuModel : public QAbstractListModel
30 Q_OBJECT
29 Q_OBJECT
31 Q_PROPERTY(QVariant modelData READ modelData WRITE setModelData NOTIFY modelDataChanged)
30 Q_PROPERTY(QVariant modelData READ modelData WRITE setModelData NOTIFY modelDataChanged)
32 Q_PROPERTY(QByteArray busName READ busName WRITE setBusName NOTIFY busNameChanged)
31 Q_PROPERTY(QByteArray busName READ busName WRITE setBusName NOTIFY busNameChanged)
33− Q_PROPERTY(QByteArray nameOwner READ nameOwner NOTIFY nameOwnerChanged)
34 Q_PROPERTY(QVariantMap actions READ actions WRITE setActions NOTIFY actionsChanged)
32 Q_PROPERTY(QVariantMap actions READ actions WRITE setActions NOTIFY actionsChanged)
35 Q_PROPERTY(QByteArray menuObjectPath READ menuObjectPath WRITE setMenuObjectPath NOTIFY menuObjectPathChanged)
33 Q_PROPERTY(QByteArray menuObjectPath READ menuObjectPath WRITE setMenuObjectPath NOTIFY menuObjectPathChanged)
36 Q_PROPERTY(ActionStateParser* actionStateParser READ actionStateParser WRITE setActionStateParser NOTIFY actionStateParserChanged)
34 Q_PROPERTY(ActionStateParser* actionStateParser READ actionStateParser WRITE setActionStateParser NOTIFY actionStateParserChanged)
@@ -49,8 +47,6 @@ public:
49 QByteArray busName() const;
47 QByteArray busName() const;
50 void setBusName(const QByteArray &busName);
48 void setBusName(const QByteArray &busName);
51
49
52− QByteArray nameOwner() const;
53−
54 QVariantMap actions() const;
50 QVariantMap actions() const;
55 void setActions(const QVariantMap &actions);
51 void setActions(const QVariantMap &actions);
56
52
@@ -79,7 +75,6 @@ public:
79
75
80Q_SIGNALS:
76Q_SIGNALS:
81 void busNameChanged();
77 void busNameChanged();
82− void nameOwnerChanged(const QByteArray &owner);
83 void actionsChanged();
78 void actionsChanged();
84 void menuObjectPathChanged();
79 void menuObjectPathChanged();
85 void actionStateParserChanged();
80 void actionStateParserChanged();