hero123457/qtmqtt
1
0
Fork 0
mirror of https://github.com/qt/qtmqtt.git synced 2026-10-25 16:16:26 +00:00
Code Issues Projects Releases Wiki Activity

Tweak the includes

Browse Source 
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>
This commit is contained in:
J-P Nurmi 2018-07-03 10:27:23 +02:00
parent d94d4f987a
commit c79f5fead7
7 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mqtt/qmqttclient.h
View File

@ -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>

2
src/mqtt/qmqttclient_p.h
View File

@ -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

5
src/mqtt/qmqttmessage.h
View File

@ -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>

2
src/mqtt/qmqttsubscription.cpp
View File

@ -29,7 +29,7 @@
#include "qmqttsubscription.h"
#include "qmqttsubscription_p.h"
#include <QtMqtt/QMqttClient>
#include "qmqttclient.h"
QT_BEGIN_NAMESPACE

5
src/mqtt/qmqttsubscription.h
View File

@ -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>

5
src/mqtt/qmqtttopicfilter.h
View File

@ -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>

2
src/mqtt/qmqtttopicname.h
View File

@ -30,7 +30,7 @@
#ifndef QMQTTTOPICNAME_H
#define QMQTTTOPICNAME_H
#include "qmqttglobal.h"
#include <QtMqtt/qmqttglobal.h>
#include <QtCore/QExplicitlySharedDataPointer>
#include <QtCore/QMetaType>