QT/QXlsx
1
0
Fork 0
mirror of https://github.com/QtExcel/QXlsx.git synced 2025-01-30 05:02:52 +08:00
Code Issues Projects Releases Wiki Activity

testing in qt6

Browse Source
This commit is contained in:
Jay Two 2020-12-05 22:33:38 +09:00
parent 4e09a95f51
commit fdbfeecb9c
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
QXlsx/header/xlsxworksheet_p.h
View File

@ -9,6 +9,7 @@
#include <QVector>
#include <QImage>
#include <QSharedPointer>
#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
#include <QRegularExpression>
#else

2
WebServer/context.hpp
View File

@ -5,7 +5,7 @@
#include <QVariant>
#include <QHash>
#ifdef QT_VERSION >= 0x060000 // Qt6 or higher version
#if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
#include <QtCore5Compat>
#endif

2
WebServer/main.cpp
View File

@ -7,7 +7,7 @@
#include <QVector>
#include <QList>
#ifdef QT_VERSION >= 0x060000 // Qt6 or higher version
#if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
#include <QtCore5Compat>
#endif

2
WebServer/recurse.hpp
View File

@ -17,7 +17,7 @@
#include <QTcpSocket>
#include <QVector>
#ifdef QT_VERSION >= 0x060000 // Qt6 or higher version
#if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
#include <QtCore5Compat>
#endif

18
WebServer/request.hpp
View File

@ -7,7 +7,7 @@
#include <QUrl>
#include <QUrlQuery>
#ifdef QT_VERSION >= 0x060000 // Qt6 or higher version
#if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
#include <QtCore5Compat>
#endif
@ -176,7 +176,7 @@ private:
//! match HTTP request line
//!
#ifdef QT_VERSION >= 0x060000
#if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
QRegularExpression httpRx = QRegularExpression("^(?=[A-Z]).* \\/.* HTTP\\/[0-9]\\.[0-9]\\r\\n");
#else
QRegExp httpRx = QRegExp("^(?=[A-Z]).* \\/.* HTTP\\/[0-9]\\.[0-9]\\r\\n");
@ -200,7 +200,7 @@ inline bool Request::parse(QString request)
return true;
}
#ifdef QT_VERSION >= 0x060000
#if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
auto data_list = this->data.split("\r\n");
#else
auto data_list = this->data.splitRef("\r\n");
@ -228,13 +228,13 @@ inline bool Request::parse(QString request)
{
auto first_line = entity_item.at(0).split(" ");
#ifdef QT_VERSION >= 0x060000
#if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
this->method = first_line.at(0);
#else
this->method = first_line.at(0).toString();
#endif
#ifdef QT_VERSION >= 0x060000
#if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
this->url = first_line.at(1);
#else
this->url = first_line.at(1).toString();
@ -242,7 +242,7 @@ inline bool Request::parse(QString request)
this->query.setQuery(this->url.query());
#ifdef QT_VERSION >= 0x060000
#if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
this->protocol = first_line.at(2);
#else
this->protocol = first_line.at(2).toString();
@ -251,7 +251,7 @@ inline bool Request::parse(QString request)
continue;
}
#ifdef QT_VERSION >= 0x060000
#if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
m_headers[entity_item.at(0).toLower()] = entity_item.at(1);
#else
m_headers[entity_item.at(0).toString().toLower()] = entity_item.at(1).toString();
@ -267,7 +267,7 @@ inline bool Request::parse(QString request)
if (m_headers.contains("cookie"))
{
#ifdef QT_VERSION >= 0x060000
#if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
for (const auto &cookie : m_headers["cookie"].split(";"))
#else
for (const auto &cookie : m_headers["cookie"].splitRef(";"))
@ -283,7 +283,7 @@ inline bool Request::parse(QString request)
auto value = cookie.mid(split + 1);
#ifdef QT_VERSION >= 0x060000
#if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
m_cookies[key.toLower()] = value;
#else
m_cookies[key.toString().toLower()] = value.toString();

2
WebServer/response.hpp
View File

@ -5,7 +5,7 @@
#include <QHash>
#include <QJsonDocument>
#ifdef QT_VERSION >= 0x060000 // Qt6 or higher version
#if QT_VERSION_MAJOR >= 6 // Qt6 or higher version
#include <QtCore5Compat>
#endif