Remove unused QtGlobal header

QtExcel · Sep 2, 2024 · c643be3 · c643be3
1 parent f5d0795
commit c643be3
Show file tree

Hide file tree

Showing 52 changed files with 27 additions and 89 deletions.
diff --git a/QXlsx/header/xlsxcell.h b/QXlsx/header/xlsxcell.h
@@ -14,7 +14,6 @@
 #include <QString>
 #include <QTime>
 #include <QVariant>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/header/xlsxcell_p.h b/QXlsx/header/xlsxcell_p.h
@@ -11,7 +11,6 @@
 
 #include <QList>
 #include <QObject>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/header/xlsxcelllocation.h b/QXlsx/header/xlsxcelllocation.h
@@ -12,7 +12,6 @@
 #include <QObject>
 #include <QString>
 #include <QVector>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/header/xlsxcellrange.h b/QXlsx/header/xlsxcellrange.h
@@ -7,7 +7,6 @@
 #include "xlsxglobal.h"
 
 #include <QObject>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/header/xlsxcellreference.h b/QXlsx/header/xlsxcellreference.h
@@ -5,8 +5,6 @@
 
 #include "xlsxglobal.h"
 
-#include <QtGlobal>
-
 QT_BEGIN_NAMESPACE_XLSX
 
 const int XLSX_ROW_MAX    = 1048576;

diff --git a/QXlsx/header/xlsxchart.h b/QXlsx/header/xlsxchart.h
@@ -7,7 +7,6 @@
 
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/header/xlsxchartsheet.h b/QXlsx/header/xlsxchartsheet.h
@@ -6,7 +6,6 @@
 #include "xlsxabstractsheet.h"
 
 #include <QStringList>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/header/xlsxchartsheet_p.h b/QXlsx/header/xlsxchartsheet_p.h
@@ -7,8 +7,6 @@
 #include "xlsxchartsheet.h"
 #include "xlsxglobal.h"
 
-#include <QtGlobal>
-
 QT_BEGIN_NAMESPACE_XLSX
 
 class ChartsheetPrivate : public AbstractSheetPrivate

diff --git a/QXlsx/header/xlsxcolor_p.h b/QXlsx/header/xlsxcolor_p.h
@@ -9,7 +9,6 @@
 #include <QVariant>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/header/xlsxconditionalformatting.h b/QXlsx/header/xlsxconditionalformatting.h
@@ -13,7 +13,6 @@
 #include <QString>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 class ConditionalFormattingTest;
 

diff --git a/QXlsx/header/xlsxcontenttypes_p.h b/QXlsx/header/xlsxcontenttypes_p.h
@@ -9,7 +9,6 @@
 #include <QMap>
 #include <QString>
 #include <QStringList>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/header/xlsxdatavalidation.h b/QXlsx/header/xlsxdatavalidation.h
@@ -10,7 +10,6 @@
 #include <QString>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 class QXmlStreamReader;
 class QXmlStreamWriter;

diff --git a/QXlsx/header/xlsxdatavalidation_p.h b/QXlsx/header/xlsxdatavalidation_p.h
@@ -6,7 +6,6 @@
 #include "xlsxdatavalidation.h"
 
 #include <QSharedData>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/header/xlsxdatetype.h b/QXlsx/header/xlsxdatetype.h
@@ -11,7 +11,6 @@
 #include <QString>
 #include <QStringList>
 #include <QTime>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/header/xlsxdocument.h b/QXlsx/header/xlsxdocument.h
@@ -11,7 +11,6 @@
 #include <QImage>
 #include <QObject>
 #include <QVariant>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/header/xlsxdocument_p.h b/QXlsx/header/xlsxdocument_p.h
@@ -9,7 +9,6 @@
 #include "xlsxworkbook.h"
 
 #include <QMap>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/header/xlsxdrawing_p.h b/QXlsx/header/xlsxdrawing_p.h
@@ -8,7 +8,6 @@
 
 #include <QList>
 #include <QString>
-#include <QtGlobal>
 
 class QIODevice;
 class QXmlStreamWriter;

diff --git a/QXlsx/header/xlsxformat_p.h b/QXlsx/header/xlsxformat_p.h
@@ -7,7 +7,6 @@
 #include <QMap>
 #include <QSet>
 #include <QSharedData>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/header/xlsxglobal.h b/QXlsx/header/xlsxglobal.h
@@ -13,7 +13,6 @@
 #include <QString>
 #include <QStringList>
 #include <QVariant>
-#include <QtGlobal>
 
 #if defined(QXlsx_SHAREDLIB)
 #    if defined(QXlsx_EXPORTS)

diff --git a/QXlsx/header/xlsxtheme_p.h b/QXlsx/header/xlsxtheme_p.h
@@ -7,7 +7,6 @@
 
 #include <QIODevice>
 #include <QString>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/header/xlsxutility_p.h b/QXlsx/header/xlsxutility_p.h
@@ -14,7 +14,6 @@
 #include <QStringList>
 #include <QTime>
 #include <QVariant>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/header/xlsxworkbook.h b/QXlsx/header/xlsxworkbook.h
@@ -13,7 +13,6 @@
 #include <QImage>
 #include <QList>
 #include <QSharedPointer>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/header/xlsxworkbook_p.h b/QXlsx/header/xlsxworkbook_p.h
@@ -11,7 +11,6 @@
 
 #include <QSharedPointer>
 #include <QStringList>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/header/xlsxworksheet.h b/QXlsx/header/xlsxworksheet.h
@@ -18,7 +18,6 @@
 #include <QStringList>
 #include <QUrl>
 #include <QVariant>
-#include <QtGlobal>
 
 class WorksheetTest;
 

diff --git a/QXlsx/header/xlsxworksheet_p.h b/QXlsx/header/xlsxworksheet_p.h
@@ -227,23 +227,23 @@ class WorksheetPrivate : public AbstractSheetPrivate
 public:
     CellTable cellTable;
 
-    QMap<int, QMap<int, QString>> comments;
-    QMap<int, QMap<int, QSharedPointer<XlsxHyperlinkData>>> urlTable;
+    QHash<int, QHash<int, QString>> comments;
+    QHash<int, QHash<int, QSharedPointer<XlsxHyperlinkData>>> urlTable;
     QList<CellRange> merges;
-    QMap<int, QSharedPointer<XlsxRowInfo>> rowsInfo;
-    QMap<int, QSharedPointer<XlsxColumnInfo>> colsInfo;
-    QMap<int, QSharedPointer<XlsxColumnInfo>> colsInfoHelper;
+    QHash<int, QSharedPointer<XlsxRowInfo>> rowsInfo;
+    QHash<int, QSharedPointer<XlsxColumnInfo>> colsInfo;
+    QHash<int, QSharedPointer<XlsxColumnInfo>> colsInfoHelper;
 
     QList<DataValidation> dataValidationsList;
     QList<ConditionalFormatting> conditionalFormattingList;
 
-    QMap<int, CellFormula> sharedFormulaMap; // shared formula map
+    QHash<int, CellFormula> sharedFormulaMap; // shared formula map
 
     CellRange dimension;
 
-    mutable QMap<int, QString> row_spans;
-    QMap<int, double> row_sizes;
-    QMap<int, double> col_sizes;
+    mutable QHash<int, QString> row_spans;
+    QHash<int, double> row_sizes;
+    QHash<int, double> col_sizes;
 
     // pagesetup and print settings add by liufeijin 20181028, liufeijin
     QString PpaperSize;

diff --git a/QXlsx/header/xlsxzipwriter_p.h b/QXlsx/header/xlsxzipwriter_p.h
@@ -7,7 +7,6 @@
 
 #include <QIODevice>
 #include <QString>
-#include <QtGlobal>
 
 class QZipWriter;
 

diff --git a/QXlsx/source/xlsxabstractooxmlfile.cpp b/QXlsx/source/xlsxabstractooxmlfile.cpp
@@ -6,7 +6,6 @@
 
 #include <QBuffer>
 #include <QByteArray>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/source/xlsxabstractsheet.cpp b/QXlsx/source/xlsxabstractsheet.cpp
@@ -5,8 +5,6 @@
 #include "xlsxabstractsheet_p.h"
 #include "xlsxworkbook.h"
 
-#include <QtGlobal>
-
 QT_BEGIN_NAMESPACE_XLSX
 
 AbstractSheetPrivate::AbstractSheetPrivate(AbstractSheet *p, AbstractSheet::CreateFlag flag)

diff --git a/QXlsx/source/xlsxcell.cpp b/QXlsx/source/xlsxcell.cpp
@@ -15,7 +15,6 @@
 #include <QDateTime>
 #include <QDebug>
 #include <QTime>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/source/xlsxcellformula.cpp b/QXlsx/source/xlsxcellformula.cpp
@@ -10,7 +10,6 @@
 #include <QString>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/source/xlsxcelllocation.cpp b/QXlsx/source/xlsxcelllocation.cpp
@@ -9,7 +9,6 @@
 #include <QObject>
 #include <QString>
 #include <QVector>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/source/xlsxcellrange.cpp b/QXlsx/source/xlsxcellrange.cpp
@@ -7,7 +7,6 @@
 #include <QPoint>
 #include <QString>
 #include <QStringList>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/source/xlsxchart.cpp b/QXlsx/source/xlsxchart.cpp
@@ -10,7 +10,6 @@
 #include <QString>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/source/xlsxchartsheet.cpp b/QXlsx/source/xlsxchartsheet.cpp
@@ -12,7 +12,6 @@
 #include <QDir>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/source/xlsxconditionalformatting.cpp b/QXlsx/source/xlsxconditionalformatting.cpp
@@ -10,7 +10,6 @@
 #include <QDebug>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/source/xlsxdatavalidation.cpp b/QXlsx/source/xlsxdatavalidation.cpp
@@ -8,7 +8,6 @@
 
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/source/xlsxdatetype.cpp b/QXlsx/source/xlsxdatetype.cpp
@@ -5,8 +5,6 @@
 #include "xlsxglobal.h"
 #include "xlsxutility_p.h"
 
-#include <QtGlobal>
-
 QT_BEGIN_NAMESPACE_XLSX
 
 DateType::DateType()

diff --git a/QXlsx/source/xlsxdocpropscore.cpp b/QXlsx/source/xlsxdocpropscore.cpp
@@ -9,7 +9,6 @@
 #include <QFile>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/source/xlsxdocument.cpp b/QXlsx/source/xlsxdocument.cpp
@@ -27,7 +27,6 @@
 #include <QPointF>
 #include <QSharedPointer>
 #include <QTemporaryFile>
-#include <QtGlobal>
 
 /*
         From Wikipedia: The Open Packaging Conventions (OPC) is a

diff --git a/QXlsx/source/xlsxdrawing.cpp b/QXlsx/source/xlsxdrawing.cpp
@@ -7,7 +7,6 @@
 #include <QBuffer>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/source/xlsxdrawinganchor.cpp b/QXlsx/source/xlsxdrawinganchor.cpp
@@ -12,7 +12,6 @@
 #include <QDir>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/source/xlsxformat.cpp b/QXlsx/source/xlsxformat.cpp
@@ -8,7 +8,6 @@
 
 #include <QDataStream>
 #include <QDebug>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/source/xlsxmediafile.cpp b/QXlsx/source/xlsxmediafile.cpp
@@ -3,7 +3,6 @@
 #include "xlsxmediafile_p.h"
 
 #include <QCryptographicHash>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/source/xlsxnumformatparser.cpp b/QXlsx/source/xlsxnumformatparser.cpp
@@ -3,7 +3,6 @@
 #include "xlsxnumformatparser_p.h"
 
 #include <QString>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/source/xlsxrelationships.cpp b/QXlsx/source/xlsxrelationships.cpp
@@ -7,7 +7,6 @@
 #include <QFile>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 

diff --git a/QXlsx/source/xlsxrichstring.cpp b/QXlsx/source/xlsxrichstring.cpp
@@ -8,7 +8,6 @@
 #include <QDebug>
 #include <QTextDocument>
 #include <QTextFragment>
-#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX