diff options
| author | J-P Nurmi <jpnurmi@gmail.com> | 2018-07-03 10:27:23 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@gmail.com> | 2018-07-12 10:15:14 +0000 |
| commit | c79f5fead7412793a00fc9a1e78ae9d434d3ba29 (patch) | |
| tree | 38d6dd2a83563e185b9ad1b81d4812488a633d70 | |
| parent | d94d4f987a40346c4e05a70eb8692359e2d1ef13 (diff) | |
Tweak the includes
Use the <QtModule/qheader.h> syntax in headers to follow the Qt coding
conventions, and use local "qheader_p.h" includes for including own
headers from within the QtMqtt module itself. These changes, that
eliminate dependencies from QtMqtt sources to syncqt's generated
headers, make it possible to e.g. build QtMqtt as part of a project
tree, and with custom build systems.
Change-Id: Iebd98ea70dc89d8171dff3616ebfc661f5993f9f
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: hjk <hjk@qt.io>
| -rw-r--r-- | src/mqtt/qmqttclient.h | 4 | ||||
| -rw-r--r-- | src/mqtt/qmqttclient_p.h | 2 | ||||
| -rw-r--r-- | src/mqtt/qmqttmessage.h | 5 | ||||
| -rw-r--r-- | src/mqtt/qmqttsubscription.cpp | 2 | ||||
| -rw-r--r-- | src/mqtt/qmqttsubscription.h | 5 | ||||
| -rw-r--r-- | src/mqtt/qmqtttopicfilter.h | 5 | ||||
| -rw-r--r-- | src/mqtt/qmqtttopicname.h | 2 |
7 files changed, 11 insertions, 14 deletions
diff --git a/src/mqtt/qmqttclient.h b/src/mqtt/qmqttclient.h index 873f937..9b06ae7 100644 --- a/src/mqtt/qmqttclient.h +++ b/src/mqtt/qmqttclient.h @@ -31,8 +31,8 @@ #define QTMQTTCLIENT_H #include <QtMqtt/qmqttglobal.h> -#include <QtMqtt/QMqttSubscription> -#include <QtMqtt/QMqttTopicFilter> +#include <QtMqtt/qmqttsubscription.h> +#include <QtMqtt/qmqtttopicfilter.h> #include <QtCore/QIODevice> #include <QtCore/QObject> diff --git a/src/mqtt/qmqttclient_p.h b/src/mqtt/qmqttclient_p.h index dc5760c..2bec37e 100644 --- a/src/mqtt/qmqttclient_p.h +++ b/src/mqtt/qmqttclient_p.h @@ -42,10 +42,10 @@ // #include "qmqttclient.h" +#include "qmqttconnection_p.h" #include <QtNetwork/QAbstractSocket> -#include <private/qmqttconnection_p.h> #include <private/qobject_p.h> QT_BEGIN_NAMESPACE diff --git a/src/mqtt/qmqttmessage.h b/src/mqtt/qmqttmessage.h index 509e631..c011cbe 100644 --- a/src/mqtt/qmqttmessage.h +++ b/src/mqtt/qmqttmessage.h @@ -30,9 +30,8 @@ #ifndef QMQTTMESSAGE_H #define QMQTTMESSAGE_H -#include "qmqttglobal.h" - -#include <QtMqtt/QMqttTopicName> +#include <QtMqtt/qmqttglobal.h> +#include <QtMqtt/qmqtttopicname.h> #include <QtCore/QObject> #include <QtCore/QSharedDataPointer> diff --git a/src/mqtt/qmqttsubscription.cpp b/src/mqtt/qmqttsubscription.cpp index 750707f..a492796 100644 --- a/src/mqtt/qmqttsubscription.cpp +++ b/src/mqtt/qmqttsubscription.cpp @@ -29,7 +29,7 @@ #include "qmqttsubscription.h" #include "qmqttsubscription_p.h" -#include <QtMqtt/QMqttClient> +#include "qmqttclient.h" QT_BEGIN_NAMESPACE diff --git a/src/mqtt/qmqttsubscription.h b/src/mqtt/qmqttsubscription.h index 054e4ea..b2f6891 100644 --- a/src/mqtt/qmqttsubscription.h +++ b/src/mqtt/qmqttsubscription.h @@ -30,10 +30,9 @@ #ifndef QMQTTSUBSCRIPTION_H #define QMQTTSUBSCRIPTION_H -#include "qmqttmessage.h" - #include <QtMqtt/qmqttglobal.h> -#include <QtMqtt/QMqttTopicFilter> +#include <QtMqtt/qmqttmessage.h> +#include <QtMqtt/qmqtttopicfilter.h> #include <QtCore/QObject> diff --git a/src/mqtt/qmqtttopicfilter.h b/src/mqtt/qmqtttopicfilter.h index 8834a9a..626cc6a 100644 --- a/src/mqtt/qmqtttopicfilter.h +++ b/src/mqtt/qmqtttopicfilter.h @@ -30,9 +30,8 @@ #ifndef QMQTTTOPICFILTER_H #define QMQTTTOPICFILTER_H -#include "qmqttglobal.h" - -#include <QtMqtt/QMqttTopicName> +#include <QtMqtt/qmqttglobal.h> +#include <QtMqtt/qmqtttopicname.h> #include <QtCore/QExplicitlySharedDataPointer> #include <QtCore/QMetaType> diff --git a/src/mqtt/qmqtttopicname.h b/src/mqtt/qmqtttopicname.h index 09898bf..00e2429 100644 --- a/src/mqtt/qmqtttopicname.h +++ b/src/mqtt/qmqtttopicname.h @@ -30,7 +30,7 @@ #ifndef QMQTTTOPICNAME_H #define QMQTTTOPICNAME_H -#include "qmqttglobal.h" +#include <QtMqtt/qmqttglobal.h> #include <QtCore/QExplicitlySharedDataPointer> #include <QtCore/QMetaType> |