Rearrange liblightdm-qt to be the same a liblightdm-gobject

diff --git a/.bzrignore b/.bzrignore
index 9dd74acd9e1513b4e7bff6c482c1b43855d073c1..873641f73a99c6b4c8ad304376aedbd45941c92e 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -40,9 +40,9 @@ greeters/qt/ui_*.h
 liblightdm-gobject/*.gir
 liblightdm-gobject/*.typelib
 liblightdm-gobject/*.vapi
-liblightdm-gobject/liblightdm-gobject-0.pc
-liblightdm-qt/QLightDM/liblightdm-qt-0.pc
-liblightdm-qt/QLightDM/*_moc.cpp
+liblightdm-gobject/liblightdm-gobject-1.pc
+liblightdm-qt/liblightdm-qt-1.pc
+liblightdm-qt/*_moc.cpp
 po/POTFILES
 po/stamp-it
 src/display-glue.h

diff --git a/configure.ac b/configure.ac
index 8f2df4205ecd63948a5b95d4cfb645dd2670d6bd..5f5f721154b740c746447ed43d64a175cbbf2f84 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -179,7 +179,7 @@ liblightdm-gobject/liblightdm-gobject-1.pc
 liblightdm-gobject/Makefile
 liblightdm-gobject/lightdm/Makefile
 liblightdm-qt/Makefile
-liblightdm-qt/QLightDM/liblightdm-qt-1.pc
+liblightdm-qt/liblightdm-qt-1.pc
 liblightdm-qt/QLightDM/Makefile
 po/Makefile.in
 src/Makefile

diff --git a/greeters/qt/Makefile.am b/greeters/qt/Makefile.am
index d35751c6c2dfa2777930c54b5b27d3d12874561e..4d538e23960c37f94134e82722f4ca91641e7314 100644 (file)
--- a/greeters/qt/Makefile.am
+++ b/greeters/qt/Makefile.am
@@ -35,7 +35,7 @@ lightdm_qt_greeter_CXXFLAGS = \
        $(LIGHTDM_QT_GREETER_CFLAGS)
 
 lightdm_qt_greeter_LDADD = \
-       -L$(top_builddir)/liblightdm-qt/QLightDM \
+       -L$(top_builddir)/liblightdm-qt \
        -llightdm-qt-1 \
        $(LIGHTDM_QT_GREETER_LIBS)
 

diff --git a/liblightdm-gobject/lightdm/Makefile.am b/liblightdm-gobject/lightdm/Makefile.am
index f24dbf3abf3ed3ba6adbacb96be76cbae58634b9..ca20dda68c4ac302593153249a4b0b7e9c3f441d 100644 (file)
--- a/liblightdm-gobject/lightdm/Makefile.am
+++ b/liblightdm-gobject/lightdm/Makefile.am
@@ -1,10 +1,10 @@
-liblightdm_include_HEADERS = \
+liblightdm_gobject_1include_HEADERS = \
        greeter.h \
        language.h \
        layout.h \
        session.h \
        user.h
-liblightdm_includedir=$(includedir)/lightdm-gobject-0/lightdm
+liblightdm_gobject_1includedir=$(includedir)/lightdm-gobject-1/lightdm
 
 DISTCLEANFILES = \
        Makefile.in 

diff --git a/liblightdm-qt/Makefile.am b/liblightdm-qt/Makefile.am
index 8d56a28df31dbf7174699cc20289b6aa2b40196b..3a1601d6cd140f58c617360fc8214f87454146db 100644 (file)
--- a/liblightdm-qt/Makefile.am
+++ b/liblightdm-qt/Makefile.am
@@ -3,3 +3,39 @@ SUBDIRS = QLightDM
 DISTCLEANFILES = \
         Makefile.in
 
+lib_LTLIBRARIES = liblightdm-qt-1.la
+
+# Generate metadata for QObjects
+MOC_FILES = \
+       greeter_moc.cpp \
+       sessionsmodel_moc.cpp \
+       usersmodel_moc.cpp 
+
+greeter_moc.cpp: QLightDM/greeter.h
+       moc $< -o $@
+sessionsmodel_moc.cpp: QLightDM/sessionsmodel.h
+       moc $< -o $@
+usersmodel_moc.cpp: QLightDM/usersmodel.h
+       moc $< -o $@
+
+liblightdm_qt_1_la_LIBADD = $(LIBLIGHTDM_QT_LIBS)
+liblightdm_qt_1_la_CXXFLAGS = $(LIBLIGHTDM_QT_CFLAGS) \
+       -DXSESSIONS_DIR=\"$(datadir)/xsessions\"
+
+liblightdm_qt_1_la_SOURCES = \
+       greeter.cpp \
+       language.cpp \
+       sessionsmodel.cpp \
+       user.cpp \
+       usersmodel.cpp \
+       $(MOC_FILES)
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = liblightdm-qt-1.pc
+
+CLEANFILES = \
+       $(MOC_FILES)
+
+DISTCLEANFILES = \
+       Makefile.in \
+       $(pkgconfig_DATA)

diff --git a/liblightdm-qt/QLightDM/Greeter b/liblightdm-qt/QLightDM/Greeter
index bcfa4a967b9ee9faa4bcee194f8f4e79cd20dcc1..3b3fbf61e870397017f3650b074332813f61d39f 100644 (file)
--- a/liblightdm-qt/QLightDM/Greeter
+++ b/liblightdm-qt/QLightDM/Greeter
@@ -1 +1 @@
-#include "QLightDM/greeter.h"
\ No newline at end of file
+#include "greeter.h"
\ No newline at end of file

diff --git a/liblightdm-qt/QLightDM/Language b/liblightdm-qt/QLightDM/Language
index 68d5513f15567cfe7c059180091cb8a28096e2e1..31cb90fa597be9b383e08f058af244b12b04c421 100644 (file)
--- a/liblightdm-qt/QLightDM/Language
+++ b/liblightdm-qt/QLightDM/Language
@@ -1 +1 @@
-#include "QLightDM/language.h"
\ No newline at end of file
+#include "language.h"
\ No newline at end of file

diff --git a/liblightdm-qt/QLightDM/Makefile.am b/liblightdm-qt/QLightDM/Makefile.am
index f1f2ddb012a1a3d96f133c490cfcf343ffec216c..b5b9e215534d02674564129bd2071ec07c4c73f4 100644 (file)
--- a/liblightdm-qt/QLightDM/Makefile.am
+++ b/liblightdm-qt/QLightDM/Makefile.am
@@ -1,19 +1,3 @@
-lib_LTLIBRARIES = liblightdm-qt-1.la
-
-# Generate metadata for QObjects
-MOC_FILES = \
-       greeter_moc.cpp \
-       sessionsmodel_moc.cpp \
-       usersmodel_moc.cpp 
-
-greeter_moc.cpp: greeter.h
-       moc $< -o $@
-sessionsmodel_moc.cpp: sessionsmodel.h
-       moc $< -o $@
-usersmodel_moc.cpp: usersmodel.h
-       moc $< -o $@
-
-
 liblightdm_qt_1include_HEADERS = \
        greeter.h \
        language.h \
@@ -28,24 +12,5 @@ liblightdm_qt_1include_HEADERS = \
 
 liblightdm_qt_1includedir=$(includedir)/lightdm-qt-1/QLightDM
 
-liblightdm_qt_1_la_LIBADD = $(LIBLIGHTDM_QT_LIBS)
-liblightdm_qt_1_la_CXXFLAGS = $(LIBLIGHTDM_QT_CFLAGS) \
-       -DXSESSIONS_DIR=\"$(datadir)/xsessions\"
-
-liblightdm_qt_1_la_SOURCES = \
-       greeter.cpp \
-       language.cpp \
-       sessionsmodel.cpp \
-       user.cpp \
-       usersmodel.cpp \
-       $(MOC_FILES)
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = liblightdm-qt-1.pc
-
-CLEANFILES = \
-       $(MOC_FILES)
-
 DISTCLEANFILES = \
-       Makefile.in \
-       $(pkgconfig_DATA)
+       Makefile.in 

diff --git a/liblightdm-qt/QLightDM/SessionsModel b/liblightdm-qt/QLightDM/SessionsModel
index 7fe687410dec70522367f025b4428f3e9bffc2a8..7928d2d2f894792807dab662dcef5a99a90f0573 100644 (file)
--- a/liblightdm-qt/QLightDM/SessionsModel
+++ b/liblightdm-qt/QLightDM/SessionsModel
@@ -1 +1 @@
-#include "QLightDM/sessionsmodel.h"
\ No newline at end of file
+#include "sessionsmodel.h"
\ No newline at end of file

diff --git a/liblightdm-qt/QLightDM/User b/liblightdm-qt/QLightDM/User
index 968058f5ed38f4e7918ac16e75f11cd17e6e7d0a..790df279991e720151c076b69206c5237496c9cd 100644 (file)
--- a/liblightdm-qt/QLightDM/User
+++ b/liblightdm-qt/QLightDM/User
@@ -1 +1 @@
-#include "QLightDM/user.h"
\ No newline at end of file
+#include "user.h"
\ No newline at end of file

diff --git a/liblightdm-qt/QLightDM/UsersModel b/liblightdm-qt/QLightDM/UsersModel
index 95f2cf3f4ea83656c1db1d698bb845cd3b8a158f..8c5cc954337b5601cb7231afcfdfb6b3833ac99e 100644 (file)
--- a/liblightdm-qt/QLightDM/UsersModel
+++ b/liblightdm-qt/QLightDM/UsersModel
@@ -1 +1 @@
-#include "QLightDM/usersmodel.h"
\ No newline at end of file
+#include "usersmodel.h"
\ No newline at end of file

diff --git a/liblightdm-qt/QLightDM/usersmodel.h b/liblightdm-qt/QLightDM/usersmodel.h
index a971f370d88a8a246eb069cf0e9ecd42804b073a..449144ef36b93f5cf7a8809fae28dbccef71d7b3 100644 (file)
--- a/liblightdm-qt/QLightDM/usersmodel.h
+++ b/liblightdm-qt/QLightDM/usersmodel.h
@@ -13,14 +13,12 @@
 #define QLIGHTDM_USERSMODEL_H
 
 #include <QAbstractListModel>
+#include <QLightDM/User>
 
 class UsersModelPrivate;
 
 namespace QLightDM
 {
-
-class User;
-
 class Q_DECL_EXPORT UsersModel : public QAbstractListModel
 {
     Q_OBJECT

diff --git a/liblightdm-qt/QLightDM/greeter.cpp b/liblightdm-qt/greeter.cpp
similarity index 99%
rename from liblightdm-qt/QLightDM/greeter.cpp
rename to liblightdm-qt/greeter.cpp
index ac7f16e0f3dc38b11a4f49974814aa113f3eb005..a986513883898708b8c8e05839fa4bca09eca72a 100644 (file)
--- a/liblightdm-qt/QLightDM/greeter.cpp
+++ b/liblightdm-qt/greeter.cpp
@@ -10,12 +10,12 @@
  * license.
  */
 
-#include "greeter.h"
-
-#include "user.h"
-#include "sessionsmodel.h"
 #include "config.h"
 
+#include "QLightDM/Greeter"
+#include "QLightDM/User"
+#include "QLightDM/SessionsModel"
+
 #include <security/pam_appl.h>
 
 #include <QtNetwork/QHostInfo> //needed for localHostName

diff --git a/liblightdm-qt/QLightDM/language.cpp b/liblightdm-qt/language.cpp
similarity index 97%
rename from liblightdm-qt/QLightDM/language.cpp
rename to liblightdm-qt/language.cpp
index 09957006c6c4d0d0194e729e18b74385df9d31fc..8c087a80adcd1785771a51cda9deb2b7525c0543 100644 (file)
--- a/liblightdm-qt/QLightDM/language.cpp
+++ b/liblightdm-qt/language.cpp
@@ -9,7 +9,7 @@
  * license.
  */
 
-#include "language.h"
+#include "QLightDM/Language"
 
 using namespace QLightDM;
 

diff --git a/liblightdm-qt/QLightDM/liblightdm-qt-1.pc.in b/liblightdm-qt/liblightdm-qt-1.pc.in
similarity index 100%
rename from liblightdm-qt/QLightDM/liblightdm-qt-1.pc.in
rename to liblightdm-qt/liblightdm-qt-1.pc.in

diff --git a/liblightdm-qt/QLightDM/sessionsmodel.cpp b/liblightdm-qt/sessionsmodel.cpp
similarity index 98%
rename from liblightdm-qt/QLightDM/sessionsmodel.cpp
rename to liblightdm-qt/sessionsmodel.cpp
index 95281df34070582b11fe09b5ceebc52cdd7cf1d7..0755d58e584525c57b3ed3df4fbdc409401a9748 100644 (file)
--- a/liblightdm-qt/QLightDM/sessionsmodel.cpp
+++ b/liblightdm-qt/sessionsmodel.cpp
@@ -9,7 +9,7 @@
  * license.
  */
 
-#include "sessionsmodel.h"
+#include "QLightDM/SessionsModel"
 
 #include <QtCore/QList>
 #include <QtCore/QDir>

diff --git a/liblightdm-qt/QLightDM/user.cpp b/liblightdm-qt/user.cpp
similarity index 98%
rename from liblightdm-qt/QLightDM/user.cpp
rename to liblightdm-qt/user.cpp
index cf91d61a18090bc4070d40b40eb7e02b0e294234..222aa3d9743194fab15186155251a62ff8b2be62 100644 (file)
--- a/liblightdm-qt/QLightDM/user.cpp
+++ b/liblightdm-qt/user.cpp
@@ -9,7 +9,7 @@
  * license.
  */
 
-#include "user.h"
+#include "QLightDM/User"
 
 #include <QtCore/QSharedData>
 

diff --git a/liblightdm-qt/QLightDM/usersmodel.cpp b/liblightdm-qt/usersmodel.cpp
similarity index 99%
rename from liblightdm-qt/QLightDM/usersmodel.cpp
rename to liblightdm-qt/usersmodel.cpp
index 9c1fe9f21cb71107242b93c0cfebdfc62bb1059b..400ccd35c7bfa02bfb1dcb553f9b928a2eef61a4 100644 (file)
--- a/liblightdm-qt/QLightDM/usersmodel.cpp
+++ b/liblightdm-qt/usersmodel.cpp
@@ -9,8 +9,7 @@
  * license.
  */
 
-#include "usersmodel.h"
-#include "user.h"
+#include "QLightDM/UsersModel"
 
 #include <pwd.h>
 #include <errno.h>