Revert "Avoid QtCore import, which results in ALL Qt core headers being imported"

This reverts commit c17165b088.
2023-12-20 21:18:47 +01:00 · 2023-12-20 21:18:47 +01:00 · c79a029c2f
parent c17165b088
commit c79a029c2f
23 changed files with 10 additions and 29 deletions
--- a/Pdf4QtLibCore/sources/pdfcatalog.h
+++ b/Pdf4QtLibCore/sources/pdfcatalog.h
@ -24,6 +24,8 @@
 #include "pdfoutline.h"
 #include "pdfaction.h"

+#include <QtCore>
+
 #include <array>
 #include <vector>
 #include <utility>
--- a/Pdf4QtLibCore/sources/pdfcms.cpp
+++ b/Pdf4QtLibCore/sources/pdfcms.cpp
@ -20,10 +20,7 @@
 #include "pdfexecutionpolicy.h"
 #include "pdfdbgheap.h"

-#include <QBuffer>
 #include <QCoreApplication>
-#include <QDir>
-#include <QFile>
 #include <QReadWriteLock>

 #ifdef PDF4QT_COMPILER_CLANG
--- a/Pdf4QtLibCore/sources/pdfdocument.h
+++ b/Pdf4QtLibCore/sources/pdfdocument.h
@ -23,6 +23,7 @@
 #include "pdfcatalog.h"
 #include "pdfsecurityhandler.h"

+#include <QtCore>
 #include <QColor>
 #include <QTransform>
 #include <QDateTime>
--- a/Pdf4QtLibCore/sources/pdfdocumentbuilder.h
+++ b/Pdf4QtLibCore/sources/pdfdocumentbuilder.h
@ -23,7 +23,6 @@
 #include "pdfannotation.h"

 class QPdfWriter;
-class QBuffer;

 namespace pdf
 {
--- a/Pdf4QtLibCore/sources/pdfdocumentreader.h
+++ b/Pdf4QtLibCore/sources/pdfdocumentreader.h
@ -24,8 +24,8 @@
 #include "pdfprogress.h"
 #include "pdfxreftable.h"

+#include <QtCore>
 #include <QIODevice>
-#include <QMutex>

 namespace pdf
 {
--- a/Pdf4QtLibCore/sources/pdfdocumentwriter.cpp
+++ b/Pdf4QtLibCore/sources/pdfdocumentwriter.cpp
@ -21,7 +21,6 @@
 #include "pdfparser.h"
 #include "pdfdbgheap.h"

-#include <QBuffer>
 #include <QFile>
 #include <QSaveFile>

--- a/Pdf4QtLibCore/sources/pdffont.cpp
+++ b/Pdf4QtLibCore/sources/pdffont.cpp
@ -30,8 +30,6 @@
 #include <freetype/ftoutln.h>
 #include <freetype/t1tables.h>

-#include <QFile>
-#include <QIODevice>
 #include <QMutex>
 #include <QReadWriteLock>
 #include <QPainterPath>
--- a/Pdf4QtLibCore/sources/pdffont.h
+++ b/Pdf4QtLibCore/sources/pdffont.h
@ -23,7 +23,6 @@
 #include "pdfobject.h"

 #include <QFont>
-#include <QMutex>
 #include <QTransform>
 #include <QSharedPointer>

--- a/Pdf4QtLibCore/sources/pdffunction.cpp
+++ b/Pdf4QtLibCore/sources/pdffunction.cpp
@ -23,8 +23,6 @@
 #include "pdfutils.h"
 #include "pdfdbgheap.h"

-#include <QIODevice>
-
 #include <stack>
 #include <iterator>
 #include <type_traits>
--- a/Pdf4QtLibCore/sources/pdfglobal.h
+++ b/Pdf4QtLibCore/sources/pdfglobal.h
@ -18,8 +18,8 @@
 #ifndef PDFGLOBAL_H
 #define PDFGLOBAL_H

+#include <QtCore>
 #include <QtGlobal>
-#include <QCoreApplication>

 #include <limits>
 #include <tuple>
--- a/Pdf4QtLibCore/sources/pdficontheme.cpp
+++ b/Pdf4QtLibCore/sources/pdficontheme.cpp
@ -19,7 +19,6 @@
 #include "pdfdbgheap.h"

 #include <QCoreApplication>
-#include <QDir>

 namespace pdf
 {
--- a/Pdf4QtLibCore/sources/pdfobjectutils.h
+++ b/Pdf4QtLibCore/sources/pdfobjectutils.h
@ -20,6 +20,8 @@

 #include "pdfobject.h"

+#include <QtCore>
+
 #include <set>
 #include <vector>
 #include <atomic>
--- a/Pdf4QtLibCore/sources/pdfpage.h
+++ b/Pdf4QtLibCore/sources/pdfpage.h
@ -21,7 +21,6 @@
 #include "pdfobject.h"

 #include <QRectF>
-#include <QDateTime>

 #include <set>
 #include <optional>
--- a/Pdf4QtLibCore/sources/pdfparser.cpp
+++ b/Pdf4QtLibCore/sources/pdfparser.cpp
@ -23,7 +23,6 @@

 #include <QFile>
 #include <QThread>
-#include <QMetaEnum>

 #include <cctype>
 #include <memory>
--- a/Pdf4QtLibCore/sources/pdfparser.h
+++ b/Pdf4QtLibCore/sources/pdfparser.h
@ -23,6 +23,7 @@
 #include "pdfobject.h"
 #include "pdfflatmap.h"

+#include <QtCore>
 #include <QVariant>
 #include <QByteArray>

--- a/Pdf4QtLibCore/sources/pdfpattern.cpp
+++ b/Pdf4QtLibCore/sources/pdfpattern.cpp
@ -24,7 +24,6 @@
 #include "pdfconstants.h"
 #include "pdfdbgheap.h"

-#include <QMutex>
 #include <QPainter>

 #include <execution>
--- a/Pdf4QtLibCore/sources/pdfsecurityhandler.h
+++ b/Pdf4QtLibCore/sources/pdfsecurityhandler.h
@ -24,8 +24,6 @@
 #include <QByteArray>
 #include <QSharedPointer>

-class QRandomGenerator;
-
 #include <map>
 #include <functional>

--- a/Pdf4QtLibCore/sources/pdfsignaturehandler.cpp
+++ b/Pdf4QtLibCore/sources/pdfsignaturehandler.cpp
@ -40,13 +40,10 @@
 #include <openssl/ts.h>
 #include <openssl/tserr.h>

-#include <QDir>
-#include <QLockFile>
 #include <QMutex>
 #include <QMutexLocker>
 #include <QDataStream>
 #include <QFileInfo>
-#include <QStandardPaths>

 #include <array>
 #ifdef Q_OS_UNIX
--- a/Pdf4QtLibCore/sources/pdftextlayout.cpp
+++ b/Pdf4QtLibCore/sources/pdftextlayout.cpp
@ -20,11 +20,7 @@
 #include "pdfexecutionpolicy.h"
 #include "pdfdbgheap.h"

-#include <QIODevice>
-#include <QMutexLocker>
 #include <QPainter>
-#include <QRegularExpressionMatch>
-#include <QRegularExpressionMatchIterator>

 #include <execution>

--- a/Pdf4QtLibCore/sources/pdftextlayout.h
+++ b/Pdf4QtLibCore/sources/pdftextlayout.h
@ -25,8 +25,6 @@
 #include <QDataStream>
 #include <QPainterPath>

-class QMutex;
-
 #include <set>
 #include <compare>

--- a/Pdf4QtLibCore/sources/pdfxfaengine.cpp
+++ b/Pdf4QtLibCore/sources/pdfxfaengine.cpp
@ -21,7 +21,6 @@
 #include "pdffont.h"
 #include "pdfdbgheap.h"

-#include <QBuffer>
 #include <QDomElement>
 #include <QDomDocument>
 #include <QStringList>
--- a/Pdf4QtLibCore/sources/pdfxreftable.cpp
+++ b/Pdf4QtLibCore/sources/pdfxreftable.cpp
@ -22,7 +22,6 @@
 #include "pdfstreamfilters.h"
 #include "pdfdbgheap.h"

-#include <QIODevice>
 #include <stack>

 namespace pdf
--- a/Pdf4QtLibCore/sources/pdfxreftable.h
+++ b/Pdf4QtLibCore/sources/pdfxreftable.h
@ -21,6 +21,8 @@
 #include "pdfglobal.h"
 #include "pdfobject.h"

+#include <QtCore>
+
 #include <vector>

 namespace pdf