diff options
| author | David Edmundson <david@davidedmundson.co.uk> | 2011-11-16 00:35:26 +0000 |
|---|---|---|
| committer | David Edmundson <david@davidedmundson.co.uk> | 2011-11-16 00:35:26 +0000 |
| commit | 917c8fe94754c9de57689f28176b2b12fe1a419b (patch) | |
| tree | 0e3ec89a6429ab722e0061a8ee325d2e998300af /liblightdm-qt | |
| parent | b8b5c4cf53abe2d5f4518fabd54b174d8eb551e9 (diff) | |
| download | lightdm-917c8fe94754c9de57689f28176b2b12fe1a419b.tar.gz | |
User -> UsersModel
Diffstat (limited to 'liblightdm-qt')
| -rw-r--r-- | liblightdm-qt/Makefile.am | 10 | ||||
| -rw-r--r-- | liblightdm-qt/QLightDM/User | 1 | ||||
| -rw-r--r-- | liblightdm-qt/QLightDM/UsersModel | 1 | ||||
| -rw-r--r-- | liblightdm-qt/QLightDM/greeter.h | 1 | ||||
| -rw-r--r-- | liblightdm-qt/QLightDM/usersmodel.h (renamed from liblightdm-qt/QLightDM/user.h) | 1 | ||||
| -rw-r--r-- | liblightdm-qt/usersmodel.cpp (renamed from liblightdm-qt/user.cpp) | 4 |
6 files changed, 8 insertions, 10 deletions
diff --git a/liblightdm-qt/Makefile.am b/liblightdm-qt/Makefile.am index 11369c3f..4c1df547 100644 --- a/liblightdm-qt/Makefile.am +++ b/liblightdm-qt/Makefile.am @@ -6,8 +6,8 @@ greeter.cpp: QLightDM/greeter.h $(MOC) $< -o greeter_moc.cpp session.cpp: QLightDM/session.h $(MOC) $< -o session_moc.cpp -user.cpp: QLightDM/user.h - $(MOC) $< -o user_moc.cpp +usersmodel.cpp: QLightDM/usersmodel.h + $(MOC) $< -o usermodel_moc.cpp @@ -20,12 +20,12 @@ liblightdm_qt_1include_HEADERS = \ QLightDM/Power \ QLightDM/Session \ QLightDM/System \ - QLightDM/User \ + QLightDM/UsersModel \ QLightDM/greeter.h \ QLightDM/power.h \ QLightDM/session.h \ QLightDM/system.h \ - QLightDM/user.h + QLightDM/usersmodel.h liblightdm_qt_1includedir=$(includedir)/lightdm-qt-1/QLightDM @@ -34,7 +34,7 @@ liblightdm_qt_1_la_SOURCES = \ power.cpp \ session.cpp \ system.cpp \ - user.cpp \ + usersmodel.cpp \ $(liblightdm_qt_1include_HEADERS) pkgconfigdir = $(libdir)/pkgconfig diff --git a/liblightdm-qt/QLightDM/User b/liblightdm-qt/QLightDM/User deleted file mode 100644 index 968058f5..00000000 --- a/liblightdm-qt/QLightDM/User +++ /dev/null @@ -1 +0,0 @@ -#include "QLightDM/user.h"
\ No newline at end of file diff --git a/liblightdm-qt/QLightDM/UsersModel b/liblightdm-qt/QLightDM/UsersModel new file mode 100644 index 00000000..95f2cf3f --- /dev/null +++ b/liblightdm-qt/QLightDM/UsersModel @@ -0,0 +1 @@ +#include "QLightDM/usersmodel.h"
\ No newline at end of file diff --git a/liblightdm-qt/QLightDM/greeter.h b/liblightdm-qt/QLightDM/greeter.h index 8d1b4006..c0b89b41 100644 --- a/liblightdm-qt/QLightDM/greeter.h +++ b/liblightdm-qt/QLightDM/greeter.h @@ -15,7 +15,6 @@ #include <QtCore/QObject> #include <QtCore/QVariant> -#include "QLightDM/User" class GreeterPrivate; diff --git a/liblightdm-qt/QLightDM/user.h b/liblightdm-qt/QLightDM/usersmodel.h index ea33a2c3..498e0bce 100644 --- a/liblightdm-qt/QLightDM/user.h +++ b/liblightdm-qt/QLightDM/usersmodel.h @@ -16,7 +16,6 @@ #include <QtCore/QSharedDataPointer> #include <QAbstractListModel> -class UserPrivate; class UsersModelPrivate; class UserItem; diff --git a/liblightdm-qt/user.cpp b/liblightdm-qt/usersmodel.cpp index 0bb407df..3fcc73db 100644 --- a/liblightdm-qt/user.cpp +++ b/liblightdm-qt/usersmodel.cpp @@ -9,7 +9,7 @@ * license. */ -#include "QLightDM/user.h" +#include "QLightDM/usersmodel.h" #include <pwd.h> #include <errno.h> @@ -230,4 +230,4 @@ void UsersModel::loadUsers() } } -#include "user_moc.cpp" +#include "usersmodel_moc.cpp" |