Renamed to lose LDM prefix on classes in Qt lib.

diff --git a/liblightdm-qt/Makefile.am b/liblightdm-qt/Makefile.am
index 4701309728b2aa9fb56edd681fce7e5bcb90c761..f24b1592a2f859e7dcf7ce6b701caa0193a8f820 100644 (file)
--- a/liblightdm-qt/Makefile.am
+++ b/liblightdm-qt/Makefile.am
@@ -2,23 +2,23 @@ lib_LTLIBRARIES = liblightdm-qt-0.la
 
 # Generate metadata for QObjects
 MOC_FILES = \
-       ldmgreeter_moc.cpp \
-       ldmsessionsmodel_moc.cpp
+       greeter_moc.cpp \
+       sessionsmodel_moc.cpp
 
-ldmgreeter_moc.cpp: ldmgreeter.h
+greeter_moc.cpp: greeter.h
        moc $< -o $@
-ldmsessionsmodel_moc.cpp: ldmsessionsmodel.h
+sessionsmodel_moc.cpp: sessionsmodel.h
        moc $< -o $@
 
 liblightdm_qt_0include_HEADERS = \
-       ldmgreeter.h \
-       ldmlanguage.h \
-       ldmsessionsmodel.h \
-       ldmuser.h \
-       include/LdmGreeter \
-       include/LdmLanguage \
-       include/LdmSessionsModel \
-       include/LdmUser
+       greeter.h \
+       language.h \
+       sessionsmodel.h \
+       user.h \
+       include/Greeter \
+       include/Language \
+       include/SessionsModel \
+       include/User
 liblightdm_qt_0includedir=$(includedir)/lightdm-qt-0/lightdm
 
 liblightdm_qt_0_la_LIBADD = $(LIBLIGHTDM_QT_LIBS)
@@ -26,10 +26,10 @@ liblightdm_qt_0_la_CXXFLAGS = $(LIBLIGHTDM_QT_CFLAGS) \
        -DXSESSIONS_DIR=\"$(XSESSIONS_DIR)\"
 
 liblightdm_qt_0_la_SOURCES = \
-       ldmgreeter.cpp \
-       ldmlanguage.cpp \
-       ldmsessionsmodel.cpp \
-       ldmuser.cpp \
+       greeter.cpp \
+       language.cpp \
+       sessionsmodel.cpp \
+       user.cpp \
        $(MOC_FILES)
 
 pkgconfigdir = $(libdir)/pkgconfig

diff --git a/liblightdm-qt/ldmgreeter.cpp b/liblightdm-qt/greeter.cpp
similarity index 99%
rename from liblightdm-qt/ldmgreeter.cpp
rename to liblightdm-qt/greeter.cpp
index 03781ed94eb7ff40d305608cbe13afb7a40235d8..607e50f2e2b34e8827611e969e390ed7028db764 100644 (file)
--- a/liblightdm-qt/ldmgreeter.cpp
+++ b/liblightdm-qt/greeter.cpp
@@ -1,7 +1,7 @@
-#include "ldmgreeter.h"
+#include "greeter.h"
 
-#include "ldmuser.h"
-#include "ldmsessionsmodel.h"
+#include "user.h"
+#include "sessionsmodel.h"
 
 #include <security/pam_appl.h>
 #include <pwd.h>

diff --git a/liblightdm-qt/ldmgreeter.h b/liblightdm-qt/greeter.h
similarity index 98%
rename from liblightdm-qt/ldmgreeter.h
rename to liblightdm-qt/greeter.h
index b0422f3191717af1c608a9be886e1559c8b378e7..dab0df335c7a411df5bff42ff040d3355f5be363 100644 (file)
--- a/liblightdm-qt/ldmgreeter.h
+++ b/liblightdm-qt/greeter.h
@@ -4,8 +4,8 @@
 #include <QObject>
 class GreeterPrivate;
 
-#include "ldmuser.h"
-#include "ldmlanguage.h"
+#include "user.h"
+#include "language.h"
 //#include "ldmlayout.h"
 
 class GreeterPrivate;

diff --git a/liblightdm-qt/include/AuthRequest b/liblightdm-qt/include/AuthRequest
new file mode 100644 (file)
index 0000000..664516d
--- /dev/null
+++ b/liblightdm-qt/include/AuthRequest
@@ -0,0 +1 @@
+#include "authrequest.h"
\ No newline at end of file

diff --git a/liblightdm-qt/include/Greeter b/liblightdm-qt/include/Greeter
new file mode 100644 (file)
index 0000000..3b3fbf6
--- /dev/null
+++ b/liblightdm-qt/include/Greeter
@@ -0,0 +1 @@
+#include "greeter.h"
\ No newline at end of file

diff --git a/liblightdm-qt/include/Language b/liblightdm-qt/include/Language
new file mode 100644 (file)
index 0000000..31cb90f
--- /dev/null
+++ b/liblightdm-qt/include/Language
@@ -0,0 +1 @@
+#include "language.h"
\ No newline at end of file

diff --git a/liblightdm-qt/include/LdmAuthRequest b/liblightdm-qt/include/LdmAuthRequest
deleted file mode 100644 (file)
index 7d8d598..0000000
--- a/liblightdm-qt/include/LdmAuthRequest
+++ /dev/null
@@ -1 +0,0 @@
-#include "ldmauthrequest.h"
\ No newline at end of file

diff --git a/liblightdm-qt/include/LdmGreeter b/liblightdm-qt/include/LdmGreeter
deleted file mode 100644 (file)
index b391fe6..0000000
--- a/liblightdm-qt/include/LdmGreeter
+++ /dev/null
@@ -1 +0,0 @@
-#include "ldmgreeter.h"
\ No newline at end of file

diff --git a/liblightdm-qt/include/LdmLanguage b/liblightdm-qt/include/LdmLanguage
deleted file mode 100644 (file)
index 915e97e..0000000
--- a/liblightdm-qt/include/LdmLanguage
+++ /dev/null
@@ -1 +0,0 @@
-#include "ldmlanguage.h"
\ No newline at end of file

diff --git a/liblightdm-qt/include/LdmSessionsModel b/liblightdm-qt/include/LdmSessionsModel
deleted file mode 100644 (file)
index 0bd458f..0000000
--- a/liblightdm-qt/include/LdmSessionsModel
+++ /dev/null
@@ -1 +0,0 @@
-#include "ldmsessionsmodel.h"
\ No newline at end of file

diff --git a/liblightdm-qt/include/LdmUser b/liblightdm-qt/include/LdmUser
deleted file mode 100644 (file)
index 608d672..0000000
--- a/liblightdm-qt/include/LdmUser
+++ /dev/null
@@ -1 +0,0 @@
-#include "ldmuser.h"
\ No newline at end of file

diff --git a/liblightdm-qt/include/SessionsModel b/liblightdm-qt/include/SessionsModel
new file mode 100644 (file)
index 0000000..7928d2d
--- /dev/null
+++ b/liblightdm-qt/include/SessionsModel
@@ -0,0 +1 @@
+#include "sessionsmodel.h"
\ No newline at end of file

diff --git a/liblightdm-qt/include/User b/liblightdm-qt/include/User
new file mode 100644 (file)
index 0000000..790df27
--- /dev/null
+++ b/liblightdm-qt/include/User
@@ -0,0 +1 @@
+#include "user.h"
\ No newline at end of file

diff --git a/liblightdm-qt/ldmlanguage.cpp b/liblightdm-qt/language.cpp
similarity index 96%
rename from liblightdm-qt/ldmlanguage.cpp
rename to liblightdm-qt/language.cpp
index 01e7c241cf5ec8ed310dd63ad44f3a3528212ade..e160d19e1152a3f0b9516f2a795c5c9503a3e778 100644 (file)
--- a/liblightdm-qt/ldmlanguage.cpp
+++ b/liblightdm-qt/language.cpp
@@ -1,4 +1,4 @@
-#include "ldmlanguage.h"
+#include "language.h"
 
 using namespace QLightDM;
 

diff --git a/liblightdm-qt/ldmlanguage.h b/liblightdm-qt/language.h
similarity index 100%
rename from liblightdm-qt/ldmlanguage.h
rename to liblightdm-qt/language.h

diff --git a/liblightdm-qt/ldmsessionsmodel.cpp b/liblightdm-qt/sessionsmodel.cpp
similarity index 98%
rename from liblightdm-qt/ldmsessionsmodel.cpp
rename to liblightdm-qt/sessionsmodel.cpp
index 3bd2e4722f0f32784e78c788f1006d388761fbd3..f8aaa33223dda9c0a6cf84f3e384ef7fc826c97b 100644 (file)
--- a/liblightdm-qt/ldmsessionsmodel.cpp
+++ b/liblightdm-qt/sessionsmodel.cpp
@@ -1,4 +1,4 @@
-#include "ldmsessionsmodel.h"
+#include "sessionsmodel.h"
 
 #include <QtCore/QList>
 #include <QtCore/QDir>

diff --git a/liblightdm-qt/ldmsessionsmodel.h b/liblightdm-qt/sessionsmodel.h
similarity index 100%
rename from liblightdm-qt/ldmsessionsmodel.h
rename to liblightdm-qt/sessionsmodel.h

diff --git a/liblightdm-qt/ldmuser.cpp b/liblightdm-qt/user.cpp
similarity index 98%
rename from liblightdm-qt/ldmuser.cpp
rename to liblightdm-qt/user.cpp
index 146efdc1515a73a60788978096b12528867babae..3a9d68e3dbaf705cf7dcf662ce5c22229070426f 100644 (file)
--- a/liblightdm-qt/ldmuser.cpp
+++ b/liblightdm-qt/user.cpp
@@ -1,4 +1,4 @@
-#include "ldmuser.h"
+#include "user.h"
 
 using namespace QLightDM;
 

diff --git a/liblightdm-qt/ldmuser.h b/liblightdm-qt/user.h
similarity index 100%
rename from liblightdm-qt/ldmuser.h
rename to liblightdm-qt/user.h