on xenial help sign in
Cleanup
commit9ef0600e78dd8915b87f749a801915b78f1acbfa authorJosh Arenson <joshua.arenson@canonical.com> dateThu 19 Nov 2015, 13:35 (11 years ago) parente225248
7 files changed+3−18
plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp−1 plugins/LightDM/SessionsModel.cpp+1−12 plugins/LightDM/SessionsModel.h−1 tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp−1 tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp−1 tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp+1−1 tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp+1−1
plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp−1
@@ -30,7 +30,6 @@
3030#include "SessionsModelPrivate.h"
3131#include <QtCore/QDir>
3232#include <QtCore/QString>
33−#include <QtGui/QIcon>
3433
3534namespace QLightDM
3635{
plugins/LightDM/SessionsModel.cpp+1−12
@@ -18,6 +18,7 @@
1818#include "SessionsModel.h"
1919#include <QtCore/QFile>
2020#include <QtCore/QSortFilterProxyModel>
21+
2122QHash<int, QByteArray> SessionsModel::roleNames() const
2223{
2324 return m_roleNames;
@@ -34,18 +35,6 @@ QList<QUrl> SessionsModel::iconSearchDirectories() const
3435 return m_iconSearchDirectories;
3536}
3637
37−QModelIndex SessionsModel::sessionIndex(QString sessionName) const
38−{
39− for (int i = 0; i < rowCount(QModelIndex()); i ++) {
40− QModelIndex index = m_model->index(i, Qt::DisplayRole);
41− QString aSession(this->data(index, Qt::DisplayRole).toString());
42− if (!QString::compare(aSession, sessionName, Qt::CaseInsensitive)) {
43− return index;
44− }
45− }
46− return QModelIndex();
47−}
48−
4938QUrl SessionsModel::iconUrl(QString sessionName) const
5039{
5140 Q_FOREACH(const QUrl& searchDirectory, m_iconSearchDirectories)
plugins/LightDM/SessionsModel.h−1
@@ -45,7 +45,6 @@ public:
4545
4646 QHash<int, QByteArray> roleNames() const override;
4747 int rowCount(const QModelIndex& parent) const override;
48− QModelIndex sessionIndex(QString sessionName) const;
4948 QVariant data(const QModelIndex& index, int role) const override;
5049 QList<QUrl> iconSearchDirectories() const;
5150 Q_INVOKABLE QUrl iconUrl(QString sessionName) const;
tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp−1
@@ -17,7 +17,6 @@
1717
1818#include "MockSessionsModel.h"
1919#include <QLightDM/SessionsModel>
20−#include <QSortFilterProxyModel>
2120
2221QString MockSessionsModel::testScenario() const
2322{
tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp−1
@@ -25,7 +25,6 @@
2525#include "SessionsModelPrivate.h"
2626#include <QtCore/QDir>
2727#include <QtCore/QString>
28−#include <QtGui/QIcon>
2928
3029namespace QLightDM
3130{
tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp+1−1
@@ -16,7 +16,7 @@
1616
1717#include "SessionsModel.h"
1818#include "SessionsModelPrivate.h"
19−#include <QDebug>
19+
2020namespace QLightDM
2121{
2222
tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp+1−1
@@ -20,7 +20,7 @@
2020#include <QtCore/QModelIndex>
2121#include <QtTest>
2222#include <QString>
23−#include <QDebug>
23+
2424class GreeterSessionsModelTest : public QObject
2525{
2626 Q_OBJECT