uacpp: Include SDK subfolder in include paths

This allows to use a single include path for the whole SDK as
soon as the SDK headers itself are fixed.

Change-Id: I39641b426277d1d2f7f1ee39d9f1e02613fb40e8
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>

11 files changed, 24 insertions, 24 deletions

diff --git a/config.tests/uacpp/main.cpp b/config.tests/uacpp/main.cpp
index edda47f..a09b37f 100644
--- a/config.tests/uacpp/main.cpp
+++ b/config.tests/uacpp/main.cpp
@@ -36,9 +36,9 @@
 
 #include <stdio.h>
 
-#include <uaplatformlayer.h>
-#include <uastring.h>
-#include <uasession.h>
+#include <uabase/uaplatformlayer.h>
+#include <uabase/uastring.h>
+#include <uaclient/uasession.h>
 
 using namespace UaClientSdk;
 
diff --git a/src/plugins/opcua/uacpp/quacppbackend.cpp b/src/plugins/opcua/uacpp/quacppbackend.cpp
index bb5516c..e85150d 100644
--- a/src/plugins/opcua/uacpp/quacppbackend.cpp
+++ b/src/plugins/opcua/uacpp/quacppbackend.cpp
@@ -34,9 +34,9 @@
 
 #include <QtNetwork/QHostInfo>
 
-#include <uaplatformlayer.h>
-#include <uasession.h>
-#include <uastring.h>
+#include <uabase/uaplatformlayer.h>
+#include <uaclient/uasession.h>
+#include <uabase/uastring.h>
 
 #include <limits>
 
diff --git a/src/plugins/opcua/uacpp/quacppbackend.h b/src/plugins/opcua/uacpp/quacppbackend.h
index 5c02386..07ac784 100644
--- a/src/plugins/opcua/uacpp/quacppbackend.h
+++ b/src/plugins/opcua/uacpp/quacppbackend.h
@@ -29,8 +29,8 @@
 #include <QtCore/QString>
 #include <QtCore/QTimer>
 
-#include <uabase.h>
-#include <uaclientsdk.h>
+#include <uabase/uabase.h>
+#include <uaclient/uaclientsdk.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/opcua/uacpp/quacppnode.h b/src/plugins/opcua/uacpp/quacppnode.h
index 0480444..b5f2fad 100644
--- a/src/plugins/opcua/uacpp/quacppnode.h
+++ b/src/plugins/opcua/uacpp/quacppnode.h
@@ -28,7 +28,7 @@
 
 #include <QtCore/QPointer>
 
-#include <uanodeid.h>
+#include <uabase/uanodeid.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/opcua/uacpp/quacppplugin.h b/src/plugins/opcua/uacpp/quacppplugin.h
index 6a41b7b..c7a8bf2 100644
--- a/src/plugins/opcua/uacpp/quacppplugin.h
+++ b/src/plugins/opcua/uacpp/quacppplugin.h
@@ -24,7 +24,7 @@
 
 #include "qopcuaplugin.h"
 
-#include <uanodeid.h>
+#include <uabase/uanodeid.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/opcua/uacpp/quacppsubscription.cpp b/src/plugins/opcua/uacpp/quacppsubscription.cpp
index 6e50231..fba72e1 100644
--- a/src/plugins/opcua/uacpp/quacppsubscription.cpp
+++ b/src/plugins/opcua/uacpp/quacppsubscription.cpp
@@ -25,7 +25,7 @@
 
 #include <QtCore/QLoggingCategory>
 
-#include <uasession.h>
+#include <uaclient/uasession.h>
 
 using namespace UaClientSdk;
 
diff --git a/src/plugins/opcua/uacpp/quacppsubscription.h b/src/plugins/opcua/uacpp/quacppsubscription.h
index b58be99..bbc5f80 100644
--- a/src/plugins/opcua/uacpp/quacppsubscription.h
+++ b/src/plugins/opcua/uacpp/quacppsubscription.h
@@ -24,8 +24,8 @@
 
 #include <quacppbackend.h>
 
-#include <uanodeid.h>
-#include <uasubscription.h>
+#include <uabase/uanodeid.h>
+#include <uaclient/uasubscription.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/opcua/uacpp/quacpputils.cpp b/src/plugins/opcua/uacpp/quacpputils.cpp
index 0b753d2..940016d 100644
--- a/src/plugins/opcua/uacpp/quacpputils.cpp
+++ b/src/plugins/opcua/uacpp/quacpputils.cpp
@@ -25,7 +25,7 @@
 #include <QtCore/QString>
 #include <QtCore/QUuid>
 
-#include <uaguid.h>
+#include <uabase/uaguid.h>
 #include <cstring>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/opcua/uacpp/quacpputils.h b/src/plugins/opcua/uacpp/quacpputils.h
index 8358acc..7ee4a45 100644
--- a/src/plugins/opcua/uacpp/quacpputils.h
+++ b/src/plugins/opcua/uacpp/quacpputils.h
@@ -24,7 +24,7 @@
 
 #include <QtCore/qstring.h>
 
-#include <uanodeid.h>
+#include <uabase/uanodeid.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/opcua/uacpp/quacppvalueconverter.cpp b/src/plugins/opcua/uacpp/quacppvalueconverter.cpp
index 1b4e9f5..3d94bc3 100644
--- a/src/plugins/opcua/uacpp/quacppvalueconverter.cpp
+++ b/src/plugins/opcua/uacpp/quacppvalueconverter.cpp
@@ -28,14 +28,14 @@
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QUuid>
 
-#include <uastring.h>
-#include <ualocalizedtext.h>
-#include <uadatetime.h>
-#include <uaguid.h>
-#include <uavariant.h>
-#include <uaextensionobject.h>
-#include <uaeuinformation.h>
-#include <uaaxisinformation.h>
+#include <uabase/uastring.h>
+#include <uabase/ualocalizedtext.h>
+#include <uabase/uadatetime.h>
+#include <uabase/uaguid.h>
+#include <uabase/uavariant.h>
+#include <uabase/uaextensionobject.h>
+#include <uabase/uaeuinformation.h>
+#include <uabase/uaaxisinformation.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/opcua/uacpp/quacppvalueconverter.h b/src/plugins/opcua/uacpp/quacppvalueconverter.h
index e4c07c3..341ca72 100644
--- a/src/plugins/opcua/uacpp/quacppvalueconverter.h
+++ b/src/plugins/opcua/uacpp/quacppvalueconverter.h
@@ -27,7 +27,7 @@
 
 #include <QtCore/QVariant>
 
-#include <uanodeid.h>
+#include <uabase/uanodeid.h>
 
 QT_BEGIN_NAMESPACE