From 010ab2a45c3a80e3815d8e08fa850a0dbda58df2 Mon Sep 17 00:00:00 2001 From: Jay Two Date: Wed, 11 Dec 2019 21:07:47 +0900 Subject: [PATCH] fixed for old(<5.x) gcc compiler --- QXlsx/header/xlsxchart.h | 5 +---- QXlsx/source/xlsxchart.cpp | 18 +----------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/QXlsx/header/xlsxchart.h b/QXlsx/header/xlsxchart.h index 99bcccf..6fc137e 100644 --- a/QXlsx/header/xlsxchart.h +++ b/QXlsx/header/xlsxchart.h @@ -30,7 +30,7 @@ public: CT_OfPieChart, CT_SurfaceChart, CT_Surface3DChart, CT_BubbleChart, }; - enum ChartAxisPos { None=-1, Left=0, Right, Top, Bottom }; + enum ChartAxisPos { None = (-1), Left = 0, Right, Top, Bottom }; private: friend class AbstractSheet; friend class Worksheet; @@ -41,7 +41,6 @@ private: public: ~Chart(); public: -// void addSeries(const CellRange &range, AbstractSheet* sheet = NULL); void addSeries(const CellRange &range, AbstractSheet *sheet = NULL, bool headerH = false, bool headerV = false, bool swapHeaders = false); void setChartType(ChartType type); void setChartStyle(int id); @@ -49,11 +48,9 @@ public: void setChartTitle(QString strchartTitle); void setChartLegend(Chart::ChartAxisPos legendPos, bool overlap = false); void setGridlinesEnable(bool majorGridlinesEnable = false, bool minorGridlinesEnable = false); - public: bool loadFromXmlFile(QIODevice *device); void saveToXmlFile(QIODevice *device) const; - }; QT_END_NAMESPACE_XLSX diff --git a/QXlsx/source/xlsxchart.cpp b/QXlsx/source/xlsxchart.cpp index d583241..eddcf46 100644 --- a/QXlsx/source/xlsxchart.cpp +++ b/QXlsx/source/xlsxchart.cpp @@ -22,22 +22,6 @@ ChartPrivate::ChartPrivate(Chart *q, Chart::CreateFlag flag) ChartPrivate::~ChartPrivate() { - /* - QList< QSharedPointer > seriesList; - QList< QSharedPointer > axisList; - QMap< XlsxAxis::AxisPos, QString > axisNames; - */ - // qDeleteAll( seriesList ); - // qDeleteAll( axisList ); - // qDeleteAll( axisNames ); - - /* - for (int i = 0; i < axisList.size(); ++i) - { - QSharedPointer ptr = axisList.at(i); - // ptr->deleteLater(); - } - */ } @@ -255,7 +239,7 @@ void Chart::setChartTitle(QString strchartTitle) } -void Chart::setChartLegend(QXlsx::Chart::ChartAxisPos legendPos, bool overlay) +void Chart::setChartLegend(Chart::ChartAxisPos legendPos, bool overlay) { Q_D(Chart);