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

18 files changed, 58 insertions, 60 deletions

diff --git a/.bzrignore b/.bzrignore
index 9dd74acd..873641f7 100644
--- 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 8f2df420..5f5f7211 100644
--- 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 d35751c6..4d538e23 100644
--- 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 f24dbf3a..ca20dda6 100644
--- 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 8d56a28d..3a1601d6 100644
--- 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 bcfa4a96..3b3fbf61 100644
--- 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 68d5513f..31cb90fa 100644
--- 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 f1f2ddb0..b5b9e215 100644
--- 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 7fe68741..7928d2d2 100644
--- 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 968058f5..790df279 100644
--- 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 95f2cf3f..8c5cc954 100644
--- 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 a971f370..449144ef 100644
--- 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
index ac7f16e0..a9865138 100644
--- 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
index 09957006..8c087a80 100644
--- 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
index adb6a559..adb6a559 100644
--- a/liblightdm-qt/QLightDM/liblightdm-qt-1.pc.in
+++ b/liblightdm-qt/liblightdm-qt-1.pc.in
diff --git a/liblightdm-qt/QLightDM/sessionsmodel.cpp b/liblightdm-qt/sessionsmodel.cpp
index 95281df3..0755d58e 100644
--- 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
index cf91d61a..222aa3d9 100644
--- 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
index 9c1fe9f2..400ccd35 100644
--- 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>