From 17566ad3c3e1e58488feaef239f4a2dd1e624666 Mon Sep 17 00:00:00 2001 From: Jay Two Date: Thu, 21 May 2020 21:24:11 +0900 Subject: [PATCH] set cpp version and header files --- QXlsx/QXlsx.pri | 2 ++ QXlsx/source/xlsxdocument.cpp | 32 ++++++++------------------------ 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/QXlsx/QXlsx.pri b/QXlsx/QXlsx.pri index cc13bd4..b48f110 100644 --- a/QXlsx/QXlsx.pri +++ b/QXlsx/QXlsx.pri @@ -3,6 +3,8 @@ QT += core QT += gui-private +CONFIG += c++11 + # The following define makes your compiler emit warnings if you use # any feature of Qt which has been marked as deprecated (the exact warnings # depend on your compiler). Please consult the documentation of the diff --git a/QXlsx/source/xlsxdocument.cpp b/QXlsx/source/xlsxdocument.cpp index de7df52..13a95c8 100644 --- a/QXlsx/source/xlsxdocument.cpp +++ b/QXlsx/source/xlsxdocument.cpp @@ -1,27 +1,4 @@ -/**************************************************************************** -** Copyright (c) 2013-2014 Debao Zhang -** All right reserved. -** -** Permission is hereby granted, free of charge, to any person obtaining -** a copy of this software and associated documentation files (the -** "Software"), to deal in the Software without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Software, and to -** permit persons to whom the Software is furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be -** included in all copies or substantial portions of the Software. -** -** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -** NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -** LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -** OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -** WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -** -****************************************************************************/ +// xlsxdocument.cpp #include "xlsxdocument.h" #include "xlsxdocument_p.h" @@ -48,6 +25,13 @@ #include #include #include +#include + +#include +#include +#include +#include +#include /* From Wikipedia: The Open Packaging Conventions (OPC) is a