git.iko.soy/unity8
on xenial help sign in
Cleanup
9ef0600Josh Arenson
plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp−1
compare with xenial
unifiedsplit
@@ -30,7 +30,6 @@
30#include "SessionsModelPrivate.h"
30#include "SessionsModelPrivate.h"
31#include <QtCore/QDir>
31#include <QtCore/QDir>
32#include <QtCore/QString>
32#include <QtCore/QString>
33−#include <QtGui/QIcon>
34
33
35namespace QLightDM
34namespace QLightDM
36{
35{
plugins/LightDM/SessionsModel.cpp+1−12
@@ -18,6 +18,7 @@
18#include "SessionsModel.h"
18#include "SessionsModel.h"
19#include <QtCore/QFile>
19#include <QtCore/QFile>
20#include <QtCore/QSortFilterProxyModel>
20#include <QtCore/QSortFilterProxyModel>
21+
21QHash<int, QByteArray> SessionsModel::roleNames() const
22QHash<int, QByteArray> SessionsModel::roleNames() const
22{
23{
23 return m_roleNames;
24 return m_roleNames;
@@ -34,18 +35,6 @@ QList<QUrl> SessionsModel::iconSearchDirectories() const
34 return m_iconSearchDirectories;
35 return m_iconSearchDirectories;
35}
36}
36
37
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−
49QUrl SessionsModel::iconUrl(QString sessionName) const
38QUrl SessionsModel::iconUrl(QString sessionName) const
50{
39{
51 Q_FOREACH(const QUrl& searchDirectory, m_iconSearchDirectories)
40 Q_FOREACH(const QUrl& searchDirectory, m_iconSearchDirectories)
plugins/LightDM/SessionsModel.h−1
@@ -45,7 +45,6 @@ public:
45
45
46 QHash<int, QByteArray> roleNames() const override;
46 QHash<int, QByteArray> roleNames() const override;
47 int rowCount(const QModelIndex& parent) const override;
47 int rowCount(const QModelIndex& parent) const override;
48− QModelIndex sessionIndex(QString sessionName) const;
49 QVariant data(const QModelIndex& index, int role) const override;
48 QVariant data(const QModelIndex& index, int role) const override;
50 QList<QUrl> iconSearchDirectories() const;
49 QList<QUrl> iconSearchDirectories() const;
51 Q_INVOKABLE QUrl iconUrl(QString sessionName) const;
50 Q_INVOKABLE QUrl iconUrl(QString sessionName) const;
tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp−1
@@ -17,7 +17,6 @@
17
17
18#include "MockSessionsModel.h"
18#include "MockSessionsModel.h"
19#include <QLightDM/SessionsModel>
19#include <QLightDM/SessionsModel>
20−#include <QSortFilterProxyModel>
21
20
22QString MockSessionsModel::testScenario() const
21QString MockSessionsModel::testScenario() const
23{
22{
tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp−1
@@ -25,7 +25,6 @@
25#include "SessionsModelPrivate.h"
25#include "SessionsModelPrivate.h"
26#include <QtCore/QDir>
26#include <QtCore/QDir>
27#include <QtCore/QString>
27#include <QtCore/QString>
28−#include <QtGui/QIcon>
29
28
30namespace QLightDM
29namespace QLightDM
31{
30{
tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp+1−1
@@ -16,7 +16,7 @@
16
16
17#include "SessionsModel.h"
17#include "SessionsModel.h"
18#include "SessionsModelPrivate.h"
18#include "SessionsModelPrivate.h"
19−#include <QDebug>
19+
20namespace QLightDM
20namespace QLightDM
21{
21{
22
22
tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp+1−1
@@ -20,7 +20,7 @@
20#include <QtCore/QModelIndex>
20#include <QtCore/QModelIndex>
21#include <QtTest>
21#include <QtTest>
22#include <QString>
22#include <QString>
23−#include <QDebug>
23+
24class GreeterSessionsModelTest : public QObject
24class GreeterSessionsModelTest : public QObject
25{
25{
26 Q_OBJECT
26 Q_OBJECT