summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Heimrich <karsten.heimrich@qt.io>2018-08-14 10:23:39 +0200
committerKarsten Heimrich <karsten.heimrich@qt.io>2018-08-15 21:40:58 +0000
commit789657bd1b038bcebc82df1aeafc7de66d5786cd (patch)
treeb649379461ad4bcea5f9a999c6c2b84f4d5e1834
parent86e500d0f142d0288bbabf71497f0be55272f171 (diff)
Fix warning "Header <QtKnx/qknxglobal.h> is deprecated"
The previous commit introduced the new include file qtknxglobal.h and now the compiler issues the above mentioned warning. Change the include files accordingly. Change-Id: Ib8e80aa8d692f7ea050d232a622f583d720403c4 Reviewed-by: Andrew O'Doherty <andrew.odoherty@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
-rw-r--r--src/knx/core/qknxbytearray.h2
-rw-r--r--src/knx/dpt/qknx1bit.h2
-rw-r--r--src/knx/dpt/qknx1bitcontrolled.h2
-rw-r--r--src/knx/dpt/qknx1byte.h2
-rw-r--r--src/knx/dpt/qknx2bitset.h2
-rw-r--r--src/knx/dpt/qknx2bytefloat.h2
-rw-r--r--src/knx/dpt/qknx2bytesignedvalue.h2
-rw-r--r--src/knx/dpt/qknx2byteunsignedvalue.h2
-rw-r--r--src/knx/dpt/qknx32bitset.h2
-rw-r--r--src/knx/dpt/qknx3bitcontrolled.h2
-rw-r--r--src/knx/dpt/qknx4bytefloat.h2
-rw-r--r--src/knx/dpt/qknx4bytesignedvalue.h2
-rw-r--r--src/knx/dpt/qknx4byteunsignedvalue.h2
-rw-r--r--src/knx/dpt/qknx8bitset.h2
-rw-r--r--src/knx/dpt/qknx8bitsignedvalue.h2
-rw-r--r--src/knx/dpt/qknx8bitunsignedvalue.h2
-rw-r--r--src/knx/dpt/qknxchar.h2
-rw-r--r--src/knx/dpt/qknxcharstring.h2
-rw-r--r--src/knx/dpt/qknxdatapointtype.h2
-rw-r--r--src/knx/dpt/qknxdatapointtype_p.h2
-rw-r--r--src/knx/dpt/qknxdatapointtypefactory.h2
-rw-r--r--src/knx/dpt/qknxdatetime.h2
-rw-r--r--src/knx/dpt/qknxelectricalenergy.h2
-rw-r--r--src/knx/dpt/qknxentranceaccess.h2
-rw-r--r--src/knx/dpt/qknxscene.h2
-rw-r--r--src/knx/dpt/qknxstatusmode3.h2
-rw-r--r--src/knx/dpt/qknxtime.h2
-rw-r--r--src/knx/dpt/qknxutf8string.h2
-rw-r--r--src/knx/dpt/qknxvarstring.h2
-rw-r--r--src/knx/knxproj/qknxgroupaddressinfo.h2
-rw-r--r--src/knx/knxproj/qknxprojectutils_p.h2
-rw-r--r--src/knx/knxproj/qzipreader_p.h2
-rw-r--r--src/knx/knxproj/qzipwriter_p.h2
-rw-r--r--src/knx/netip/qknxnetip.h2
-rw-r--r--src/knx/netip/qknxnetipconfigdib.h2
-rw-r--r--src/knx/netip/qknxnetipconnectionstaterequest.h2
-rw-r--r--src/knx/netip/qknxnetipconnectionstateresponse.h2
-rw-r--r--src/knx/netip/qknxnetipconnectrequest.h2
-rw-r--r--src/knx/netip/qknxnetipconnectresponse.h2
-rw-r--r--src/knx/netip/qknxnetipcrd.h2
-rw-r--r--src/knx/netip/qknxnetipcri.h2
-rw-r--r--src/knx/netip/qknxnetipcurrentconfigdib.h2
-rw-r--r--src/knx/netip/qknxnetipdescriptionrequest.h2
-rw-r--r--src/knx/netip/qknxnetipdescriptionresponse.h2
-rw-r--r--src/knx/netip/qknxnetipdeviceconfigurationacknowledge.h2
-rw-r--r--src/knx/netip/qknxnetipdeviceconfigurationrequest.h2
-rw-r--r--src/knx/netip/qknxnetipdevicedib.h2
-rw-r--r--src/knx/netip/qknxnetipdevicemanagement.h2
-rw-r--r--src/knx/netip/qknxnetipdisconnectrequest.h2
-rw-r--r--src/knx/netip/qknxnetipdisconnectresponse.h2
-rw-r--r--src/knx/netip/qknxnetipendpointconnection.h2
-rw-r--r--src/knx/netip/qknxnetipendpointconnection_p.h2
-rw-r--r--src/knx/netip/qknxnetipextendeddevicedib.h2
-rw-r--r--src/knx/netip/qknxnetiphpai.h2
-rw-r--r--src/knx/netip/qknxnetipknxaddressesdib.h2
-rw-r--r--src/knx/netip/qknxnetipmanufacturerdib.h2
-rw-r--r--src/knx/netip/qknxnetiproutingbusy.h2
-rw-r--r--src/knx/netip/qknxnetiproutingindication.h2
-rw-r--r--src/knx/netip/qknxnetiproutinglostmessage.h2
-rw-r--r--src/knx/netip/qknxnetiproutingsystembroadcast.h2
-rw-r--r--src/knx/netip/qknxnetipsearchrequest.h2
-rw-r--r--src/knx/netip/qknxnetipsearchresponse.h2
-rw-r--r--src/knx/netip/qknxnetipsecuredservicefamiliesdib.h2
-rw-r--r--src/knx/netip/qknxnetipsecurewrapper.h2
-rw-r--r--src/knx/netip/qknxnetipserverdescriptionagent.h2
-rw-r--r--src/knx/netip/qknxnetipserverdescriptionagent_p.h2
-rw-r--r--src/knx/netip/qknxnetipserverdiscoveryagent.h2
-rw-r--r--src/knx/netip/qknxnetipserverdiscoveryagent_p.h2
-rw-r--r--src/knx/netip/qknxnetipserverinfo.h2
-rw-r--r--src/knx/netip/qknxnetipserverinfo_p.h2
-rw-r--r--src/knx/netip/qknxnetipservicefamiliesdib.h2
-rw-r--r--src/knx/netip/qknxnetipsessionauthenticate.h2
-rw-r--r--src/knx/netip/qknxnetipsessionrequest.h2
-rw-r--r--src/knx/netip/qknxnetipsessionresponse.h2
-rw-r--r--src/knx/netip/qknxnetipsrp.h2
-rw-r--r--src/knx/netip/qknxnetiptimernotify.h2
-rw-r--r--src/knx/netip/qknxnetiptunnel.h2
-rw-r--r--src/knx/netip/qknxnetiptunnelingacknowledge.h2
-rw-r--r--src/knx/netip/qknxnetiptunnelingfeatureget.h2
-rw-r--r--src/knx/netip/qknxnetiptunnelingfeatureinfo.h2
-rw-r--r--src/knx/netip/qknxnetiptunnelingfeatureresponse.h2
-rw-r--r--src/knx/netip/qknxnetiptunnelingfeatureset.h2
-rw-r--r--src/knx/netip/qknxnetiptunnelingrequest.h2
-rw-r--r--src/knx/qknxaddress.h2
-rw-r--r--src/knx/qknxcontrolfield.h2
-rw-r--r--src/knx/qknxdevicemanagementframe.h2
-rw-r--r--src/knx/qknxdevicemanagementframefactory.h2
-rw-r--r--src/knx/qknxextendedcontrolfield.h2
-rw-r--r--src/knx/qknxinterfaceobjectproperty.h2
-rw-r--r--src/knx/qknxinterfaceobjecttype.h2
-rw-r--r--src/knx/qknxlinklayerframe.h2
-rw-r--r--src/knx/qknxlinklayerframebuilder.h2
-rw-r--r--src/knx/qknxnamespace.h2
-rw-r--r--src/knx/qknxtpdu.h2
-rw-r--r--src/knx/qknxtpdufactory_p.h2
-rw-r--r--src/knx/qknxtraits.h2
-rw-r--r--src/knx/qknxutils.h2
97 files changed, 97 insertions, 97 deletions
diff --git a/src/knx/core/qknxbytearray.h b/src/knx/core/qknxbytearray.h
index 4be44d6..4f1fdb1 100644
--- a/src/knx/core/qknxbytearray.h
+++ b/src/knx/core/qknxbytearray.h
@@ -44,7 +44,7 @@
#include <QtCore/qbytearray.h>
#include <QtCore/qdebug.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <initializer_list>
diff --git a/src/knx/dpt/qknx1bit.h b/src/knx/dpt/qknx1bit.h
index 9de422f..cc9591b 100644
--- a/src/knx/dpt/qknx1bit.h
+++ b/src/knx/dpt/qknx1bit.h
@@ -31,7 +31,7 @@
#define QKNX1BIT_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknx1bitcontrolled.h b/src/knx/dpt/qknx1bitcontrolled.h
index 3752597..9bbda9f 100644
--- a/src/knx/dpt/qknx1bitcontrolled.h
+++ b/src/knx/dpt/qknx1bitcontrolled.h
@@ -31,7 +31,7 @@
#define QKNX1BITCONTROLLED_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknx1byte.h b/src/knx/dpt/qknx1byte.h
index 7283ae1..54ec3c8 100644
--- a/src/knx/dpt/qknx1byte.h
+++ b/src/knx/dpt/qknx1byte.h
@@ -31,7 +31,7 @@
#define QKNX1BYTE_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknx2bitset.h b/src/knx/dpt/qknx2bitset.h
index 8f6ef41..7e1f11f 100644
--- a/src/knx/dpt/qknx2bitset.h
+++ b/src/knx/dpt/qknx2bitset.h
@@ -31,7 +31,7 @@
#define QKNX2BITSET_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknx2bytefloat.h b/src/knx/dpt/qknx2bytefloat.h
index de8924f..b57a5dd 100644
--- a/src/knx/dpt/qknx2bytefloat.h
+++ b/src/knx/dpt/qknx2bytefloat.h
@@ -31,7 +31,7 @@
#define QKNX2BYTEFLOAT_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknx2bytesignedvalue.h b/src/knx/dpt/qknx2bytesignedvalue.h
index c8a446e..50e5fb1 100644
--- a/src/knx/dpt/qknx2bytesignedvalue.h
+++ b/src/knx/dpt/qknx2bytesignedvalue.h
@@ -31,7 +31,7 @@
#define QKNX2BYTESIGNEDVALUE_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknx2byteunsignedvalue.h b/src/knx/dpt/qknx2byteunsignedvalue.h
index ea8b600..f57122e 100644
--- a/src/knx/dpt/qknx2byteunsignedvalue.h
+++ b/src/knx/dpt/qknx2byteunsignedvalue.h
@@ -31,7 +31,7 @@
#define QKNX2BYTEUNSIGNEDVALUE_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknx32bitset.h b/src/knx/dpt/qknx32bitset.h
index 3e38c7d..6a23207 100644
--- a/src/knx/dpt/qknx32bitset.h
+++ b/src/knx/dpt/qknx32bitset.h
@@ -31,7 +31,7 @@
#define QKNX32BITSET_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknx3bitcontrolled.h b/src/knx/dpt/qknx3bitcontrolled.h
index bb02a10..fb5e137 100644
--- a/src/knx/dpt/qknx3bitcontrolled.h
+++ b/src/knx/dpt/qknx3bitcontrolled.h
@@ -31,7 +31,7 @@
#define QKNX3BITCONTROLLED_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknx4bytefloat.h b/src/knx/dpt/qknx4bytefloat.h
index cdb8b7b..bf98e39 100644
--- a/src/knx/dpt/qknx4bytefloat.h
+++ b/src/knx/dpt/qknx4bytefloat.h
@@ -31,7 +31,7 @@
#define QKNX4BYTEFLOAT_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknx4bytesignedvalue.h b/src/knx/dpt/qknx4bytesignedvalue.h
index 83fb2c3..3272395 100644
--- a/src/knx/dpt/qknx4bytesignedvalue.h
+++ b/src/knx/dpt/qknx4bytesignedvalue.h
@@ -31,7 +31,7 @@
#define QKNX4BYTESIGNEDVALUE_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknx4byteunsignedvalue.h b/src/knx/dpt/qknx4byteunsignedvalue.h
index c4f1a13..9bf7b49 100644
--- a/src/knx/dpt/qknx4byteunsignedvalue.h
+++ b/src/knx/dpt/qknx4byteunsignedvalue.h
@@ -31,7 +31,7 @@
#define QKNX4BYTEUNSIGNEDVALUE_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknx8bitset.h b/src/knx/dpt/qknx8bitset.h
index 1a29a70..548e29b 100644
--- a/src/knx/dpt/qknx8bitset.h
+++ b/src/knx/dpt/qknx8bitset.h
@@ -31,7 +31,7 @@
#define QKNX8BITSET_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknx8bitsignedvalue.h b/src/knx/dpt/qknx8bitsignedvalue.h
index 68eb81b..6bbbff6 100644
--- a/src/knx/dpt/qknx8bitsignedvalue.h
+++ b/src/knx/dpt/qknx8bitsignedvalue.h
@@ -31,7 +31,7 @@
#define QKNX8BITSIGNEDVALUE_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknx8bitunsignedvalue.h b/src/knx/dpt/qknx8bitunsignedvalue.h
index b22cbde..bdb398c 100644
--- a/src/knx/dpt/qknx8bitunsignedvalue.h
+++ b/src/knx/dpt/qknx8bitunsignedvalue.h
@@ -31,7 +31,7 @@
#define QKNX8BITUNSIGNEDVALUE_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknxchar.h b/src/knx/dpt/qknxchar.h
index 9a7d486..dd5c480 100644
--- a/src/knx/dpt/qknxchar.h
+++ b/src/knx/dpt/qknxchar.h
@@ -31,7 +31,7 @@
#define QKNXCHAR_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknxcharstring.h b/src/knx/dpt/qknxcharstring.h
index ef4c2e6..2c0f3a1 100644
--- a/src/knx/dpt/qknxcharstring.h
+++ b/src/knx/dpt/qknxcharstring.h
@@ -31,7 +31,7 @@
#define QKNXCHARSTRING_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknxdatapointtype.h b/src/knx/dpt/qknxdatapointtype.h
index fb157d0..32318f6 100644
--- a/src/knx/dpt/qknxdatapointtype.h
+++ b/src/knx/dpt/qknxdatapointtype.h
@@ -36,7 +36,7 @@
#include <QtCore/qvariant.h>
#include <QtCore/qshareddata.h>
#include <QtKnx/qknxbytearray.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknxdatapointtype_p.h b/src/knx/dpt/qknxdatapointtype_p.h
index 31ed438..50d5d07 100644
--- a/src/knx/dpt/qknxdatapointtype_p.h
+++ b/src/knx/dpt/qknxdatapointtype_p.h
@@ -45,7 +45,7 @@
#include <QtCore/qshareddata.h>
#include <QtCore/qvariant.h>
#include <QtKnx/qknxbytearray.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknxdatapointtypefactory.h b/src/knx/dpt/qknxdatapointtypefactory.h
index d348e7b..d82f551 100644
--- a/src/knx/dpt/qknxdatapointtypefactory.h
+++ b/src/knx/dpt/qknxdatapointtypefactory.h
@@ -31,7 +31,7 @@
#define QKNXDATAPOINTTYPEFACTORY_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknxdatetime.h b/src/knx/dpt/qknxdatetime.h
index 55b4d29..8c45686 100644
--- a/src/knx/dpt/qknxdatetime.h
+++ b/src/knx/dpt/qknxdatetime.h
@@ -32,7 +32,7 @@
#include <QtCore/qdatetime.h>
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxtime.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknxelectricalenergy.h b/src/knx/dpt/qknxelectricalenergy.h
index aac0fdc..b5a6057 100644
--- a/src/knx/dpt/qknxelectricalenergy.h
+++ b/src/knx/dpt/qknxelectricalenergy.h
@@ -31,7 +31,7 @@
#define QKNX8BYTESIGNEDVALUE_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknxentranceaccess.h b/src/knx/dpt/qknxentranceaccess.h
index 5f3f69d..0327abe 100644
--- a/src/knx/dpt/qknxentranceaccess.h
+++ b/src/knx/dpt/qknxentranceaccess.h
@@ -31,7 +31,7 @@
#define QKNXENTRANCEACCESS_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknxscene.h b/src/knx/dpt/qknxscene.h
index 27b0e4f..149a199 100644
--- a/src/knx/dpt/qknxscene.h
+++ b/src/knx/dpt/qknxscene.h
@@ -31,7 +31,7 @@
#define QKNXSCENE_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknxstatusmode3.h b/src/knx/dpt/qknxstatusmode3.h
index 6a38452..97c9077 100644
--- a/src/knx/dpt/qknxstatusmode3.h
+++ b/src/knx/dpt/qknxstatusmode3.h
@@ -31,7 +31,7 @@
#define QKNXSTATUSMODE3_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknxtime.h b/src/knx/dpt/qknxtime.h
index 1e6be6a..e195560 100644
--- a/src/knx/dpt/qknxtime.h
+++ b/src/knx/dpt/qknxtime.h
@@ -31,7 +31,7 @@
#define QKNXTIME_H
#include <QtCore/qmetatype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknxutf8string.h b/src/knx/dpt/qknxutf8string.h
index e9e9fd3..e079619 100644
--- a/src/knx/dpt/qknxutf8string.h
+++ b/src/knx/dpt/qknxutf8string.h
@@ -31,7 +31,7 @@
#define QKNXUTF8STRING_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/dpt/qknxvarstring.h b/src/knx/dpt/qknxvarstring.h
index b94dcef..47fb8c3 100644
--- a/src/knx/dpt/qknxvarstring.h
+++ b/src/knx/dpt/qknxvarstring.h
@@ -31,7 +31,7 @@
#define QKNXVARSTRING_H
#include <QtKnx/qknxdatapointtype.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/knxproj/qknxgroupaddressinfo.h b/src/knx/knxproj/qknxgroupaddressinfo.h
index 4fc3d8d..da3589c 100644
--- a/src/knx/knxproj/qknxgroupaddressinfo.h
+++ b/src/knx/knxproj/qknxgroupaddressinfo.h
@@ -33,7 +33,7 @@
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxaddress.h>
#include <QtKnx/qknxdatapointtype.h>
diff --git a/src/knx/knxproj/qknxprojectutils_p.h b/src/knx/knxproj/qknxprojectutils_p.h
index 3230ace..e619d59 100644
--- a/src/knx/knxproj/qknxprojectutils_p.h
+++ b/src/knx/knxproj/qknxprojectutils_p.h
@@ -43,7 +43,7 @@
#include <QtCore/qcoreapplication.h>
#include <QtCore/qxmlstream.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/knxproj/qzipreader_p.h b/src/knx/knxproj/qzipreader_p.h
index 9f73000..9ba1aa8 100644
--- a/src/knx/knxproj/qzipreader_p.h
+++ b/src/knx/knxproj/qzipreader_p.h
@@ -56,7 +56,7 @@
#include <QtCore/qdatetime.h>
#include <QtCore/qfile.h>
#include <QtCore/qstring.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/knxproj/qzipwriter_p.h b/src/knx/knxproj/qzipwriter_p.h
index 5b36a73..300fff8 100644
--- a/src/knx/knxproj/qzipwriter_p.h
+++ b/src/knx/knxproj/qzipwriter_p.h
@@ -53,7 +53,7 @@
#include <QtCore/qstring.h>
#include <QtCore/qfile.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetip.h b/src/knx/netip/qknxnetip.h
index cddbd5b..378e758 100644
--- a/src/knx/netip/qknxnetip.h
+++ b/src/knx/netip/qknxnetip.h
@@ -30,7 +30,7 @@
#ifndef QKNXNETIP_H
#define QKNXNETIP_H
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnamespace.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipconfigdib.h b/src/knx/netip/qknxnetipconfigdib.h
index b598928..e9f0462 100644
--- a/src/knx/netip/qknxnetipconfigdib.h
+++ b/src/knx/netip/qknxnetipconfigdib.h
@@ -30,7 +30,7 @@
#ifndef QKNXNETIPCONFIGDIB_H
#define QKNXNETIPCONFIGDIB_H
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetipstruct.h>
#include <QtNetwork/qhostaddress.h>
diff --git a/src/knx/netip/qknxnetipconnectionstaterequest.h b/src/knx/netip/qknxnetipconnectionstaterequest.h
index 095c87c..8d3f656 100644
--- a/src/knx/netip/qknxnetipconnectionstaterequest.h
+++ b/src/knx/netip/qknxnetipconnectionstaterequest.h
@@ -32,7 +32,7 @@
#include <QtKnx/qknxnetipframe.h>
#include <QtKnx/qknxnetiphpai.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipconnectionstateresponse.h b/src/knx/netip/qknxnetipconnectionstateresponse.h
index 726054d..e56533f 100644
--- a/src/knx/netip/qknxnetipconnectionstateresponse.h
+++ b/src/knx/netip/qknxnetipconnectionstateresponse.h
@@ -32,7 +32,7 @@
#include <QtKnx/qknxnetip.h>
#include <QtKnx/qknxnetipframe.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipconnectrequest.h b/src/knx/netip/qknxnetipconnectrequest.h
index 350c28f..f6f6dc4 100644
--- a/src/knx/netip/qknxnetipconnectrequest.h
+++ b/src/knx/netip/qknxnetipconnectrequest.h
@@ -33,7 +33,7 @@
#include <QtKnx/qknxnetipcri.h>
#include <QtKnx/qknxnetipframe.h>
#include <QtKnx/qknxnetiphpai.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipconnectresponse.h b/src/knx/netip/qknxnetipconnectresponse.h
index 07cc53e..bb1d9b4 100644
--- a/src/knx/netip/qknxnetipconnectresponse.h
+++ b/src/knx/netip/qknxnetipconnectresponse.h
@@ -34,7 +34,7 @@
#include <QtKnx/qknxnetipcrd.h>
#include <QtKnx/qknxnetipframe.h>
#include <QtKnx/qknxnetiphpai.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipcrd.h b/src/knx/netip/qknxnetipcrd.h
index 7de11b6..75a8321 100644
--- a/src/knx/netip/qknxnetipcrd.h
+++ b/src/knx/netip/qknxnetipcrd.h
@@ -31,7 +31,7 @@
#define QKNXNETIPCRD_H
#include <QtKnx/qknxaddress.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetipstruct.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipcri.h b/src/knx/netip/qknxnetipcri.h
index 751287d..86a6cf0 100644
--- a/src/knx/netip/qknxnetipcri.h
+++ b/src/knx/netip/qknxnetipcri.h
@@ -31,7 +31,7 @@
#define QKNXNETIPCRI_H
#include <QtKnx/qknxaddress.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetipstruct.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipcurrentconfigdib.h b/src/knx/netip/qknxnetipcurrentconfigdib.h
index 206cbad..bb814a3 100644
--- a/src/knx/netip/qknxnetipcurrentconfigdib.h
+++ b/src/knx/netip/qknxnetipcurrentconfigdib.h
@@ -30,7 +30,7 @@
#ifndef QKNXNETIPCURRENTCONFIGDIB_H
#define QKNXNETIPCURRENTCONFIGDIB_H
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetipstruct.h>
#include <QtNetwork/qhostaddress.h>
diff --git a/src/knx/netip/qknxnetipdescriptionrequest.h b/src/knx/netip/qknxnetipdescriptionrequest.h
index 3bd795a..0064423 100644
--- a/src/knx/netip/qknxnetipdescriptionrequest.h
+++ b/src/knx/netip/qknxnetipdescriptionrequest.h
@@ -32,7 +32,7 @@
#include <QtKnx/qknxnetipframe.h>
#include <QtKnx/qknxnetiphpai.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipdescriptionresponse.h b/src/knx/netip/qknxnetipdescriptionresponse.h
index 9a2e269..7e6ceed 100644
--- a/src/knx/netip/qknxnetipdescriptionresponse.h
+++ b/src/knx/netip/qknxnetipdescriptionresponse.h
@@ -33,7 +33,7 @@
#include <QtCore/qvector.h>
#include <QtKnx/qknxnetipframe.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetipstruct.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipdeviceconfigurationacknowledge.h b/src/knx/netip/qknxnetipdeviceconfigurationacknowledge.h
index 377f507..d2151bb 100644
--- a/src/knx/netip/qknxnetipdeviceconfigurationacknowledge.h
+++ b/src/knx/netip/qknxnetipdeviceconfigurationacknowledge.h
@@ -32,7 +32,7 @@
#include <QtKnx/qknxnetip.h>
#include <QtKnx/qknxnetipframe.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipdeviceconfigurationrequest.h b/src/knx/netip/qknxnetipdeviceconfigurationrequest.h
index ed8c4ba..a428218 100644
--- a/src/knx/netip/qknxnetipdeviceconfigurationrequest.h
+++ b/src/knx/netip/qknxnetipdeviceconfigurationrequest.h
@@ -33,7 +33,7 @@
#include <QtKnx/qknxdevicemanagementframe.h>
#include <QtKnx/qknxnetip.h>
#include <QtKnx/qknxnetipframe.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipdevicedib.h b/src/knx/netip/qknxnetipdevicedib.h
index 1a0394f..45fdf8f 100644
--- a/src/knx/netip/qknxnetipdevicedib.h
+++ b/src/knx/netip/qknxnetipdevicedib.h
@@ -31,7 +31,7 @@
#define QKNXNETIPDEVICEDIB_H
#include <QtKnx/qknxaddress.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnamespace.h>
#include <QtKnx/qknxnetipstruct.h>
diff --git a/src/knx/netip/qknxnetipdevicemanagement.h b/src/knx/netip/qknxnetipdevicemanagement.h
index a2e2763..ed4c93e 100644
--- a/src/knx/netip/qknxnetipdevicemanagement.h
+++ b/src/knx/netip/qknxnetipdevicemanagement.h
@@ -31,7 +31,7 @@
#define QKNXNETIPDEVICEMANAGEMENT_H
#include <QtKnx/qknxdevicemanagementframe.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetipendpointconnection.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipdisconnectrequest.h b/src/knx/netip/qknxnetipdisconnectrequest.h
index de0f9d0..72dd23f 100644
--- a/src/knx/netip/qknxnetipdisconnectrequest.h
+++ b/src/knx/netip/qknxnetipdisconnectrequest.h
@@ -32,7 +32,7 @@
#include <QtKnx/qknxnetipframe.h>
#include <QtKnx/qknxnetiphpai.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipdisconnectresponse.h b/src/knx/netip/qknxnetipdisconnectresponse.h
index beff274..8374ee7 100644
--- a/src/knx/netip/qknxnetipdisconnectresponse.h
+++ b/src/knx/netip/qknxnetipdisconnectresponse.h
@@ -32,7 +32,7 @@
#include <QtKnx/qknxnetip.h>
#include <QtKnx/qknxnetipframe.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipendpointconnection.h b/src/knx/netip/qknxnetipendpointconnection.h
index 496426d..7b8d3ce 100644
--- a/src/knx/netip/qknxnetipendpointconnection.h
+++ b/src/knx/netip/qknxnetipendpointconnection.h
@@ -30,7 +30,7 @@
#ifndef QKNXNETIPENDPOINTCONNECTION_H
#define QKNXNETIPENDPOINTCONNECTION_H
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetipcri.h>
#include <QtKnx/qknxnetiphpai.h>
#include <QtKnx/qknxnetipframe.h>
diff --git a/src/knx/netip/qknxnetipendpointconnection_p.h b/src/knx/netip/qknxnetipendpointconnection_p.h
index d33a493..4d48123 100644
--- a/src/knx/netip/qknxnetipendpointconnection_p.h
+++ b/src/knx/netip/qknxnetipendpointconnection_p.h
@@ -43,7 +43,7 @@
#include <QtCore/qtimer.h>
#include <QtKnx/qknxaddress.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetipendpointconnection.h>
#include <QtNetwork/qhostaddress.h>
#include <QtKnx/qknxdevicemanagementframe.h>
diff --git a/src/knx/netip/qknxnetipextendeddevicedib.h b/src/knx/netip/qknxnetipextendeddevicedib.h
index 0d2b82d..be7feda 100644
--- a/src/knx/netip/qknxnetipextendeddevicedib.h
+++ b/src/knx/netip/qknxnetipextendeddevicedib.h
@@ -30,7 +30,7 @@
#ifndef QKNXNETIPEXTENDEDDEVICEDIB_H
#define QKNXNETIPEXTENDEDDEVICEDIB_H
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetipstruct.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetiphpai.h b/src/knx/netip/qknxnetiphpai.h
index f6fcabf..f099171 100644
--- a/src/knx/netip/qknxnetiphpai.h
+++ b/src/knx/netip/qknxnetiphpai.h
@@ -30,7 +30,7 @@
#ifndef QKNXNETIPHPAI_H
#define QKNXNETIPHPAI_H
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetipstruct.h>
#include <QtNetwork/qhostaddress.h>
diff --git a/src/knx/netip/qknxnetipknxaddressesdib.h b/src/knx/netip/qknxnetipknxaddressesdib.h
index 65aaaa1..4592910 100644
--- a/src/knx/netip/qknxnetipknxaddressesdib.h
+++ b/src/knx/netip/qknxnetipknxaddressesdib.h
@@ -31,7 +31,7 @@
#define QKNXNETIPKNXADDRESSESDIB_H
#include <QtKnx/qknxaddress.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetipstruct.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipmanufacturerdib.h b/src/knx/netip/qknxnetipmanufacturerdib.h
index 2947c08..f2b17df 100644
--- a/src/knx/netip/qknxnetipmanufacturerdib.h
+++ b/src/knx/netip/qknxnetipmanufacturerdib.h
@@ -30,7 +30,7 @@
#ifndef QKNXNETIPMANUFACTURERDIB_H
#define QKNXNETIPMANUFACTURERDIB_H
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetipstruct.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetiproutingbusy.h b/src/knx/netip/qknxnetiproutingbusy.h
index 5341ed6..f5b5a4f 100644
--- a/src/knx/netip/qknxnetiproutingbusy.h
+++ b/src/knx/netip/qknxnetiproutingbusy.h
@@ -32,7 +32,7 @@
#include <QtKnx/qknxnetip.h>
#include <QtKnx/qknxnetipframe.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetiproutingindication.h b/src/knx/netip/qknxnetiproutingindication.h
index 41c71d5..0c74623 100644
--- a/src/knx/netip/qknxnetiproutingindication.h
+++ b/src/knx/netip/qknxnetiproutingindication.h
@@ -33,7 +33,7 @@
#include <QtKnx/qknxlinklayerframe.h>
#include <QtKnx/qknxnetip.h>
#include <QtKnx/qknxnetipframe.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetiproutinglostmessage.h b/src/knx/netip/qknxnetiproutinglostmessage.h
index 397b875..9645265 100644
--- a/src/knx/netip/qknxnetiproutinglostmessage.h
+++ b/src/knx/netip/qknxnetiproutinglostmessage.h
@@ -32,7 +32,7 @@
#include <QtKnx/qknxnetip.h>
#include <QtKnx/qknxnetipframe.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetiproutingsystembroadcast.h b/src/knx/netip/qknxnetiproutingsystembroadcast.h
index 95a3421..28b690c 100644
--- a/src/knx/netip/qknxnetiproutingsystembroadcast.h
+++ b/src/knx/netip/qknxnetiproutingsystembroadcast.h
@@ -33,7 +33,7 @@
#include <QtKnx/qknxlinklayerframe.h>
#include <QtKnx/qknxnetip.h>
#include <QtKnx/qknxnetipframe.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipsearchrequest.h b/src/knx/netip/qknxnetipsearchrequest.h
index 241a0bc..e831564 100644
--- a/src/knx/netip/qknxnetipsearchrequest.h
+++ b/src/knx/netip/qknxnetipsearchrequest.h
@@ -32,7 +32,7 @@
#include <QtKnx/qknxnetipframe.h>
#include <QtKnx/qknxnetiphpai.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qvector.h>
diff --git a/src/knx/netip/qknxnetipsearchresponse.h b/src/knx/netip/qknxnetipsearchresponse.h
index 8e6654e..b424488 100644
--- a/src/knx/netip/qknxnetipsearchresponse.h
+++ b/src/knx/netip/qknxnetipsearchresponse.h
@@ -34,7 +34,7 @@
#include <QtKnx/qknxnetipframe.h>
#include <QtKnx/qknxnetiphpai.h>
#include <QtKnx/qknxnetipservicefamiliesdib.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipsecuredservicefamiliesdib.h b/src/knx/netip/qknxnetipsecuredservicefamiliesdib.h
index f5572ac..1a34970 100644
--- a/src/knx/netip/qknxnetipsecuredservicefamiliesdib.h
+++ b/src/knx/netip/qknxnetipsecuredservicefamiliesdib.h
@@ -30,7 +30,7 @@
#ifndef QKNXNETIPSECUREDSERVICEFAMILIESDIB_H
#define QKNXNETIPSECUREDSERVICEFAMILIESDIB_H
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetipstruct.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipsecurewrapper.h b/src/knx/netip/qknxnetipsecurewrapper.h
index 23860b3..8837df7 100644
--- a/src/knx/netip/qknxnetipsecurewrapper.h
+++ b/src/knx/netip/qknxnetipsecurewrapper.h
@@ -31,7 +31,7 @@
#define QKNXNETIPSECUREWRAPPER_H
#include <QtKnx/qknxnetipframe.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipserverdescriptionagent.h b/src/knx/netip/qknxnetipserverdescriptionagent.h
index 4eaa595..292db19 100644
--- a/src/knx/netip/qknxnetipserverdescriptionagent.h
+++ b/src/knx/netip/qknxnetipserverdescriptionagent.h
@@ -32,7 +32,7 @@
#include <QtCore/qobject.h>
#include <QtCore/qvector.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetipserverinfo.h>
#include <QtNetwork/qhostaddress.h>
diff --git a/src/knx/netip/qknxnetipserverdescriptionagent_p.h b/src/knx/netip/qknxnetipserverdescriptionagent_p.h
index 4117903..9d63e8c 100644
--- a/src/knx/netip/qknxnetipserverdescriptionagent_p.h
+++ b/src/knx/netip/qknxnetipserverdescriptionagent_p.h
@@ -42,7 +42,7 @@
//
#include <QtCore/qtimer.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetip.h>
#include <QtKnx/qknxnetipdescriptionrequest.h>
#include <QtKnx/qknxnetipdescriptionresponse.h>
diff --git a/src/knx/netip/qknxnetipserverdiscoveryagent.h b/src/knx/netip/qknxnetipserverdiscoveryagent.h
index 5bbc462..0fd0455 100644
--- a/src/knx/netip/qknxnetipserverdiscoveryagent.h
+++ b/src/knx/netip/qknxnetipserverdiscoveryagent.h
@@ -32,7 +32,7 @@
#include <QtCore/qobject.h>
#include <QtCore/qvector.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetipserverinfo.h>
#include <QtNetwork/qhostaddress.h>
diff --git a/src/knx/netip/qknxnetipserverdiscoveryagent_p.h b/src/knx/netip/qknxnetipserverdiscoveryagent_p.h
index 2bd534b..21bdcdf 100644
--- a/src/knx/netip/qknxnetipserverdiscoveryagent_p.h
+++ b/src/knx/netip/qknxnetipserverdiscoveryagent_p.h
@@ -42,7 +42,7 @@
//
#include <QtCore/qtimer.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetip.h>
#include <QtKnx/qknxnetipsearchrequest.h>
#include <QtKnx/qknxnetipsearchresponse.h>
diff --git a/src/knx/netip/qknxnetipserverinfo.h b/src/knx/netip/qknxnetipserverinfo.h
index 82a2595..0a8c886 100644
--- a/src/knx/netip/qknxnetipserverinfo.h
+++ b/src/knx/netip/qknxnetipserverinfo.h
@@ -34,7 +34,7 @@
#include <QtCore/qshareddata.h>
#include <QtKnx/qknxaddress.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetipservicefamiliesdib.h>
#include <QtKnx/qknxnetiptunnelinginfodib.h>
diff --git a/src/knx/netip/qknxnetipserverinfo_p.h b/src/knx/netip/qknxnetipserverinfo_p.h
index 5925d29..869d909 100644
--- a/src/knx/netip/qknxnetipserverinfo_p.h
+++ b/src/knx/netip/qknxnetipserverinfo_p.h
@@ -42,7 +42,7 @@
//
#include <QtCore/qshareddata.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetipdevicedib.h>
#include <QtKnx/qknxnetiphpai.h>
#include <QtKnx/qknxnetipservicefamiliesdib.h>
diff --git a/src/knx/netip/qknxnetipservicefamiliesdib.h b/src/knx/netip/qknxnetipservicefamiliesdib.h
index ef5a8b6..c686d27 100644
--- a/src/knx/netip/qknxnetipservicefamiliesdib.h
+++ b/src/knx/netip/qknxnetipservicefamiliesdib.h
@@ -30,7 +30,7 @@
#ifndef QKNXNETIPSERVICEFAMILIESDIB_H
#define QKNXNETIPSERVICEFAMILIESDIB_H
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetipstruct.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipsessionauthenticate.h b/src/knx/netip/qknxnetipsessionauthenticate.h
index 1aba3d5..8f52c16 100644
--- a/src/knx/netip/qknxnetipsessionauthenticate.h
+++ b/src/knx/netip/qknxnetipsessionauthenticate.h
@@ -31,7 +31,7 @@
#define QKNXNETIPSESSIONAUTHENTICATE_H
#include <QtKnx/qknxnetipframe.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipsessionrequest.h b/src/knx/netip/qknxnetipsessionrequest.h
index 7894e96..f547330 100644
--- a/src/knx/netip/qknxnetipsessionrequest.h
+++ b/src/knx/netip/qknxnetipsessionrequest.h
@@ -32,7 +32,7 @@
#include <QtKnx/qknxnetipframe.h>
#include <QtKnx/qknxnetiphpai.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipsessionresponse.h b/src/knx/netip/qknxnetipsessionresponse.h
index 2055fa6..0ed3693 100644
--- a/src/knx/netip/qknxnetipsessionresponse.h
+++ b/src/knx/netip/qknxnetipsessionresponse.h
@@ -32,7 +32,7 @@
#include <QtKnx/qknxnetipframe.h>
#include <QtKnx/qknxnetiphpai.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetipsrp.h b/src/knx/netip/qknxnetipsrp.h
index 1999041..5d49c74 100644
--- a/src/knx/netip/qknxnetipsrp.h
+++ b/src/knx/netip/qknxnetipsrp.h
@@ -32,7 +32,7 @@
#include <QtCore/qvector.h>
#include <QtCore/qshareddata.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetipstruct.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetiptimernotify.h b/src/knx/netip/qknxnetiptimernotify.h
index d9cab31..298e568 100644
--- a/src/knx/netip/qknxnetiptimernotify.h
+++ b/src/knx/netip/qknxnetiptimernotify.h
@@ -31,7 +31,7 @@
#define QKNXNETIPTIMERNOTIFY_H
#include <QtKnx/qknxnetipframe.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetiptunnel.h b/src/knx/netip/qknxnetiptunnel.h
index 2b941cb..455d4c9 100644
--- a/src/knx/netip/qknxnetiptunnel.h
+++ b/src/knx/netip/qknxnetiptunnel.h
@@ -31,7 +31,7 @@
#define QKNXNETIPTUNNEL_H
#include <QtKnx/qknxaddress.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetipendpointconnection.h>
#include <QtKnx/qknxlinklayerframe.h>
diff --git a/src/knx/netip/qknxnetiptunnelingacknowledge.h b/src/knx/netip/qknxnetiptunnelingacknowledge.h
index 4393326..c59ee25 100644
--- a/src/knx/netip/qknxnetiptunnelingacknowledge.h
+++ b/src/knx/netip/qknxnetiptunnelingacknowledge.h
@@ -32,7 +32,7 @@
#include <QtKnx/qknxnetip.h>
#include <QtKnx/qknxnetipframe.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetiptunnelingfeatureget.h b/src/knx/netip/qknxnetiptunnelingfeatureget.h
index 96ddd50..f2230f4 100644
--- a/src/knx/netip/qknxnetiptunnelingfeatureget.h
+++ b/src/knx/netip/qknxnetiptunnelingfeatureget.h
@@ -33,7 +33,7 @@
#include <QtCore/qshareddata.h>
#include <QtKnx/qknxnetipframe.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetiptunnelingfeatureinfo.h b/src/knx/netip/qknxnetiptunnelingfeatureinfo.h
index 2aa3114..fb11fed 100644
--- a/src/knx/netip/qknxnetiptunnelingfeatureinfo.h
+++ b/src/knx/netip/qknxnetiptunnelingfeatureinfo.h
@@ -34,7 +34,7 @@
#include <QtKnx/qknxnetip.h>
#include <QtKnx/qknxnetipframe.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetiptunnelingfeatureresponse.h b/src/knx/netip/qknxnetiptunnelingfeatureresponse.h
index fb30211..9c08c4e 100644
--- a/src/knx/netip/qknxnetiptunnelingfeatureresponse.h
+++ b/src/knx/netip/qknxnetiptunnelingfeatureresponse.h
@@ -34,7 +34,7 @@
#include <QtKnx/qknxnetip.h>
#include <QtKnx/qknxnetipframe.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetiptunnelingfeatureset.h b/src/knx/netip/qknxnetiptunnelingfeatureset.h
index 78d0393..372736e 100644
--- a/src/knx/netip/qknxnetiptunnelingfeatureset.h
+++ b/src/knx/netip/qknxnetiptunnelingfeatureset.h
@@ -34,7 +34,7 @@
#include <QtKnx/qknxnetip.h>
#include <QtKnx/qknxnetipframe.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/netip/qknxnetiptunnelingrequest.h b/src/knx/netip/qknxnetiptunnelingrequest.h
index e69d9c5..948a05f 100644
--- a/src/knx/netip/qknxnetiptunnelingrequest.h
+++ b/src/knx/netip/qknxnetiptunnelingrequest.h
@@ -32,7 +32,7 @@
#include <QtKnx/qknxnetip.h>
#include <QtKnx/qknxnetipframe.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxlinklayerframe.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/qknxaddress.h b/src/knx/qknxaddress.h
index d1df92b..aa7e58a 100644
--- a/src/knx/qknxaddress.h
+++ b/src/knx/qknxaddress.h
@@ -32,7 +32,7 @@
#include <QtCore/qdebug.h>
#include <QtCore/qstring.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxutils.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/qknxcontrolfield.h b/src/knx/qknxcontrolfield.h
index 4904d7e..02a0ddb 100644
--- a/src/knx/qknxcontrolfield.h
+++ b/src/knx/qknxcontrolfield.h
@@ -32,7 +32,7 @@
#include <QtCore/qdebug.h>
#include <QtKnx/qknxbytearray.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <bitset>
diff --git a/src/knx/qknxdevicemanagementframe.h b/src/knx/qknxdevicemanagementframe.h
index f7083de..73adfaf 100644
--- a/src/knx/qknxdevicemanagementframe.h
+++ b/src/knx/qknxdevicemanagementframe.h
@@ -33,7 +33,7 @@
#include <QtCore/qshareddata.h>
#include <QtKnx/qknxbytearray.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxinterfaceobjectproperty.h>
#include <QtKnx/qknxinterfaceobjecttype.h>
#include <QtKnx/qknxnetip.h>
diff --git a/src/knx/qknxdevicemanagementframefactory.h b/src/knx/qknxdevicemanagementframefactory.h
index 381e097..26ebebb 100644
--- a/src/knx/qknxdevicemanagementframefactory.h
+++ b/src/knx/qknxdevicemanagementframefactory.h
@@ -33,7 +33,7 @@
#include <QtKnx/qknxbytearray.h>
#include <QtKnx/qknxinterfaceobjecttype.h>
#include <QtKnx/qknxdevicemanagementframe.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetip.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/qknxextendedcontrolfield.h b/src/knx/qknxextendedcontrolfield.h
index 59d4271..b6e14ec 100644
--- a/src/knx/qknxextendedcontrolfield.h
+++ b/src/knx/qknxextendedcontrolfield.h
@@ -32,7 +32,7 @@
#include <QtCore/qdebug.h>
#include <QtKnx/qknxaddress.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <bitset>
diff --git a/src/knx/qknxinterfaceobjectproperty.h b/src/knx/qknxinterfaceobjectproperty.h
index 27069aa..8365d87 100644
--- a/src/knx/qknxinterfaceobjectproperty.h
+++ b/src/knx/qknxinterfaceobjectproperty.h
@@ -31,7 +31,7 @@
#define QKNXINTERFACEOBJECTPROPERTY_H
#include <QtCore/qobject.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/qknxinterfaceobjecttype.h b/src/knx/qknxinterfaceobjecttype.h
index 7be9d88..72212ac 100644
--- a/src/knx/qknxinterfaceobjecttype.h
+++ b/src/knx/qknxinterfaceobjecttype.h
@@ -31,7 +31,7 @@
#define QKNXINTERFACEOBJECTTYPE_H
#include <QtCore/qobject.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxinterfaceobjectproperty.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/qknxlinklayerframe.h b/src/knx/qknxlinklayerframe.h
index 3864fd3..8f954a5 100644
--- a/src/knx/qknxlinklayerframe.h
+++ b/src/knx/qknxlinklayerframe.h
@@ -35,7 +35,7 @@
#include <QtKnx/qknxbytearray.h>
#include <QtKnx/qknxcontrolfield.h>
#include <QtKnx/qknxextendedcontrolfield.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxtpdu.h>
#include <QtKnx/qknxnamespace.h>
diff --git a/src/knx/qknxlinklayerframebuilder.h b/src/knx/qknxlinklayerframebuilder.h
index 55f8dbd..4d1547e 100644
--- a/src/knx/qknxlinklayerframebuilder.h
+++ b/src/knx/qknxlinklayerframebuilder.h
@@ -35,7 +35,7 @@
#include <QtKnx/qknxaddress.h>
#include <QtKnx/qknxcontrolfield.h>
#include <QtKnx/qknxextendedcontrolfield.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxlinklayerframe.h>
#include <QtKnx/qknxnamespace.h>
#include <QtKnx/qknxtpdu.h>
diff --git a/src/knx/qknxnamespace.h b/src/knx/qknxnamespace.h
index 576a982..0841036 100644
--- a/src/knx/qknxnamespace.h
+++ b/src/knx/qknxnamespace.h
@@ -31,7 +31,7 @@
#define QKNXNAMESPACE_H
#include <QtCore/qmetaobject.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/qknxtpdu.h b/src/knx/qknxtpdu.h
index cfa1720..ff8b8e5 100644
--- a/src/knx/qknxtpdu.h
+++ b/src/knx/qknxtpdu.h
@@ -32,7 +32,7 @@
#include <QtCore/qshareddata.h>
#include <QtKnx/qknxbytearray.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxnetip.h>
QT_BEGIN_NAMESPACE
diff --git a/src/knx/qknxtpdufactory_p.h b/src/knx/qknxtpdufactory_p.h
index c1f5263..870ca4a 100644
--- a/src/knx/qknxtpdufactory_p.h
+++ b/src/knx/qknxtpdufactory_p.h
@@ -42,7 +42,7 @@
//
#include <QtKnx/qknxaddress.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtKnx/qknxinterfaceobjectproperty.h>
#include <QtKnx/qknxinterfaceobjectpropertydatatype.h>
#include <QtKnx/qknxinterfaceobjecttype.h>
diff --git a/src/knx/qknxtraits.h b/src/knx/qknxtraits.h
index 22f3175..468674c 100644
--- a/src/knx/qknxtraits.h
+++ b/src/knx/qknxtraits.h
@@ -30,7 +30,7 @@
#ifndef QKNXTRAITS_H
#define QKNXTRAITS_H
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <array>
#include <bitset>
diff --git a/src/knx/qknxutils.h b/src/knx/qknxutils.h
index 3c55d55..e4ab6bd 100644
--- a/src/knx/qknxutils.h
+++ b/src/knx/qknxutils.h
@@ -31,7 +31,7 @@
#define QKNXUTILS_H
#include <QtKnx/qknxbytearray.h>
-#include <QtKnx/qknxglobal.h>
+#include <QtKnx/qtknxglobal.h>
#include <QtNetwork/qhostaddress.h>
QT_BEGIN_NAMESPACE