diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2014-07-10 14:44:04 +0200 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2014-07-14 10:33:28 +0200 |
| commit | ca82a19397ffbd2e7d36784d6969bd3b833f6a24 (patch) | |
| tree | 49781e33073a7f7b303437c682c3fa58f85bfa42 | |
| parent | c96a250c3bd7153e4f21500e3a4cee4b0cf93c3a (diff) | |
| download | qtenginio-ca82a19397ffbd2e7d36784d6969bd3b833f6a24.tar.gz | |
Fix QDebug includes
Really we shouldn't include QDebug in a public header.
Change-Id: I69d07e641123ec860ba7d6a34f736af067e6a3ab
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| -rw-r--r-- | src/enginio_client/enginiobackendconnection.cpp | 1 | ||||
| -rw-r--r-- | src/enginio_client/enginioclient_global.h | 1 | ||||
| -rw-r--r-- | src/enginio_client/enginioclient_p.h | 3 | ||||
| -rw-r--r-- | src/enginio_client/enginioreply.cpp | 3 | ||||
| -rw-r--r-- | src/enginio_client/enginioreply.h | 1 | ||||
| -rw-r--r-- | src/enginio_client/enginioreply_p.h | 1 |
6 files changed, 8 insertions, 2 deletions
diff --git a/src/enginio_client/enginiobackendconnection.cpp b/src/enginio_client/enginiobackendconnection.cpp index f3b0b68..3e375f3 100644 --- a/src/enginio_client/enginiobackendconnection.cpp +++ b/src/enginio_client/enginiobackendconnection.cpp @@ -54,6 +54,7 @@ #include <QtCore/qstring.h> #include <QtCore/quuid.h> #include <QtNetwork/qtcpsocket.h> +#include <QtCore/qdebug.h> #define CRLF QLatin1String("\r\n") diff --git a/src/enginio_client/enginioclient_global.h b/src/enginio_client/enginioclient_global.h index 4627981..e81914a 100644 --- a/src/enginio_client/enginioclient_global.h +++ b/src/enginio_client/enginioclient_global.h @@ -43,7 +43,6 @@ #define ENGINIOCLIENT_GLOBAL_H #include <QtCore/qglobal.h> -#include <QDebug> #if defined(QT_SHARED) || !defined(QT_STATIC) # if defined(ENGINIOCLIENT_LIBRARY) diff --git a/src/enginio_client/enginioclient_p.h b/src/enginio_client/enginioclient_p.h index 41bc846..93ce864 100644 --- a/src/enginio_client/enginioclient_p.h +++ b/src/enginio_client/enginioclient_p.h @@ -63,6 +63,9 @@ #include <QtCore/qbuffer.h> #include <QtCore/qlinkedlist.h> #include <QtCore/quuid.h> +#include <QtCore/qset.h> +#include <QtCore/qlogging.h> +#include <QtCore/qdebug.h> #include <QtCore/private/qobject_p.h> diff --git a/src/enginio_client/enginioreply.cpp b/src/enginio_client/enginioreply.cpp index b4b8af6..3e5cfdd 100644 --- a/src/enginio_client/enginioreply.cpp +++ b/src/enginio_client/enginioreply.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#include <QtCore/qdebug.h> #include <QtCore/qstring.h> #include <QtCore/qjsonobject.h> #include <QtCore/qjsondocument.h> @@ -344,6 +345,7 @@ QDebug operator<<(QDebug d, const EnginioReply *reply) d << ")"; return d.space(); } +#endif // QT_NO_DEBUG_STREAM EnginioReplyState::EnginioReplyState(EnginioClientConnectionPrivate *parent, QNetworkReply *reply, EnginioReplyStatePrivate *priv) : QObject(*priv, parent->q_ptr) @@ -374,4 +376,3 @@ QJsonObject EnginioReplyState::data() const QT_END_NAMESPACE -#endif // QT_NO_DEBUG_STREAM diff --git a/src/enginio_client/enginioreply.h b/src/enginio_client/enginioreply.h index 7855e9e..bb743b2 100644 --- a/src/enginio_client/enginioreply.h +++ b/src/enginio_client/enginioreply.h @@ -103,6 +103,7 @@ private: Q_DECLARE_TYPEINFO(const EnginioReply*, Q_PRIMITIVE_TYPE); #ifndef QT_NO_DEBUG_STREAM +class QDebug; ENGINIOCLIENT_EXPORT QDebug operator<<(QDebug d, const EnginioReply *reply); #endif diff --git a/src/enginio_client/enginioreply_p.h b/src/enginio_client/enginioreply_p.h index db3b029..70199a2 100644 --- a/src/enginio_client/enginioreply_p.h +++ b/src/enginio_client/enginioreply_p.h @@ -42,6 +42,7 @@ #ifndef ENGINIOREPLY_P_H #define ENGINIOREPLY_P_H +#include <QtCore/qdebug.h> #include <QtCore/qhash.h> #include <QtCore/qstring.h> #include <QtCore/qbytearray.h> |