From b2c7e554b31f15271a525dc9d6a47491876ea2f2 Mon Sep 17 00:00:00 2001 From: Debao Zhang Date: Tue, 19 Nov 2013 11:43:09 +0800 Subject: [PATCH] Code refactor: Add prefix "XlsxFormat" to some internal class --- src/xlsx/xlsxformat_p.h | 54 +++++++++++++++++----------------- src/xlsx/xlsxsharedstrings.cpp | 2 +- src/xlsx/xlsxstyles.cpp | 28 +++++++++--------- src/xlsx/xlsxstyles_p.h | 26 ++++++++-------- 4 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/xlsx/xlsxformat_p.h b/src/xlsx/xlsxformat_p.h index 0110da8..c363557 100644 --- a/src/xlsx/xlsxformat_p.h +++ b/src/xlsx/xlsxformat_p.h @@ -28,9 +28,9 @@ namespace QXlsx { -struct NumberData +struct XlsxFormatNumberData { - NumberData() : formatIndex(0), _valid(true) {} + XlsxFormatNumberData() : formatIndex(0), _valid(true) {} int formatIndex; QString formatString; @@ -38,9 +38,9 @@ struct NumberData bool _valid; }; -struct FontData +struct XlsxFormatFontData { - FontData() : + XlsxFormatFontData() : size(11), italic(false), strikeOut(false), color(QColor()), bold(false) , scirpt(Format::FontScriptNormal), underline(Format::FontUnderlineNone) , outline(false), shadow(false), name(QStringLiteral("Calibri")), family(2), charset(0) @@ -76,9 +76,9 @@ struct FontData <(this)->_key = key; - const_cast(this)->_dirty = false; - const_cast(this)->_indexValid = false;//dirty flag can not be simply cleared. + const_cast(this)->_key = key; + const_cast(this)->_dirty = false; + const_cast(this)->_indexValid = false;//dirty flag can not be simply cleared. } return _key; } @@ -108,9 +108,9 @@ private: int _index; //index in the Font list }; -struct AlignmentData +struct XlsxFormatAlignmentData { - AlignmentData() : + XlsxFormatAlignmentData() : alignH(Format::AlignHGeneral), alignV(Format::AlignBottom) , wrap(false), rotation(0), indent(0), shinkToFit(false) {} @@ -123,9 +123,9 @@ struct AlignmentData bool shinkToFit; }; -struct BorderData +struct XlsxFormatBorderData { - BorderData() : + XlsxFormatBorderData() : left(Format::BorderNone), right(Format::BorderNone), top(Format::BorderNone) ,bottom(Format::BorderNone), diagonal(Format::BorderNone) ,diagonalType(Format::DiagonalBorderNone) @@ -157,9 +157,9 @@ struct BorderData stream << bottom << bottomColor << bottomThemeColor << top << topColor << topThemeColor << diagonal << diagonalColor << diagonalThemeColor << diagonalType << left << leftColor << leftThemeColor << right << rightColor << rightThemeColor; - const_cast(this)->_key = key; - const_cast(this)->_dirty = false; - const_cast(this)->_indexValid = false; + const_cast(this)->_key = key; + const_cast(this)->_dirty = false; + const_cast(this)->_indexValid = false; } return _key; } @@ -189,8 +189,8 @@ private: int _index; //index in the border list }; -struct FillData { - FillData() : +struct XlsxFormatFillData { + XlsxFormatFillData() : pattern(Format::PatternNone) ,_dirty(true), _indexValid(false), _index(-1) {} @@ -209,9 +209,9 @@ struct FillData { stream<< bgColor << bgThemeColor << fgColor << fgThemeColor << pattern; - const_cast(this)->_key = key; - const_cast(this)->_dirty = false; - const_cast(this)->_indexValid = false; + const_cast(this)->_key = key; + const_cast(this)->_dirty = false; + const_cast(this)->_indexValid = false; } return _key; } @@ -241,8 +241,8 @@ private: int _index; //index in the border list }; -struct ProtectionData { - ProtectionData() : +struct XlsxFormatProtectionData { + XlsxFormatProtectionData() : locked(false), hidden(false) {} @@ -256,12 +256,12 @@ class FormatPrivate public: FormatPrivate(Format *p); - NumberData numberData; - FontData fontData; - AlignmentData alignmentData; - BorderData borderData; - FillData fillData; - ProtectionData protectionData; + XlsxFormatNumberData numberData; + XlsxFormatFontData fontData; + XlsxFormatAlignmentData alignmentData; + XlsxFormatBorderData borderData; + XlsxFormatFillData fillData; + XlsxFormatProtectionData protectionData; bool dirty; //The key re-generation is need. QByteArray formatKey; diff --git a/src/xlsx/xlsxsharedstrings.cpp b/src/xlsx/xlsxsharedstrings.cpp index 046746d..c08025e 100755 --- a/src/xlsx/xlsxsharedstrings.cpp +++ b/src/xlsx/xlsxsharedstrings.cpp @@ -130,7 +130,7 @@ void SharedStrings::writeRichStringPart_rPr(XmlStreamWriter &writer, Format *for if (!format) return; - FontData *font = &format->d_ptr->fontData; + XlsxFormatFontData *font = &format->d_ptr->fontData; if (font->bold) writer.writeEmptyElement(QStringLiteral("b")); diff --git a/src/xlsx/xlsxstyles.cpp b/src/xlsx/xlsxstyles.cpp index 95f399f..c6f73e7 100755 --- a/src/xlsx/xlsxstyles.cpp +++ b/src/xlsx/xlsxstyles.cpp @@ -48,7 +48,7 @@ Styles::Styles(bool createEmpty) //Add default Format addFormat(createFormat()); //Add another fill format - QSharedPointer fill = QSharedPointer(new FillData); + QSharedPointer fill = QSharedPointer(new XlsxFormatFillData); fill->pattern = Format::PatternGray125; m_fillsList.append(fill); m_fillsHash[fill->key()] = fill; @@ -138,7 +138,7 @@ void Styles::addFormat(Format *format, bool force) //Assign a new fmt Id. format->setNumFmt(m_nextCustomNumFmtId, str); - QSharedPointer fmt(new NumberData(format->d_func()->numberData)); + QSharedPointer fmt(new XlsxFormatNumberData(format->d_func()->numberData)); m_customNumFmtIdMap.insert(m_nextCustomNumFmtId, fmt); m_customNumFmtsHash.insert(str, fmt); @@ -149,7 +149,7 @@ void Styles::addFormat(Format *format, bool force) //Font if (!format->fontIndexValid()) { if (!m_fontsHash.contains(format->fontKey())) { - QSharedPointer font = QSharedPointer(new FontData(format->d_func()->fontData)); + QSharedPointer font = QSharedPointer(new XlsxFormatFontData(format->d_func()->fontData)); font->setIndex(m_fontsList.size()); //Assign proper index m_fontsList.append(font); m_fontsHash[font->key()] = font; @@ -160,7 +160,7 @@ void Styles::addFormat(Format *format, bool force) //Fill if (!format->fillIndexValid()) { if (!m_fillsHash.contains(format->fillKey())) { - QSharedPointer fill = QSharedPointer(new FillData(format->d_func()->fillData)); + QSharedPointer fill = QSharedPointer(new XlsxFormatFillData(format->d_func()->fillData)); fill->setIndex(m_fillsList.size()); //Assign proper index m_fillsList.append(fill); m_fillsHash[fill->key()] = fill; @@ -171,7 +171,7 @@ void Styles::addFormat(Format *format, bool force) //Border if (!format->borderIndexValid()) { if (!m_bordersHash.contains(format->borderKey())) { - QSharedPointer border = QSharedPointer(new BorderData(format->d_func()->borderData)); + QSharedPointer border = QSharedPointer(new XlsxFormatBorderData(format->d_func()->borderData)); border->setIndex(m_bordersList.size()); //Assign proper index m_bordersList.append(border); m_bordersHash[border->key()] = border; @@ -267,7 +267,7 @@ void Styles::writeNumFmts(XmlStreamWriter &writer) writer.writeStartElement(QStringLiteral("numFmts")); writer.writeAttribute(QStringLiteral("count"), QString::number(m_customNumFmtIdMap.count())); - QMapIterator > it(m_customNumFmtIdMap); + QMapIterator > it(m_customNumFmtIdMap); while(it.hasNext()) { it.next(); writer.writeEmptyElement(QStringLiteral("numFmt")); @@ -285,7 +285,7 @@ void Styles::writeFonts(XmlStreamWriter &writer) writer.writeStartElement(QStringLiteral("fonts")); writer.writeAttribute(QStringLiteral("count"), QString::number(m_fontsList.count())); for (int i=0; i font = m_fontsList[i]; + QSharedPointer font = m_fontsList[i]; writer.writeStartElement(QStringLiteral("font")); if (font->bold) @@ -381,13 +381,13 @@ void Styles::writeFills(XmlStreamWriter &writer) writer.writeAttribute(QStringLiteral("count"), QString::number(m_fillsList.size())); for (int i=0; i fill = m_fillsList[i]; + QSharedPointer fill = m_fillsList[i]; writeFill(writer, fill.data()); } writer.writeEndElement(); //fills } -void Styles::writeFill(XmlStreamWriter &writer, FillData *fill) +void Styles::writeFill(XmlStreamWriter &writer, XlsxFormatFillData *fill) { static QMap patternStrings; if (patternStrings.isEmpty()) { @@ -446,7 +446,7 @@ void Styles::writeBorders(XmlStreamWriter &writer) writer.writeStartElement(QStringLiteral("borders")); writer.writeAttribute(QStringLiteral("count"), QString::number(m_bordersList.count())); for (int i=0; i border = m_bordersList[i]; + QSharedPointer border = m_bordersList[i]; writer.writeStartElement(QStringLiteral("border")); if (border->diagonalType == Format::DiagonalBorderUp) { @@ -583,7 +583,7 @@ bool Styles::readNumFmts(XmlStreamReader &reader) if (reader.name() != QLatin1String("numFmt")) return false; QXmlStreamAttributes attributes = reader.attributes(); - QSharedPointer fmt (new NumberData); + QSharedPointer fmt (new XlsxFormatNumberData); fmt->formatIndex = attributes.value(QLatin1String("numFmtId")).toString().toInt(); fmt->formatString = attributes.value(QLatin1String("formatCode")).toString(); if (fmt->formatIndex >= m_nextCustomNumFmtId) @@ -606,7 +606,7 @@ bool Styles::readFonts(XmlStreamReader &reader) reader.readNextStartElement(); if (reader.name() != QLatin1String("font")) return false; - QSharedPointer font(new FontData); + QSharedPointer font(new XlsxFormatFontData); while((reader.readNextStartElement(),true)) { //read until font endelement. if (reader.tokenType() == QXmlStreamReader::StartElement) { if (reader.name() == QLatin1String("b")) { @@ -712,7 +712,7 @@ bool Styles::readFill(XmlStreamReader &reader) patternValues[QStringLiteral("lightGrid")] = Format::PatternLightGrid; } - QSharedPointer fill(new FillData); + QSharedPointer fill(new XlsxFormatFillData); while((reader.readNextStartElement(), true)) { //read until fill endelement if (reader.tokenType() == QXmlStreamReader::StartElement) { if (reader.name() == QLatin1String("patternFill")) { @@ -783,7 +783,7 @@ bool Styles::readBorders(XmlStreamReader &reader) bool Styles::readBorder(XmlStreamReader &reader) { Q_ASSERT(reader.name() == QLatin1String("border")); - QSharedPointer border(new BorderData); + QSharedPointer border(new XlsxFormatBorderData); QXmlStreamAttributes attributes = reader.attributes(); bool isUp = attributes.hasAttribute(QLatin1String("diagonalUp")); diff --git a/src/xlsx/xlsxstyles_p.h b/src/xlsx/xlsxstyles_p.h index 0269b97..841b9bd 100755 --- a/src/xlsx/xlsxstyles_p.h +++ b/src/xlsx/xlsxstyles_p.h @@ -40,10 +40,10 @@ class StylesTest; namespace QXlsx { class Format; -struct NumberData; -struct FontData; -struct FillData; -struct BorderData; +struct XlsxFormatNumberData; +struct XlsxFormatFontData; +struct XlsxFormatFillData; +struct XlsxFormatBorderData; class XmlStreamWriter; class XmlStreamReader; @@ -68,7 +68,7 @@ private: void writeNumFmts(XmlStreamWriter &writer); void writeFonts(XmlStreamWriter &writer); void writeFills(XmlStreamWriter &writer); - void writeFill(XmlStreamWriter &writer, FillData *fill); + void writeFill(XmlStreamWriter &writer, XlsxFormatFillData *fill); void writeBorders(XmlStreamWriter &writer); void writeSubBorder(XmlStreamWriter &writer, const QString &type, int style, const QColor &color, const QString &themeColor); void writeCellXfs(XmlStreamWriter &writer); @@ -88,15 +88,15 @@ private: QColor getColorByIndex(int idx); QHash m_builtinNumFmtsHash; - QMap > m_customNumFmtIdMap; - QHash > m_customNumFmtsHash; + QMap > m_customNumFmtIdMap; + QHash > m_customNumFmtsHash; int m_nextCustomNumFmtId; - QList > m_fontsList; //Keep a copy of unique fonts - QList > m_fillsList; //Keep a copy of unique fills - QList > m_bordersList; //Keep a copy of unique borders - QHash > m_fontsHash; - QHash > m_fillsHash; - QHash > m_bordersHash; + QList > m_fontsList; //Keep a copy of unique fonts + QList > m_fillsList; //Keep a copy of unique fills + QList > m_bordersList; //Keep a copy of unique borders + QHash > m_fontsHash; + QHash > m_fillsHash; + QHash > m_bordersHash; QVector m_indexedColors;