fix source and header paths

18 files changed, 114 insertions, 118 deletions

diff --git a/agents/hostmanageragent.cc b/agents/hostmanageragent.cc
index 3cc67c2..d6241d7 100644
--- a/agents/hostmanageragent.cc
+++ b/agents/hostmanageragent.cc
@@ -1,7 +1,7 @@
-#include "sapsocket.h"
-#include "sapconnectionrequest.h"
-#include "sapserviceinfo.h"
-#include "sapchannelinfo.h"
+#include <sap/sapsocket.h>
+#include <sap/sapconnectionrequest.h>
+#include <sap/sapserviceinfo.h>
+#include <sap/sapchannelinfo.h>
 #include "hostmanagerconn.h"
 #include "hostmanageragent.h"
 
diff --git a/agents/hostmanageragent.h b/agents/hostmanageragent.h
index aa9e148..71eb466 100644
--- a/agents/hostmanageragent.h
+++ b/agents/hostmanageragent.h
@@ -2,9 +2,9 @@
 #define HOSTMANAGER_H
 
 #include <QtCore/QObject>
-#include "sappeer.h"
-#include "sapmanager.h"
-#include "sapagent.h"
+#include <sap/sappeer.h>
+#include <sap/sapmanager.h>
+#include <sap/sapagent.h>
 
 class HostManagerAgent : public QObject, public SAPAgent
 {
diff --git a/agents/hostmanagerconn.cc b/agents/hostmanagerconn.cc
index 0e1f7bb..e7441d7 100644
--- a/agents/hostmanagerconn.cc
+++ b/agents/hostmanagerconn.cc
@@ -11,8 +11,8 @@
 static watchfish::WallTimeMonitor *monitor = 0;
 #endif
 
-#include "sapmanager.h"
-#include "sappeer.h"
+#include <sap/sapmanager.h>
+#include <sap/sappeer.h>
 #include "hostmanagerconn.h"
 
 HostManagerConn::HostManagerConn(SAPConnection *conn, QObject *parent)
diff --git a/agents/hostmanagerconn.h b/agents/hostmanagerconn.h
index 3543a6c..5d42980 100644
--- a/agents/hostmanagerconn.h
+++ b/agents/hostmanagerconn.h
@@ -1,9 +1,8 @@
 #ifndef HOSTMANAGERPEER_H
 #define HOSTMANAGERPEER_H
 
-#include <QtCore/QVariant>
-#include "sapconnection.h"
-#include "sapsocket.h"
+#include <sap/sapconnection.h>
+#include <sap/sapsocket.h>
 
 class HostManagerConn : public QObject
 {
diff --git a/agents/musicagent.cc b/agents/musicagent.cc
index f67cc1d..35413c4 100644
--- a/agents/musicagent.cc
+++ b/agents/musicagent.cc
@@ -1,7 +1,7 @@
-#include "sapsocket.h"
-#include "sapconnectionrequest.h"
-#include "sapserviceinfo.h"
-#include "sapchannelinfo.h"
+#include <sap/sapsocket.h>
+#include <sap/sapconnectionrequest.h>
+#include <sap/sapserviceinfo.h>
+#include <sap/sapchannelinfo.h>
 #include "musicconn.h"
 #include "musicagent.h"
 
diff --git a/agents/musicagent.h b/agents/musicagent.h
index 32121d4..b45c984 100644
--- a/agents/musicagent.h
+++ b/agents/musicagent.h
@@ -2,9 +2,9 @@
 #define MUSICAGENT_H
 
 #include <QtCore/QObject>
-#include "sappeer.h"
-#include "sapmanager.h"
-#include "sapagent.h"
+#include <sap/sappeer.h>
+#include <sap/sapmanager.h>
+#include <sap/sapagent.h>
 
 class MusicAgent : public QObject, public SAPAgent
 {
diff --git a/agents/musicconn.cc b/agents/musicconn.cc
index cfc375d..b16c757 100644
--- a/agents/musicconn.cc
+++ b/agents/musicconn.cc
@@ -4,7 +4,6 @@
 #include <QtCore/QJsonObject>
 #include <QtGui/QImage>
 
-#include "sappeer.h"
 #include "musicconn.h"
 
 #if SAILFISH
diff --git a/agents/musicconn.h b/agents/musicconn.h
index 3cee914..72c85dc 100644
--- a/agents/musicconn.h
+++ b/agents/musicconn.h
@@ -1,9 +1,8 @@
 #ifndef MUSICCONN_H
 #define MUSICCONN_H
 
-#include <QtCore/QObject>
-#include "sapconnection.h"
-#include "sapsocket.h"
+#include <sap/sapconnection.h>
+#include <sap/sapsocket.h>
 
 class MusicConn : public QObject
 {
diff --git a/agents/notificationagent.cc b/agents/notificationagent.cc
index 58d27d4..a51a82d 100644
--- a/agents/notificationagent.cc
+++ b/agents/notificationagent.cc
@@ -1,7 +1,7 @@
-#include "sapsocket.h"
-#include "sapconnectionrequest.h"
-#include "sapserviceinfo.h"
-#include "sapchannelinfo.h"
+#include <sap/sapsocket.h>
+#include <sap/sapconnectionrequest.h>
+#include <sap/sapserviceinfo.h>
+#include <sap/sapchannelinfo.h>
 #include "notificationconn.h"
 #include "notificationagent.h"
 
diff --git a/agents/notificationagent.h b/agents/notificationagent.h
index 1b9c9cb..a1eb37c 100644
--- a/agents/notificationagent.h
+++ b/agents/notificationagent.h
@@ -2,9 +2,9 @@
 #define NOTIFICATIONAGENT_H
 
 #include <QtCore/QObject>
-#include "sappeer.h"
-#include "sapmanager.h"
-#include "sapagent.h"
+#include <sap/sappeer.h>
+#include <sap/sapmanager.h>
+#include <sap/sapagent.h>
 
 class NotificationAgent : public QObject, public SAPAgent
 {
diff --git a/agents/notificationconn.cc b/agents/notificationconn.cc
index bfe719b..7183ad4 100644
--- a/agents/notificationconn.cc
+++ b/agents/notificationconn.cc
@@ -2,8 +2,7 @@
 #include <QtCore/QTimer>
 #include <QtCore/QFile>
 
-#include "sappeer.h"
-#include "endianhelpers.h"
+#include <sap/endianhelpers.h>
 #include "notificationconn.h"
 
 #if SAILFISH
diff --git a/agents/notificationconn.h b/agents/notificationconn.h
index 092804a..6a3cd91 100644
--- a/agents/notificationconn.h
+++ b/agents/notificationconn.h
@@ -1,11 +1,10 @@
 #ifndef NOTIFICATIONCONN_H
 #define NOTIFICATIONCONN_H
 
-#include <QtCore/QObject>
 #include <QtCore/QDateTime>
 #include <QtCore/QHash>
-#include "sapconnection.h"
-#include "sapsocket.h"
+#include <sap/sapconnection.h>
+#include <sap/sapsocket.h>
 
 #if SAILFISH
 namespace watchfish
diff --git a/agents/webproxyagent.cc b/agents/webproxyagent.cc
index c9d5580..9a5bfce 100644
--- a/agents/webproxyagent.cc
+++ b/agents/webproxyagent.cc
@@ -1,7 +1,7 @@
-#include "sapsocket.h"
-#include "sapconnectionrequest.h"
-#include "sapserviceinfo.h"
-#include "sapchannelinfo.h"
+#include <sap/sapsocket.h>
+#include <sap/sapconnectionrequest.h>
+#include <sap/sapserviceinfo.h>
+#include <sap/sapchannelinfo.h>
 #include "webproxyconn.h"
 #include "webproxyagent.h"
 
diff --git a/agents/webproxyagent.h b/agents/webproxyagent.h
index e3e7329..c4eea25 100644
--- a/agents/webproxyagent.h
+++ b/agents/webproxyagent.h
@@ -2,9 +2,9 @@
 #define WEBPROXYAGENT_H
 
 #include <QtCore/QObject>
-#include "sappeer.h"
-#include "sapmanager.h"
-#include "sapagent.h"
+#include <sap/sappeer.h>
+#include <sap/sapmanager.h>
+#include <sap/sapagent.h>
 
 class WebProxyAgent : public QObject, public SAPAgent
 {
diff --git a/agents/webproxyconn.cc b/agents/webproxyconn.cc
index 91a9510..3abfad7 100644
--- a/agents/webproxyconn.cc
+++ b/agents/webproxyconn.cc
@@ -1,8 +1,8 @@
 #include <QtCore/QDebug>
 #include <QtCore/QUrl>
 
-#include "sappeer.h"
-#include "endianhelpers.h"
+#include <sap/endianhelpers.h>
+
 #include "webproxytrans.h"
 #include "webproxyconn.h"
 
diff --git a/agents/webproxyconn.h b/agents/webproxyconn.h
index c183462..646ceac 100644
--- a/agents/webproxyconn.h
+++ b/agents/webproxyconn.h
@@ -1,9 +1,8 @@
 #ifndef WEBPROXYCONN_H
 #define WEBPROXYCONN_H
 
-#include <QtCore/QObject>
-#include "sapconnection.h"
-#include "sapsocket.h"
+#include <sap/sapconnection.h>
+#include <sap/sapsocket.h>
 
 class WebProxyTrans;
 
diff --git a/main.cc b/main.cc
index 207f3ff..0b586de 100644
--- a/main.cc
+++ b/main.cc
@@ -1,15 +1,17 @@
 #include <iostream>
+
 #include <QtCore/QCoreApplication>
 #include <QtCore/QSettings>
 #include <QtCore/QStringList>
-#include "sapmanager.h"
-#include "sapbtlistener.h"
 
-#include "capabilityagent.h"
-#include "hostmanageragent.h"
-#include "webproxyagent.h"
-#include "notificationagent.h"
-#include "musicagent.h"
+#include <sap/sapmanager.h>
+#include <sap/sapbtlistener.h>
+#include <sap/capabilityagent.h>
+
+#include "agents/hostmanageragent.h"
+#include "agents/webproxyagent.h"
+#include "agents/notificationagent.h"
+#include "agents/musicagent.h"
 
 using std::cerr;
 using std::endl;
diff --git a/sapd.pro b/sapd.pro
index b3bf4a4..c066427 100644
--- a/sapd.pro
+++ b/sapd.pro
@@ -27,72 +27,72 @@ target.path = /usr/bin
 INSTALLS += target
 
 SOURCES += main.cc \
-    sapbtlistener.cc \
-    wmspeer.cc \
-    sapbtpeer.cc \
-    saprotocol.cc \
-    keys/Tout.c \
-    keys/Tin.c \
-    keys/T2.c \
-    keys/T1.c \
-    keys/T0.c \
-    keys/psk_table.c \
-    keys/finalT1.c \
-    keys/finalT0.c \
-    keys/DecTout.c \
-    keys/DecTin.c \
-    keys/DecT2.c \
-    keys/DecT1.c \
-    keys/DecT0.c \
-    wmscrypt.cc \
-    crc16.cc \
-    sapsocket.cc \
-    sappeer.cc \
-    capabilityagent.cc \
-    sapmanager.cc \
-    sapserviceinfo.cc \
-    sapchannelinfo.cc \
-    sapconnection.cc \
-    sapconnectionrequest.cc \
-    capabilitypeer.cc \
-    hostmanageragent.cc \
-    hostmanagerconn.cc \
-    notificationagent.cc \
-    notificationconn.cc \
-    webproxyagent.cc \
-    webproxyconn.cc \
-    webproxytrans.cc \
-    musicagent.cc \
-    musicconn.cc
+    sap/sapbtlistener.cc \
+    sap/wmspeer.cc \
+    sap/sapbtpeer.cc \
+    sap/saprotocol.cc \
+    sap/keys/Tout.c \
+    sap/keys/Tin.c \
+    sap/keys/T2.c \
+    sap/keys/T1.c \
+    sap/keys/T0.c \
+    sap/keys/psk_table.c \
+    sap/keys/finalT1.c \
+    sap/keys/finalT0.c \
+    sap/keys/DecTout.c \
+    sap/keys/DecTin.c \
+    sap/keys/DecT2.c \
+    sap/keys/DecT1.c \
+    sap/keys/DecT0.c \
+    sap/wmscrypt.cc \
+    sap/crc16.cc \
+    sap/sapsocket.cc \
+    sap/sappeer.cc \
+    sap/capabilityagent.cc \
+    sap/sapmanager.cc \
+    sap/sapserviceinfo.cc \
+    sap/sapchannelinfo.cc \
+    sap/sapconnection.cc \
+    sap/sapconnectionrequest.cc \
+    sap/capabilitypeer.cc \
+    agents/hostmanageragent.cc \
+    agents/hostmanagerconn.cc \
+    agents/notificationagent.cc \
+    agents/notificationconn.cc \
+    agents/webproxyagent.cc \
+    agents/webproxyconn.cc \
+    agents/webproxytrans.cc \
+    agents/musicagent.cc \
+    agents/musicconn.cc
 
 HEADERS += \
-    sapbtlistener.h \
-    wmspeer.h \
-    sapbtpeer.h \
-    saprotocol.h \
-    wmskeys.h \
-    wmscrypt.h \
-    crc16.h \
-    sapsocket.h \
-    sapagent.h \
-    sappeer.h \
-    capabilityagent.h \
-    sapmanager.h \
-    sapserviceinfo.h \
-    sapchannelinfo.h \
-    sapconnection.h \
-    sapconnectionrequest.h \
-    capabilitypeer.h \
-    hostmanageragent.h \
-    hostmanagerconn.h \
-    notificationagent.h \
-    notificationconn.h \
-    endianhelpers.h \
-    webproxyagent.h \
-    webproxyconn.h \
-    webproxytrans.h \
-    musicagent.h \
-    musicconn.h
+    sap/sapbtlistener.h \
+    sap/wmspeer.h \
+    sap/sapbtpeer.h \
+    sap/saprotocol.h \
+    sap/wmskeys.h \
+    sap/wmscrypt.h \
+    sap/crc16.h \
+    sap/endianhelpers.h \
+    sap/sapsocket.h \
+    sap/sapagent.h \
+    sap/sappeer.h \
+    sap/capabilityagent.h \
+    sap/sapmanager.h \
+    sap/sapserviceinfo.h \
+    sap/sapchannelinfo.h \
+    sap/sapconnection.h \
+    sap/sapconnectionrequest.h \
+    sap/capabilitypeer.h \
+    agents/hostmanageragent.h \
+    agents/hostmanagerconn.h \
+    agents/notificationagent.h \
+    agents/notificationconn.h \
+    agents/webproxyagent.h \
+    agents/webproxyconn.h \
+    agents/webproxytrans.h \
+    agents/musicagent.h \
+    agents/musicconn.h
 
 OTHER_FILES += \
     rpm/sapd.yaml \