9cc9cef · unity8 · git.iko.soy

git.iko.soy/unity8

Some minor cleanup nits

commit9cc9cef4aedca3b8afe5a6f9454132e05f5e821c authorMichael Terry <michael.terry@canonical.com> dateTue 16 Feb 2016, 09:12 (11 years ago) parent7e97f61

2 files changed+6−10

compare with xenial

unifiedsplit

plugins/AccountsService/AccountsServiceDBusAdaptor.cpp+2−4 plugins/AccountsService/AccountsServiceDBusAdaptor.h+4−6

plugins/AccountsService/AccountsServiceDBusAdaptor.cpp+2−4

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU General Public License as published by

@@ -12,8 +12,6 @@

1212 *

1313 * You should have received a copy of the GNU General Public License

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

15− *

16− * Author: Michael Terry <michael.terry@canonical.com>

1715 */

1816

1917#include "AccountsServiceDBusAdaptor.h"

@@ -89,7 +87,7 @@ void AccountsServiceDBusAdaptor::maybeChangedSlot()

8987 m_ignoreNextChanged = false;

9088}

9189

92−QString AccountsServiceDBusAdaptor::getUserForPath(const QString &path)

90+QString AccountsServiceDBusAdaptor::getUserForPath(const QString &path) const

9391{

9492 QMap<QString, QDBusInterface *>::const_iterator i;

9593 for (i = m_users.constBegin(); i != m_users.constEnd(); ++i) {

plugins/AccountsService/AccountsServiceDBusAdaptor.h+4−6

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU General Public License as published by

@@ -12,8 +12,6 @@

1212 *

1313 * You should have received a copy of the GNU General Public License

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

15− *

16− * Authors: Michael Terry <michael.terry@canonical.com>

1715 */

1816

1917#ifndef UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H

@@ -36,8 +34,8 @@ public:

3634 ~AccountsServiceDBusAdaptor() = default;

3735

3836 QDBusPendingReply<QVariantMap> getAllPropertiesAsync(const QString &user, const QString &interface);

39− Q_INVOKABLE QDBusPendingReply<QVariant> getUserPropertyAsync(const QString &user, const QString &interface, const QString &property);

40− Q_INVOKABLE QDBusPendingCall setUserPropertyAsync(const QString &user, const QString &interface, const QString &property, const QVariant &value);

37+ QDBusPendingReply<QVariant> getUserPropertyAsync(const QString &user, const QString &interface, const QString &property);

38+ QDBusPendingCall setUserPropertyAsync(const QString &user, const QString &interface, const QString &property, const QVariant &value);

4139

4240Q_SIGNALS:

4341 void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);

@@ -49,7 +47,7 @@ private Q_SLOTS:

4947

5048private:

5149 QDBusInterface *getUserInterface(const QString &user);

52− QString getUserForPath(const QString &path);

50+ QString getUserForPath(const QString &path) const;

5351

5452 QDBusInterface *m_accountsManager;

5553 QMap<QString, QDBusInterface *> m_users;