diff options
author | Simon Rettberg | 2018-04-10 23:52:11 +0200 |
---|---|---|
committer | Simon Rettberg | 2018-04-10 23:52:11 +0200 |
commit | 05fbb7833951df9176bcadb3da809ff41f2e7d56 (patch) | |
tree | e4ca5ae12ca1d3e48d6e1fa9a7b0017cdc1d4e7f /src/main.cpp | |
parent | Trim username (diff) | |
download | slxgreeter-05fbb7833951df9176bcadb3da809ff41f2e7d56.tar.gz slxgreeter-05fbb7833951df9176bcadb3da809ff41f2e7d56.tar.xz slxgreeter-05fbb7833951df9176bcadb3da809ff41f2e7d56.zip |
Add clock, refactor settings class to be static
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index a5fa5db..7973a68 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -28,6 +28,8 @@ #include "x11util.h" #include "global.h" +Settings *s_settings = new Settings(); + static int sockets[2]; static void createSimpleBackground(); @@ -56,13 +58,13 @@ int main(int argc, char *argv[]) // to /var/log/lightdm/x-0-greeter.log, so we use std::cerr instead.. qInstallMessageHandler(messageHandler); - if (! Settings().iconThemeName().isEmpty()) { - QIcon::setThemeName(Settings().iconThemeName()); + if (!Settings::iconThemeName().isEmpty()) { + QIcon::setThemeName(Settings::iconThemeName()); } - if (!Global::testMode() && !Settings().autoLoginCheckCmd().isEmpty()) { + if (!Global::testMode() && !Settings::autoLoginCheckCmd().isEmpty()) { QProcess p; - int ret = QProcess::execute(Settings().autoLoginCheckCmd()); + int ret = QProcess::execute(Settings::autoLoginCheckCmd()); if (ret == 0) { if (Global::autoLoginGuest()) { qWarning() << "Guest login ok"; |