1
0
mirror of https://github.com/QtExcel/QXlsx.git synced 2025-01-16 04:42:53 +08:00

fixed for old(<5.x) gcc compiler

This commit is contained in:
Jay Two 2019-12-11 21:07:47 +09:00
parent d0b1d583a6
commit 010ab2a45c
2 changed files with 2 additions and 21 deletions

View File

@ -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

View File

@ -22,22 +22,6 @@ ChartPrivate::ChartPrivate(Chart *q, Chart::CreateFlag flag)
ChartPrivate::~ChartPrivate()
{
/*
QList< QSharedPointer<XlsxSeries> > seriesList;
QList< QSharedPointer<XlsxAxis> > axisList;
QMap< XlsxAxis::AxisPos, QString > axisNames;
*/
// qDeleteAll( seriesList );
// qDeleteAll( axisList );
// qDeleteAll( axisNames );
/*
for (int i = 0; i < axisList.size(); ++i)
{
QSharedPointer<XlsxAxis> 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);