Some header inclusion clean-ups.

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.
This commit is contained in:
Elvis Stansvik
2015-04-11 15:45:04 +02:00
parent 64c7c813ca
commit 8d03b48b10
6 changed files with 26 additions and 6 deletions

View File

@ -1,7 +1,7 @@
#include "msgpack.h" #include "msgpack.h"
#include "msgpack_common.h"
#include "private/unpack_p.h" #include "private/unpack_p.h"
#include "private/pack_p.h" #include "private/pack_p.h"
#include <QByteArray>
QVariant MsgPack::unpack(const QByteArray &data) QVariant MsgPack::unpack(const QByteArray &data)
{ {

View File

@ -1,10 +1,12 @@
#ifndef MSGPACK_H #ifndef MSGPACK_H
#define MSGPACK_H #define MSGPACK_H
#include <QByteArray>
#include <QVariantList>
#include "msgpack_common.h" #include "msgpack_common.h"
#include "msgpack_export.h" #include "msgpack_export.h"
#include <QByteArray>
#include <QMetaType>
namespace MsgPack namespace MsgPack
{ {
MSGPACK_EXPORT QVariant unpack(const QByteArray &data); MSGPACK_EXPORT QVariant unpack(const QByteArray &data);

View File

@ -1,7 +1,13 @@
#include "pack_p.h" #include "pack_p.h"
#include "private/sysdep.h" #include "private/sysdep.h"
#include <limits>
#include <QByteArray>
#include <QDebug> #include <QDebug>
#include <QMapIterator>
#include <QString>
#include <QStringList>
#include <limits>
QHash<QMetaType::Type, MsgPackPrivate::packer_t> MsgPackPrivate::user_packers; QHash<QMetaType::Type, MsgPackPrivate::packer_t> MsgPackPrivate::user_packers;
bool MsgPackPrivate::compatibilityMode = false; bool MsgPackPrivate::compatibilityMode = false;

View File

@ -1,8 +1,14 @@
#ifndef PACK_P_H #ifndef PACK_P_H
#define PACK_P_H #define PACK_P_H
#include <QVariant>
#include "../msgpack_common.h" #include "../msgpack_common.h"
#include <QHash>
#include <QMetaType>
class QByteArray;
class QString;
namespace MsgPackPrivate { namespace MsgPackPrivate {
/* if wr (write) == false, packer just moves pointer forward /* if wr (write) == false, packer just moves pointer forward
* *

View File

@ -1,6 +1,9 @@
#include "unpack_p.h" #include "unpack_p.h"
#include "sysdep.h" #include "sysdep.h"
#include <QByteArray>
#include <QDebug> #include <QDebug>
#include <QMap>
MsgPackPrivate::type_parser_f MsgPackPrivate::unpackers[32] = { MsgPackPrivate::type_parser_f MsgPackPrivate::unpackers[32] = {
unpack_nil, unpack_nil,

View File

@ -1,8 +1,11 @@
#ifndef MSGPACK_P_H #ifndef MSGPACK_P_H
#define MSGPACK_P_H #define MSGPACK_P_H
#include <QVariant>
#include "../msgpack_common.h" #include "../msgpack_common.h"
#include <QHash>
#include <QVariant>
namespace MsgPackPrivate namespace MsgPackPrivate
{ {
/* unpack functions: /* unpack functions: