diff options
| -rw-r--r-- | greeters/qt/loginprompt.cpp | 2 | ||||
| -rw-r--r-- | greeters/qt/panel.cpp | 2 | ||||
| -rw-r--r-- | greeters/qt/panel.ui | 6 | ||||
| -rw-r--r-- | liblightdm-qt/QLightDM/session.h | 2 | ||||
| -rw-r--r-- | liblightdm-qt/QLightDM/user.h | 3 | ||||
| -rw-r--r-- | liblightdm-qt/session.cpp | 11 | ||||
| -rw-r--r-- | liblightdm-qt/user.cpp | 11 |
7 files changed, 3 insertions, 34 deletions
diff --git a/greeters/qt/loginprompt.cpp b/greeters/qt/loginprompt.cpp index c2c688ca..d7608a69 100644 --- a/greeters/qt/loginprompt.cpp +++ b/greeters/qt/loginprompt.cpp @@ -29,7 +29,7 @@ LoginPrompt::LoginPrompt(QLightDM::Greeter *greeter, QWidget *parent) : ui->hostnameLabel->setText(QLightDM::System::hostname()); - ui->userListView->setModel(QLightDM::users()); + ui->userListView->setModel(new QLightDM::UsersModel(this)); connect(ui->loginButton, SIGNAL(released()), SLOT(onLoginButtonClicked())); connect(m_greeter, SIGNAL(authenticationComplete()), SLOT(onAuthenticationComplete())); diff --git a/greeters/qt/panel.cpp b/greeters/qt/panel.cpp index 9de004fc..30917674 100644 --- a/greeters/qt/panel.cpp +++ b/greeters/qt/panel.cpp @@ -55,7 +55,7 @@ Panel::Panel(QLightDM::Greeter *greeter, QWidget *parent): powerMenu->addAction(hibernateAction); ui->powerOptionsButton->setMenu(powerMenu); - ui->sessionCombo->setModel(QLightDM::sessions()); + ui->sessionCombo->setModel(new QLightDM::SessionsModel(this)); } QString Panel::session() const diff --git a/greeters/qt/panel.ui b/greeters/qt/panel.ui index 56e63be5..045de6b9 100644 --- a/greeters/qt/panel.ui +++ b/greeters/qt/panel.ui @@ -15,12 +15,6 @@ </property> <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QComboBox" name="languageCombo"/> - </item> - <item> - <widget class="QComboBox" name="layoutCombo"/> - </item> - <item> <widget class="QComboBox" name="sessionCombo"/> </item> <item> diff --git a/liblightdm-qt/QLightDM/session.h b/liblightdm-qt/QLightDM/session.h index e3343274..f859e4ce 100644 --- a/liblightdm-qt/QLightDM/session.h +++ b/liblightdm-qt/QLightDM/session.h @@ -35,8 +35,6 @@ namespace QLightDM { SessionsModelPrivate *d; void buildList(); //maybe make this a public slot, which apps can call only if they give a care about the session. }; - - SessionsModel *sessions(); }; #endif // QLIGHTDM_SESSION_H diff --git a/liblightdm-qt/QLightDM/user.h b/liblightdm-qt/QLightDM/user.h index 136e2c1f..ea33a2c3 100644 --- a/liblightdm-qt/QLightDM/user.h +++ b/liblightdm-qt/QLightDM/user.h @@ -45,7 +45,6 @@ private: QList<UserItem> getUsers() const; }; -UsersModel *users(); -} +}; #endif // QLIGHTDM_USER_H diff --git a/liblightdm-qt/session.cpp b/liblightdm-qt/session.cpp index b2274ec8..5b9b1d82 100644 --- a/liblightdm-qt/session.cpp +++ b/liblightdm-qt/session.cpp @@ -29,22 +29,11 @@ public: class SessionItem { public: - //FIXME can I make these consts, if I set them in a lovely constructor? QString id; QString name; QString comment; }; -static SessionsModel *session_model = NULL; - -SessionsModel *QLightDM::sessions() -{ - if (!session_model) - session_model = new SessionsModel (); - - return session_model; -} - SessionsModel::SessionsModel(QObject *parent) : QAbstractListModel(parent), d(new SessionsModelPrivate()) diff --git a/liblightdm-qt/user.cpp b/liblightdm-qt/user.cpp index fb1643b4..0bb407df 100644 --- a/liblightdm-qt/user.cpp +++ b/liblightdm-qt/user.cpp @@ -25,17 +25,6 @@ using namespace QLightDM; -static UsersModel *user_model = NULL; - -UsersModel *QLightDM::users() -{ - if (!user_model) - user_model = new UsersModel (); - - return user_model; -} - - class UserItem { public: |