ddb457e · unity8 · git.iko.soy

plugins/LightDM/SessionsModel.cpp+1−1

compare with xenial

unifiedsplit

@@ -68,7 +68,7 @@ QVariant SessionsModel::data(const QModelIndex& index, int role) const

68{

69 switch (role) {

70 case SessionsModel::IconRole:

71− return QVariant(iconUrl(m_model->data(index, Qt::DisplayRole).toString()));

71+ return iconUrl(m_model->data(index, Qt::DisplayRole).toString());

72 default:

73 return m_model->data(index, role);

74 }

plugins/LightDM/SessionsModel.h+1−1

@@ -46,7 +46,7 @@ public:

46 IconRole

47 };

48

49− explicit SessionsModel(QObject* parent=0);

49+ explicit SessionsModel(QObject* parent=nullptr);

50

51 QHash<int, QByteArray> roleNames() const override;

52 int rowCount(const QModelIndex& parent) const override;

tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp+1−1

@@ -26,7 +26,7 @@ QString MockSessionsModel::testScenario() const

26 return qSessionsModel->testScenario();

27}

28

29−void MockSessionsModel::setTestScenario(QString testScenario)

29+void MockSessionsModel::setTestScenario(const QString testScenario)

30{

31 QLightDM::SessionsModel* qSessionsModel =

32 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

49 RemoteSessions

50 };

51

52− explicit SessionsModel(QObject* parent=0); /** Deprecated. Loads local sessions*/

52+ explicit SessionsModel(QObject* parent=nullptr); /** Deprecated. Loads local sessions*/

53− explicit SessionsModel(SessionsModel::SessionType, QObject* parent=0);

53+ explicit SessionsModel(SessionsModel::SessionType, QObject* parent=nullptr);

54 virtual ~SessionsModel();

55

56 QHash<int, QByteArray> roleNames() const override;

tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp+1−1

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

49 }

50 }

51

52− void testMultupleSessionsCountIsCorrect()

52+ void testMultipleSessionsCountIsCorrect()

53 {

54 sourceModel->setTestScenario("multipleSessions");

55 QVERIFY(sourceModel->rowCount(QModelIndex()) > 1);