From 8d03b48b102383aaba115a3f3eda090f0a195756 Mon Sep 17 00:00:00 2001
From: Elvis Stansvik <elvstone@gmail.com>
Date: Sat, 11 Apr 2015 15:45:04 +0200
Subject: [PATCH] Some header inclusion clean-ups.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 o Include what is directly used, nothing more.
 o Don't rely on transitive inclusion.
 o Order inclusions as: 1) own, 2) Qt, 3) others.
 o Order inclusions alphabetically.
 o Use forward declarations where possible.
 o Blank line between include guard and #include directives.

Tested on Qt 4.8.6 and Qt 5.4.1.

This incidentally fixes "invalid use of incomplete type ‘class
QStringList’" which I got in pack_p.cpp with Qt 4.8.6.
---
 src/msgpack.cpp          | 2 +-
 src/msgpack.h            | 6 ++++--
 src/private/pack_p.cpp   | 8 +++++++-
 src/private/pack_p.h     | 8 +++++++-
 src/private/unpack_p.cpp | 3 +++
 src/private/unpack_p.h   | 5 ++++-
 6 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/msgpack.cpp b/src/msgpack.cpp
index 0fb155d..36e011e 100644
--- a/src/msgpack.cpp
+++ b/src/msgpack.cpp
@@ -1,7 +1,7 @@
 #include "msgpack.h"
+#include "msgpack_common.h"
 #include "private/unpack_p.h"
 #include "private/pack_p.h"
-#include <QByteArray>
 
 QVariant MsgPack::unpack(const QByteArray &data)
 {
diff --git a/src/msgpack.h b/src/msgpack.h
index 5a86fae..cf4c540 100644
--- a/src/msgpack.h
+++ b/src/msgpack.h
@@ -1,10 +1,12 @@
 #ifndef MSGPACK_H
 #define MSGPACK_H
-#include <QByteArray>
-#include <QVariantList>
+
 #include "msgpack_common.h"
 #include "msgpack_export.h"
 
+#include <QByteArray>
+#include <QMetaType>
+
 namespace MsgPack
 {
     MSGPACK_EXPORT QVariant unpack(const QByteArray &data);
diff --git a/src/private/pack_p.cpp b/src/private/pack_p.cpp
index eec0f56..7e759d1 100644
--- a/src/private/pack_p.cpp
+++ b/src/private/pack_p.cpp
@@ -1,7 +1,13 @@
 #include "pack_p.h"
 #include "private/sysdep.h"
-#include <limits>
+
+#include <QByteArray>
 #include <QDebug>
+#include <QMapIterator>
+#include <QString>
+#include <QStringList>
+
+#include <limits>
 
 QHash<QMetaType::Type, MsgPackPrivate::packer_t> MsgPackPrivate::user_packers;
 bool MsgPackPrivate::compatibilityMode = false;
diff --git a/src/private/pack_p.h b/src/private/pack_p.h
index ed0d5b3..b29f971 100644
--- a/src/private/pack_p.h
+++ b/src/private/pack_p.h
@@ -1,8 +1,14 @@
 #ifndef PACK_P_H
 #define PACK_P_H
-#include <QVariant>
+
 #include "../msgpack_common.h"
 
+#include <QHash>
+#include <QMetaType>
+
+class QByteArray;
+class QString;
+
 namespace MsgPackPrivate {
 /* if wr (write) == false, packer just moves pointer forward
  *
diff --git a/src/private/unpack_p.cpp b/src/private/unpack_p.cpp
index db868b1..511bd4a 100644
--- a/src/private/unpack_p.cpp
+++ b/src/private/unpack_p.cpp
@@ -1,6 +1,9 @@
 #include "unpack_p.h"
 #include "sysdep.h"
+
+#include <QByteArray>
 #include <QDebug>
+#include <QMap>
 
 MsgPackPrivate::type_parser_f MsgPackPrivate::unpackers[32] = {
     unpack_nil,
diff --git a/src/private/unpack_p.h b/src/private/unpack_p.h
index e9cda80..ed8b323 100644
--- a/src/private/unpack_p.h
+++ b/src/private/unpack_p.h
@@ -1,8 +1,11 @@
 #ifndef MSGPACK_P_H
 #define MSGPACK_P_H
-#include <QVariant>
+
 #include "../msgpack_common.h"
 
+#include <QHash>
+#include <QVariant>
+
 namespace MsgPackPrivate
 {
 /* unpack functions: