78f5795 · unity8 · git.iko.soy

git.iko.soy/unity8

use auto variables, align coding style, Qt'ify API

commit78f579555694ce57a3aabcbf7805e730158baf53 authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 19 Sep 2013, 17:36 (13 years ago) parent9cc9b74

5 files changed+28−28

compare with xenial

unifiedsplit

plugins/AccountsService/AccountsService.cpp+3−3 plugins/AccountsService/AccountsService.h+6−6 plugins/AccountsService/AccountsServiceDBusAdaptor.cpp+15−15 plugins/AccountsService/AccountsServiceDBusAdaptor.h+2−2 tests/plugins/AccountsService/client.cpp+2−2

plugins/AccountsService/AccountsService.cpp+3−3

@@ -32,7 +32,7 @@ AccountsService::AccountsService(QObject* parent)

3232 this, SLOT(maybeChanged(const QString &)));

3333}

3434

35−QString AccountsService::getUser()

35+QString AccountsService::user() const

3636{

3737 return m_user;

3838}

@@ -46,7 +46,7 @@ void AccountsService::setUser(const QString &user)

4646 updateBackgroundFile();

4747}

4848

49−bool AccountsService::getDemoEdges()

49+bool AccountsService::demoEdges() const

5050{

5151 return m_demoEdges;

5252}

@@ -57,7 +57,7 @@ void AccountsService::setDemoEdges(bool demoEdges)

5757 m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges", demoEdges);

5858}

5959

60−QString AccountsService::getBackgroundFile()

60+QString AccountsService::backgroundFile() const

6161{

6262 return m_backgroundFile;

6363}

plugins/AccountsService/AccountsService.h+6−6

@@ -28,25 +28,25 @@ class AccountsService: public QObject

2828{

2929 Q_OBJECT

3030 Q_PROPERTY (QString user

31− READ getUser

31+ READ user

3232 WRITE setUser

3333 NOTIFY userChanged)

3434 Q_PROPERTY (bool demoEdges

35− READ getDemoEdges

35+ READ demoEdges

3636 WRITE setDemoEdges

3737 NOTIFY demoEdgesChanged)

3838 Q_PROPERTY (QString backgroundFile

39− READ getBackgroundFile

39+ READ backgroundFile

4040 NOTIFY backgroundFileChanged)

4141

4242public:

4343 explicit AccountsService(QObject *parent = 0);

4444

45− QString getUser();

45+ QString user() const;

4646 void setUser(const QString &user);

47− bool getDemoEdges();

47+ bool demoEdges() const;

4848 void setDemoEdges(bool demoEdges);

49− QString getBackgroundFile();

49+ QString backgroundFile() const;

5050

5151Q_SIGNALS:

5252 void userChanged();

plugins/AccountsService/AccountsServiceDBusAdaptor.cpp+15−15

@@ -24,13 +24,13 @@

2424

2525AccountsServiceDBusAdaptor::AccountsServiceDBusAdaptor(QObject* parent)

2626 : QObject(parent),

27− accounts_manager(NULL),

28− users()

27+ m_accountsManager(NULL),

28+ m_users()

2929{

30− auto connection = QDBusConnection::SM_BUSNAME();

31− auto interface = connection.interface();

30+ QDBusConnection connection = QDBusConnection::SM_BUSNAME();

31+ QDBusConnectionInterface *interface = connection.interface();

3232 interface->startService("org.freedesktop.Accounts");

33− accounts_manager = new QDBusInterface("org.freedesktop.Accounts",

33+ m_accountsManager = new QDBusInterface("org.freedesktop.Accounts",

3434 "/org/freedesktop/Accounts",

3535 "org.freedesktop.Accounts",

3636 connection, this);

@@ -38,9 +38,9 @@ AccountsServiceDBusAdaptor::AccountsServiceDBusAdaptor(QObject* parent)

3838

3939QVariant AccountsServiceDBusAdaptor::getUserProperty(const QString &user, const QString &interface, const QString &property)

4040{

41− auto iface = getUserInterface(user);

41+ QDBusInterface *iface = getUserInterface(user);

4242 if (iface != nullptr && iface->isValid()) {

43− auto answer = iface->call("Get", interface, property);

43+ QDBusMessage answer = iface->call("Get", interface, property);

4444 if (answer.type() == QDBusMessage::ReplyMessage) {

4545 return answer.arguments()[0].value<QDBusVariant>().variant();

4646 }

@@ -50,7 +50,7 @@ QVariant AccountsServiceDBusAdaptor::getUserProperty(const QString &user, const

5050

5151void AccountsServiceDBusAdaptor::setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value)

5252{

53− auto iface = getUserInterface(user);

53+ QDBusInterface *iface = getUserInterface(user);

5454 if (iface != nullptr && iface->isValid()) {

5555 // The value needs to be carefully wrapped

5656 iface->call("Set", interface, property, QVariant::fromValue(QDBusVariant(value)));

@@ -76,7 +76,7 @@ void AccountsServiceDBusAdaptor::maybeChangedSlot()

7676QString AccountsServiceDBusAdaptor::getUserForPath(const QString &path)

7777{

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

79− for (i = users.constBegin(); i != users.constEnd(); ++i) {

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

8080 if (i.value()->path() == path) {

8181 return i.key();

8282 }

@@ -86,16 +86,16 @@ QString AccountsServiceDBusAdaptor::getUserForPath(const QString &path)

8686

8787QDBusInterface *AccountsServiceDBusAdaptor::getUserInterface(const QString &user)

8888{

89− auto iface = users.value(user);

90− if (iface == nullptr && accounts_manager->isValid()) {

91− auto answer = accounts_manager->call("FindUserByName", user);

89+ QDBusInterface *iface = m_users.value(user);

90+ if (iface == nullptr && m_accountsManager->isValid()) {

91+ QDBusMessage answer = m_accountsManager->call("FindUserByName", user);

9292 if (answer.type() == QDBusMessage::ReplyMessage) {

93− auto path = answer.arguments()[0].value<QDBusObjectPath>().path();

93+ QString path = answer.arguments()[0].value<QDBusObjectPath>().path();

9494

9595 iface = new QDBusInterface("org.freedesktop.Accounts",

9696 path,

9797 "org.freedesktop.DBus.Properties",

98− accounts_manager->connection(), this);

98+ m_accountsManager->connection(), this);

9999

100100 // With its own pre-defined properties, AccountsService is oddly

101101 // close-lipped. It won't send out proper DBus.Properties notices,

@@ -119,7 +119,7 @@ QDBusInterface *AccountsServiceDBusAdaptor::getUserInterface(const QString &user

119119 this,

120120 SLOT(propertiesChangedSlot(QString, QVariantMap, QStringList)));

121121

122− users.insert(user, iface);

122+ m_users.insert(user, iface);

123123 }

124124 }

125125 return iface;

plugins/AccountsService/AccountsServiceDBusAdaptor.h+2−2

@@ -47,8 +47,8 @@ private:

4747 QDBusInterface *getUserInterface(const QString &user);

4848 QString getUserForPath(const QString &path);

4949

50− QDBusInterface *accounts_manager;

51− QMap<QString, QDBusInterface *> users;

50+ QDBusInterface *m_accountsManager;

51+ QMap<QString, QDBusInterface *> m_users;

5252};

5353

5454#endif

tests/plugins/AccountsService/client.cpp+2−2

@@ -50,9 +50,9 @@ private Q_SLOTS:

5050 AccountsService session;

5151 session.setUser("testuser");

5252 session.setDemoEdges(true);

53− QCOMPARE(session.getDemoEdges(), true);

53+ QCOMPARE(session.demoEdges(), true);

5454 session.setDemoEdges(false);

55− QCOMPARE(session.getDemoEdges(), false);

55+ QCOMPARE(session.demoEdges(), false);

5656 }

5757};

5858