Use QtCore/qcontainerfwd.h header for forward declaration containers.
This commit is contained in:
parent
cca8a687a2
commit
04d2a1c631
|
@ -28,6 +28,9 @@
|
||||||
#ifndef UTILS_H
|
#ifndef UTILS_H
|
||||||
#define UTILS_H
|
#define UTILS_H
|
||||||
|
|
||||||
|
#include <QtGlobal>
|
||||||
|
#include <QtCore/qcontainerfwd.h>
|
||||||
|
|
||||||
class QMimeType;
|
class QMimeType;
|
||||||
class QString;
|
class QString;
|
||||||
class QMimeType;
|
class QMimeType;
|
||||||
|
|
|
@ -40,6 +40,7 @@
|
||||||
#include <QLocale>
|
#include <QLocale>
|
||||||
#include <QLoggingCategory>
|
#include <QLoggingCategory>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
|
#include <QtCore/qcontainerfwd.h>
|
||||||
|
|
||||||
#include "../ifcdef.h"
|
#include "../ifcdef.h"
|
||||||
#include "../vmisc/def.h"
|
#include "../vmisc/def.h"
|
||||||
|
@ -51,9 +52,6 @@
|
||||||
|
|
||||||
class QDomElement;
|
class QDomElement;
|
||||||
class QDomNode;
|
class QDomNode;
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
|
||||||
template <typename T> class QVector;
|
|
||||||
#endif
|
|
||||||
template <typename T> class QFutureWatcher;
|
template <typename T> class QFutureWatcher;
|
||||||
|
|
||||||
Q_DECLARE_LOGGING_CATEGORY(vXML)
|
Q_DECLARE_LOGGING_CATEGORY(vXML)
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <QLocale>
|
#include <QLocale>
|
||||||
|
#include <QtCore/qcontainerfwd.h>
|
||||||
|
|
||||||
#include "qmuparser_global.h"
|
#include "qmuparser_global.h"
|
||||||
#include "qmuparserbytecode.h"
|
#include "qmuparserbytecode.h"
|
||||||
|
@ -43,8 +44,6 @@
|
||||||
#include "qmuparsertoken.h"
|
#include "qmuparsertoken.h"
|
||||||
#include "qmuparsertokenreader.h"
|
#include "qmuparsertokenreader.h"
|
||||||
|
|
||||||
template <class T> class QStack;
|
|
||||||
|
|
||||||
namespace qmu
|
namespace qmu
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -31,8 +31,7 @@
|
||||||
|
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
#include <ciso646>
|
#include <ciso646>
|
||||||
|
#include <QtCore/qcontainerfwd.h>
|
||||||
template <class Key, class T> class QMap;
|
|
||||||
|
|
||||||
enum class VarMeasurement : quint8 { English=0, Metric=1 };
|
enum class VarMeasurement : quint8 { English=0, Metric=1 };
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
#include "../drw_base.h"
|
#include "../drw_base.h"
|
||||||
|
#include <QtCore/qcontainerfwd.h>
|
||||||
|
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||||
#include "../vmisc/vtextcodec.h"
|
#include "../vmisc/vtextcodec.h"
|
||||||
|
@ -16,8 +17,6 @@
|
||||||
class QStringList;
|
class QStringList;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
template <class Key, class T> class QMap;
|
|
||||||
|
|
||||||
class DRW_TextCodec
|
class DRW_TextCodec
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -35,6 +35,7 @@
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <QGraphicsPathItem>
|
#include <QGraphicsPathItem>
|
||||||
|
#include <QtCore/qcontainerfwd.h>
|
||||||
|
|
||||||
#include "../vmisc/defglobal.h"
|
#include "../vmisc/defglobal.h"
|
||||||
|
|
||||||
|
@ -45,11 +46,6 @@ class QGraphicsRectItem;
|
||||||
class QRectF;
|
class QRectF;
|
||||||
class QGraphicsItem;
|
class QGraphicsItem;
|
||||||
class QMutex;
|
class QMutex;
|
||||||
template <typename T> class QList;
|
|
||||||
|
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
|
||||||
template <typename T> class QVector;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class VLayoutPaper
|
class VLayoutPaper
|
||||||
{
|
{
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
#include <QCoreApplication>
|
#include <QCoreApplication>
|
||||||
#include <QRect>
|
#include <QRect>
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
|
#include <QtCore/qcontainerfwd.h>
|
||||||
|
|
||||||
#include "../vmisc/def.h"
|
#include "../vmisc/def.h"
|
||||||
#include "../vlayout/vtextmanager.h"
|
#include "../vlayout/vtextmanager.h"
|
||||||
|
@ -40,11 +41,6 @@ class QGraphicsItem;
|
||||||
class QPrinter;
|
class QPrinter;
|
||||||
struct VWatermarkData;
|
struct VWatermarkData;
|
||||||
|
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
|
||||||
template <class T> class QVector;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
struct PosterData
|
struct PosterData
|
||||||
{
|
{
|
||||||
PosterData()
|
PosterData()
|
||||||
|
|
|
@ -28,6 +28,9 @@
|
||||||
#ifndef LITERALS_H
|
#ifndef LITERALS_H
|
||||||
#define LITERALS_H
|
#define LITERALS_H
|
||||||
|
|
||||||
|
#include <QtGlobal>
|
||||||
|
#include <QtCore/qcontainerfwd.h>
|
||||||
|
|
||||||
class QString;
|
class QString;
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||||
class QStringList;
|
class QStringList;
|
||||||
|
|
|
@ -35,11 +35,9 @@
|
||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QTemporaryFile>
|
#include <QTemporaryFile>
|
||||||
#include <QTextStream>
|
#include <QTextStream>
|
||||||
|
#include <QtCore/qcontainerfwd.h>
|
||||||
|
|
||||||
class QPointF;
|
class QPointF;
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
|
||||||
template <class T> class QVector;
|
|
||||||
#endif
|
|
||||||
class VSAPoint;
|
class VSAPoint;
|
||||||
class VRawSAPoint;
|
class VRawSAPoint;
|
||||||
|
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
#include <QVariant>
|
#include <QVariant>
|
||||||
#include <Qt>
|
#include <Qt>
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
|
#include <QtCore/qcontainerfwd.h>
|
||||||
|
|
||||||
#include "vpropertyexplorer_global.h"
|
#include "vpropertyexplorer_global.h"
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
|
#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
|
||||||
|
@ -44,8 +45,6 @@
|
||||||
|
|
||||||
#include "vpropertydef.h"
|
#include "vpropertydef.h"
|
||||||
|
|
||||||
template <typename T> class QList;
|
|
||||||
|
|
||||||
namespace VPE
|
namespace VPE
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
@ -25,13 +25,11 @@
|
||||||
#include <QMap>
|
#include <QMap>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
|
#include <QtCore/qcontainerfwd.h>
|
||||||
|
|
||||||
#include "vproperty.h"
|
#include "vproperty.h"
|
||||||
#include "vpropertyexplorer_global.h"
|
#include "vpropertyexplorer_global.h"
|
||||||
|
|
||||||
template <class Key, class T> class QMap;
|
|
||||||
template <typename T> class QList;
|
|
||||||
|
|
||||||
namespace VPE
|
namespace VPE
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
@ -37,16 +37,13 @@
|
||||||
#include <QJsonArray>
|
#include <QJsonArray>
|
||||||
#include <qtestcase.h>
|
#include <qtestcase.h>
|
||||||
#include <typeinfo>
|
#include <typeinfo>
|
||||||
|
#include <QtCore/qcontainerfwd.h>
|
||||||
|
|
||||||
#include "../vgeometry/vpointf.h"
|
#include "../vgeometry/vpointf.h"
|
||||||
#include "../vlayout/vsapoint.h"
|
#include "../vlayout/vsapoint.h"
|
||||||
#include "../vlayout/vrawsapoint.h"
|
#include "../vlayout/vrawsapoint.h"
|
||||||
#include "../ifc/exception/vexception.h"
|
#include "../ifc/exception/vexception.h"
|
||||||
|
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
|
||||||
template <class T> class QVector;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <ciso646>
|
#include <ciso646>
|
||||||
|
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
#include <Qt>
|
#include <Qt>
|
||||||
#include <QtDebug>
|
#include <QtDebug>
|
||||||
#include <QtMath>
|
#include <QtMath>
|
||||||
|
#include <QtCore/qcontainerfwd.h>
|
||||||
|
|
||||||
#include "../vpatterndb/calculator.h"
|
#include "../vpatterndb/calculator.h"
|
||||||
#include "../vpatterndb/vtranslatevars.h"
|
#include "../vpatterndb/vtranslatevars.h"
|
||||||
|
@ -55,8 +56,6 @@
|
||||||
#include "../vwidgets/scalesceneitems.h"
|
#include "../vwidgets/scalesceneitems.h"
|
||||||
#include "../vwidgets/global.h"
|
#include "../vwidgets/global.h"
|
||||||
|
|
||||||
template <class K, class V> class QHash;
|
|
||||||
|
|
||||||
QT_WARNING_PUSH
|
QT_WARNING_PUSH
|
||||||
QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
|
QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes")
|
||||||
QT_WARNING_DISABLE_INTEL(1418)
|
QT_WARNING_DISABLE_INTEL(1418)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user