Small review changes
commitddb457eedb92ed5bec5d9bf8b8411b6afcd91282
authorJosh Arenson <joshua.arenson@canonical.com>
dateMon 23 Nov 2015, 14:57 (11 years ago)
parent4b79442
plugins/LightDM/SessionsModel.cpp+1−1
@@ -68,7 +68,7 @@ QVariant SessionsModel::data(const QModelIndex& index, int role) const
6868{
6969 switch (role) {
7070 case SessionsModel::IconRole:
71− return QVariant(iconUrl(m_model->data(index, Qt::DisplayRole).toString()));
71+ return iconUrl(m_model->data(index, Qt::DisplayRole).toString());
7272 default:
7373 return m_model->data(index, role);
7474 }
plugins/LightDM/SessionsModel.h+1−1
@@ -46,7 +46,7 @@ public:
4646 IconRole
4747 };
4848
49− explicit SessionsModel(QObject* parent=0);
49+ explicit SessionsModel(QObject* parent=nullptr);
5050
5151 QHash<int, QByteArray> roleNames() const override;
5252 int rowCount(const QModelIndex& parent) const override;
tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp+1−1
@@ -26,7 +26,7 @@ QString MockSessionsModel::testScenario() const
2626 return qSessionsModel->testScenario();
2727}
2828
29−void MockSessionsModel::setTestScenario(QString testScenario)
29+void MockSessionsModel::setTestScenario(const QString testScenario)
3030{
3131 QLightDM::SessionsModel* qSessionsModel =
3232 static_cast<QLightDM::SessionsModel*>(sourceModel());
tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h+2−2
@@ -49,8 +49,8 @@ class Q_DECL_EXPORT SessionsModel : public QAbstractListModel
4949 RemoteSessions
5050 };
5151
52− explicit SessionsModel(QObject* parent=0); /** Deprecated. Loads local sessions*/
53− explicit SessionsModel(SessionsModel::SessionType, QObject* parent=0);
52+ explicit SessionsModel(QObject* parent=nullptr); /** Deprecated. Loads local sessions*/
53+ explicit SessionsModel(SessionsModel::SessionType, QObject* parent=nullptr);
5454 virtual ~SessionsModel();
5555
5656 QHash<int, QByteArray> roleNames() const override;
tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp+1−1
@@ -49,7 +49,7 @@ private Q_SLOTS:
4949 }
5050 }
5151
52− void testMultupleSessionsCountIsCorrect()
52+ void testMultipleSessionsCountIsCorrect()
5353 {
5454 sourceModel->setTestScenario("multipleSessions");
5555 QVERIFY(sourceModel->rowCount(QModelIndex()) > 1);