From 4b60d6d78ca3eedf84ea11ed1db21358921b6089 Mon Sep 17 00:00:00 2001
From: Andrey Kozhevnikov <a.kozhevnikov@omprussia.ru>
Date: Mon, 9 Jul 2018 11:46:01 +0300
Subject: [PATCH] [ssu] Proper d-bus adaptor/interface generation

---
 ssu.pro             | 10 ----------
 ssucli/ssucli.h     |  2 +-
 ssucli/ssucli.pro   | 11 +++++++----
 ssud/ssud.cpp       |  2 +-
 ssud/ssud.h         |  1 +
 ssud/ssud.pro       | 12 +++++++++---
 ssud/ssud_include.h |  4 ++++
 7 files changed, 23 insertions(+), 19 deletions(-)
 create mode 100644 ssud/ssud_include.h

diff --git a/ssu.pro b/ssu.pro
index e034f15..5be9a7f 100644
--- a/ssu.pro
+++ b/ssu.pro
@@ -31,13 +31,3 @@ static_config.files = repos.ini ssu-defaults.ini board-mappings.ini
 static_config.path  = /usr/share/ssu
 
 INSTALLS += config static_config oneshot macros
-
-system(qdbusxml2cpp \
-    -c SsuAdaptor \
-    -a ssud/ssuadaptor.h:ssud/ssuadaptor.cpp \
-    dbus/org.nemo.ssu.xml)
-
-system(qdbusxml2cpp \
-    -c SsuProxy \
-    -p ssucli/ssuproxy.h:ssucli/ssuproxy.cpp \
-    dbus/org.nemo.ssu.xml)
diff --git a/ssucli/ssucli.h b/ssucli/ssucli.h
index 924557a..4bf81ed 100644
--- a/ssucli/ssucli.h
+++ b/ssucli/ssucli.h
@@ -14,7 +14,7 @@
 #include <QDebug>
 
 #include "libssu/ssu.h"
-#include "ssuproxy.h"
+#include "ssu_interface.h"
 
 class SsuCli: public QObject
 {
diff --git a/ssucli/ssucli.pro b/ssucli/ssucli.pro
index cbc8b09..ca44a91 100644
--- a/ssucli/ssucli.pro
+++ b/ssucli/ssucli.pro
@@ -5,8 +5,11 @@ include(ssucli_dependencies.pri)
 QT += network dbus
 CONFIG += link_pkgconfig
 
-HEADERS = ssucli.h \
-        ssuproxy.h
+HEADERS = ssucli.h
 SOURCES = main.cpp \
-        ssucli.cpp \
-        ssuproxy.cpp
+        ssucli.cpp
+
+ssu_dbus_interface.files = ../dbus/org.nemo.ssu.xml
+ssu_dbus_interface.source_flags = -c SsuProxy
+ssu_dbus_interface.header_flags = -c SsuProxy -i ssud/ssud_include.h
+DBUS_INTERFACES += ssu_dbus_interface
diff --git a/ssud/ssud.cpp b/ssud/ssud.cpp
index a53c029..8c9f52f 100644
--- a/ssud/ssud.cpp
+++ b/ssud/ssud.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "ssud.h"
-#include "ssuadaptor.h"
+#include "ssu_adaptor.h"
 
 #include "libssu/ssudeviceinfo.h"
 #include "libssu/ssurepomanager.h"
diff --git a/ssud/ssud.h b/ssud/ssud.h
index 0ade58f..23d071d 100644
--- a/ssud/ssud.h
+++ b/ssud/ssud.h
@@ -13,6 +13,7 @@
 #include <QTimer>
 
 #include "libssu/ssu.h"
+#include "ssud_include.h"
 
 class Ssud: public QObject
 {
diff --git a/ssud/ssud.pro b/ssud/ssud.pro
index b33b9af..1547f57 100644
--- a/ssud/ssud.pro
+++ b/ssud/ssud.pro
@@ -5,9 +5,10 @@ include(ssud_dependencies.pri)
 QT += network dbus
 CONFIG += link_pkgconfig
 
-HEADERS = ssuadaptor.h \
-        ssud.h
-SOURCES = ssuadaptor.cpp \
+HEADERS = \
+        ssud.h \
+        ssud_include.h
+SOURCES = \
         ssud.cpp \
         main.cpp
 
@@ -23,3 +24,8 @@ conf.files = ../dbus/$${DBUS_SERVICE_NAME}.conf
 conf.path = /etc/dbus-1/system.d/
 
 INSTALLS += systemd service conf
+
+ssu_dbus_adaptor.files = ../dbus/org.nemo.ssu.xml
+ssu_dbus_adaptor.source_flags = -c SsuAdaptor
+ssu_dbus_adaptor.header_flags = -c SsuAdaptor -i ssud/ssud_include.h
+DBUS_ADAPTORS += ssu_dbus_adaptor
diff --git a/ssud/ssud_include.h b/ssud/ssud_include.h
new file mode 100644
index 0000000..8d660d6
--- /dev/null
+++ b/ssud/ssud_include.h
@@ -0,0 +1,4 @@
+#ifndef SSUD_INCLUDE_H
+#define SSUD_INCLUDE_H
+
+#endif // SSUD_INCLUDE_H