diff options
author | Aurelien Gateau <aurelien.gateau@canonical.com> | 2012-01-09 16:56:36 +0100 |
---|---|---|
committer | Aurelien Gateau <aurelien.gateau@canonical.com> | 2012-01-09 16:56:36 +0100 |
commit | 29199b6aae11df520f47eb7fb76c5dc11dcd41b4 (patch) | |
tree | 9bd15e3c7c5130b07f669dcbd92042d55e3a8429 /liblightdm-qt | |
parent | 9518d82da516c949eb35b57302b0490318090494 (diff) | |
download | lightdm-29199b6aae11df520f47eb7fb76c5dc11dcd41b4.tar.gz |
Remove the System namespace.
liblightdm-qt users should call Greeter::hostname() instead.
Diffstat (limited to 'liblightdm-qt')
-rw-r--r-- | liblightdm-qt/Makefile.am | 3 | ||||
-rw-r--r-- | liblightdm-qt/QLightDM/System | 1 | ||||
-rw-r--r-- | liblightdm-qt/QLightDM/system.h | 27 | ||||
-rw-r--r-- | liblightdm-qt/system.cpp | 22 |
4 files changed, 0 insertions, 53 deletions
diff --git a/liblightdm-qt/Makefile.am b/liblightdm-qt/Makefile.am index eb92befa..865637f2 100644 --- a/liblightdm-qt/Makefile.am +++ b/liblightdm-qt/Makefile.am @@ -22,12 +22,10 @@ liblightdm_qt_2include_HEADERS = \ QLightDM/Greeter \ QLightDM/Power \ QLightDM/SessionsModel \ - QLightDM/System \ QLightDM/UsersModel \ QLightDM/greeter.h \ QLightDM/power.h \ QLightDM/sessionsmodel.h \ - QLightDM/system.h \ QLightDM/usersmodel.h liblightdm_qt_2includedir=$(includedir)/lightdm-qt-2/QLightDM @@ -36,7 +34,6 @@ liblightdm_qt_2_la_SOURCES = \ greeter.cpp \ power.cpp \ sessionsmodel.cpp \ - system.cpp \ usersmodel.cpp \ $(liblightdm_qt_2include_HEADERS) diff --git a/liblightdm-qt/QLightDM/System b/liblightdm-qt/QLightDM/System deleted file mode 100644 index 3f9275fc..00000000 --- a/liblightdm-qt/QLightDM/System +++ /dev/null @@ -1 +0,0 @@ -#include "QLightDM/system.h"
\ No newline at end of file diff --git a/liblightdm-qt/QLightDM/system.h b/liblightdm-qt/QLightDM/system.h deleted file mode 100644 index 534925b3..00000000 --- a/liblightdm-qt/QLightDM/system.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2010-2011 David Edmundson. - * Copyright (C) 2010-2011 Robert Ancell - * Author: David Edmundson <kde@davidedmundson.co.uk> - * - * This library is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 3 of the License, or (at your option) any - * later version. See http://www.gnu.org/copyleft/lgpl.html the full text of the - * license. - */ - -#ifndef QLIGHTDM_SYSTEM_H -#define QLIGHTDM_SYSTEM_H - -#include <QtCore/QString> - -namespace QLightDM -{ - class System - { - public: - static QString hostname(); - }; -}; - -#endif // QLIGHTDM_SYSTEM_H diff --git a/liblightdm-qt/system.cpp b/liblightdm-qt/system.cpp deleted file mode 100644 index 84040aa0..00000000 --- a/liblightdm-qt/system.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2010-2011 David Edmundson - * Copyright (C) 2010-2011 Robert Ancell - * Author: David Edmundson <kde@davidedmundson.co.uk> - * - * This library is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 3 of the License, or (at your option) any - * later version. See http://www.gnu.org/copyleft/lgpl.html the full text of the - * license. - */ - -#include "QLightDM/system.h" - -#include <lightdm.h> - -using namespace QLightDM; - -QString System::hostname() -{ - return QString::fromLocal8Bit(lightdm_get_hostname()); -} |