src/lib/VDXParser.cpp | 10 ++++----- src/lib/VSD5Parser.cpp | 10 ++++----- src/lib/VSDCharacterList.cpp | 12 ++++------- src/lib/VSDContentCollector.cpp | 20 +++++++++---------- src/lib/VSDFieldList.cpp | 10 +++------ src/lib/VSDGeometryList.cpp | 42 +++++++++++++++++++--------------------- src/lib/VSDLayerList.cpp | 6 +---- src/lib/VSDMetaData.cpp | 2 - src/lib/VSDPages.cpp | 2 - src/lib/VSDParagraphList.cpp | 14 +++++-------- src/lib/VSDParser.cpp | 16 +++++++-------- src/lib/VSDStencils.cpp | 4 +-- src/lib/VSDStyles.cpp | 4 +-- src/lib/VSDStylesCollector.cpp | 4 +-- src/lib/VSDXMLHelper.cpp | 4 +-- src/lib/VSDXMLParserBase.cpp | 22 ++++++++++---------- src/lib/VSDXParser.cpp | 4 +-- src/lib/VisioDocument.cpp | 2 - src/lib/libvisio_xml.cpp | 4 +-- 19 files changed, 91 insertions(+), 101 deletions(-)
New commits: commit 07863ce4ede0ad8752627e8e96db63bf58ca9ba7 Author: Miklos Vajna <[email protected]> Date: Wed Nov 8 09:42:51 2017 +0100 Use auto when declaring iterators and when initializing with a cast Change-Id: I5a3b4334c2cfcf462952a8a00d97abc59eda1f19 diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp index 0f07efd..f187a13 100644 --- a/src/lib/VDXParser.cpp +++ b/src/lib/VDXParser.cpp @@ -321,7 +321,7 @@ void libvisio::VDXParser::readLine(xmlTextReaderPtr reader) boost::optional<unsigned char> lineCap; boost::optional<double> rounding; - unsigned level = (unsigned)getElementDepth(reader); + auto level = (unsigned)getElementDepth(reader); int ret = 1; int tokenId = XML_TOKEN_INVALID; int tokenType = -1; @@ -389,7 +389,7 @@ void libvisio::VDXParser::readFillAndShadow(xmlTextReaderPtr reader) boost::optional<double> shadowOffsetX; boost::optional<double> shadowOffsetY; - unsigned level = (unsigned)getElementDepth(reader); + auto level = (unsigned)getElementDepth(reader); int ret = 1; int tokenId = XML_TOKEN_INVALID; int tokenType = -1; @@ -736,7 +736,7 @@ void libvisio::VDXParser::readPageProps(xmlTextReaderPtr reader) double pageScale = 1.0; double drawingScale = 1.0; - unsigned level = (unsigned)getElementDepth(reader); + auto level = (unsigned)getElementDepth(reader); int ret = 1; int tokenId = XML_TOKEN_INVALID; int tokenType = -1; @@ -814,7 +814,7 @@ void libvisio::VDXParser::readFonts(xmlTextReaderPtr reader) xmlChar *name = xmlTextReaderGetAttribute(reader, BAD_CAST("Name")); if (id && name) { - unsigned idx = (unsigned)xmlStringToLong(id); + auto idx = (unsigned)xmlStringToLong(id); librevenge::RVNGBinaryData textStream(name, xmlStrlen(name)); m_fonts[idx] = VSDName(textStream, libvisio::VSD_TEXT_UTF8); } @@ -837,7 +837,7 @@ void libvisio::VDXParser::readTextBlock(xmlTextReaderPtr reader) double defaultTabStop = 0.0; unsigned char textDirection = 0; - unsigned level = (unsigned)getElementDepth(reader); + auto level = (unsigned)getElementDepth(reader); int ret = 1; int tokenId = XML_TOKEN_INVALID; int tokenType = -1; diff --git a/src/lib/VSD5Parser.cpp b/src/lib/VSD5Parser.cpp index de5f85b..4caa901 100644 --- a/src/lib/VSD5Parser.cpp +++ b/src/lib/VSD5Parser.cpp @@ -380,11 +380,11 @@ void libvisio::VSD5Parser::readShape(librevenge::RVNGInputStream *input) m_currentShapeID = m_header.id; m_currentShapeLevel = m_header.level; unsigned parent = 0; - unsigned masterPage = MINUS_ONE; - unsigned masterShape = MINUS_ONE; - unsigned lineStyle = MINUS_ONE; - unsigned fillStyle = MINUS_ONE; - unsigned textStyle = MINUS_ONE; + auto masterPage = MINUS_ONE; + auto masterShape = MINUS_ONE; + auto lineStyle = MINUS_ONE; + auto fillStyle = MINUS_ONE; + auto textStyle = MINUS_ONE; try { diff --git a/src/lib/VSDCharacterList.cpp b/src/lib/VSDCharacterList.cpp index 3961bd5..ae702ef 100644 --- a/src/lib/VSDCharacterList.cpp +++ b/src/lib/VSDCharacterList.cpp @@ -82,16 +82,14 @@ libvisio::VSDCharacterList::VSDCharacterList(const libvisio::VSDCharacterList &c m_elements(), m_elementsOrder(charList.m_elementsOrder) { - std::map<unsigned, VSDCharacterListElement *>::const_iterator iter = charList.m_elements.begin(); - for (; iter != charList.m_elements.end(); ++iter) + for (auto iter = charList.m_elements.begin(); iter != charList.m_elements.end(); ++iter) m_elements[iter->first] = iter->second->clone(); } libvisio::VSDCharacterList &libvisio::VSDCharacterList::operator=(const libvisio::VSDCharacterList &charList) { clear(); - std::map<unsigned, VSDCharacterListElement *>::const_iterator iter = charList.m_elements.begin(); - for (; iter != charList.m_elements.end(); ++iter) + for (auto iter = charList.m_elements.begin(); iter != charList.m_elements.end(); ++iter) m_elements[iter->first] = iter->second->clone(); m_elementsOrder = charList.m_elementsOrder; return *this; @@ -109,7 +107,7 @@ void libvisio::VSDCharacterList::addCharIX(unsigned id, unsigned level, unsigned const boost::optional<bool> &allcaps, const boost::optional<bool> &initcaps, const boost::optional<bool> &smallcaps, const boost::optional<bool> &superscript, const boost::optional<bool> &subscript, const boost::optional<double> &scaleWidth) { - VSDCharIX *tmpElement = dynamic_cast<VSDCharIX *>(m_elements[id]); + auto *tmpElement = dynamic_cast<VSDCharIX *>(m_elements[id]); if (!tmpElement) { if (m_elements[id]) @@ -132,7 +130,7 @@ void libvisio::VSDCharacterList::addCharIX(unsigned id, unsigned level, const VS unsigned libvisio::VSDCharacterList::getCharCount(unsigned id) const { - std::map<unsigned, VSDCharacterListElement *>::const_iterator iter = m_elements.find(id); + auto iter = m_elements.find(id); if (iter != m_elements.end() && iter->second) return iter->second->getCharCount(); else @@ -141,7 +139,7 @@ unsigned libvisio::VSDCharacterList::getCharCount(unsigned id) const void libvisio::VSDCharacterList::setCharCount(unsigned id, unsigned charCount) { - std::map<unsigned, VSDCharacterListElement *>::iterator iter = m_elements.find(id); + auto iter = m_elements.find(id); if (iter != m_elements.end() && iter->second) iter->second->setCharCount(charCount); } diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp index 2ce80e9..87e0306 100644 --- a/src/lib/VSDContentCollector.cpp +++ b/src/lib/VSDContentCollector.cpp @@ -1277,7 +1277,7 @@ void libvisio::VSDContentCollector::_flushCurrentPage() std::stack<std::pair<unsigned, VSDOutputElementList> > groupTextStack; for (unsigned int &iterList : *m_pageShapeOrder) { - std::map<unsigned, unsigned>::iterator iterGroup = m_groupMemberships->find(iterList); + auto iterGroup = m_groupMemberships->find(iterList); if (iterGroup == m_groupMemberships->end()) { while (!groupTextStack.empty()) @@ -2220,7 +2220,7 @@ void libvisio::VSDContentCollector::collectNURBSTo(unsigned id, unsigned level, } // Get stencil geometry so as to find stencil NURBS data ID - std::map<unsigned, VSDGeometryList>::const_iterator cstiter = m_stencilShape->m_geometries.find(m_currentGeometryCount-1); + auto cstiter = m_stencilShape->m_geometries.find(m_currentGeometryCount-1); VSDGeometryListElement *element = nullptr; if (cstiter == m_stencilShape->m_geometries.end()) { @@ -2300,7 +2300,7 @@ void libvisio::VSDContentCollector::collectPolylineTo(unsigned id, unsigned leve } // Get stencil geometry so as to find stencil polyline data ID - std::map<unsigned, VSDGeometryList>::const_iterator cstiter = m_stencilShape->m_geometries.find(m_currentGeometryCount-1); + auto cstiter = m_stencilShape->m_geometries.find(m_currentGeometryCount-1); VSDGeometryListElement *element = nullptr; if (cstiter == m_stencilShape->m_geometries.end()) { @@ -2401,7 +2401,7 @@ void libvisio::VSDContentCollector::transformPoint(double &x, double &y, XForm * while (true && m_groupXForms) { - std::map<unsigned, XForm>::iterator iterX = m_groupXForms->find(shapeId); + auto iterX = m_groupXForms->find(shapeId); if (iterX != m_groupXForms->end()) { XForm xform = iterX->second; @@ -2412,7 +2412,7 @@ void libvisio::VSDContentCollector::transformPoint(double &x, double &y, XForm * bool shapeFound = false; if (m_groupMemberships != m_groupMembershipsSequence.end()) { - std::map<unsigned, unsigned>::iterator iter = m_groupMemberships->find(shapeId); + auto iter = m_groupMemberships->find(shapeId); if (iter != m_groupMemberships->end() && shapeId != iter->second) { shapeId = iter->second; @@ -2459,7 +2459,7 @@ void libvisio::VSDContentCollector::transformFlips(bool &flipX, bool &flipY) while (true && m_groupXForms) { - std::map<unsigned, XForm>::iterator iterX = m_groupXForms->find(shapeId); + auto iterX = m_groupXForms->find(shapeId); if (iterX != m_groupXForms->end()) { XForm xform = iterX->second; @@ -2473,7 +2473,7 @@ void libvisio::VSDContentCollector::transformFlips(bool &flipX, bool &flipY) bool shapeFound = false; if (m_groupMemberships != m_groupMembershipsSequence.end()) { - std::map<unsigned, unsigned>::iterator iter = m_groupMemberships->find(shapeId); + auto iter = m_groupMemberships->find(shapeId); if (iter != m_groupMemberships->end() && shapeId != iter->second) { shapeId = iter->second; @@ -2747,7 +2747,7 @@ void libvisio::VSDContentCollector::collectTabsDataList(unsigned level, const st _handleLevelChange(level); m_tabSets.clear(); - for (std::map<unsigned, VSDTabSet>::const_iterator iter = tabSets.begin(); iter != tabSets.end(); ++iter) + for (auto iter = tabSets.begin(); iter != tabSets.end(); ++iter) if (tabSets.begin() == iter || iter->second.m_numChars) m_tabSets.push_back(iter->second); } @@ -3693,7 +3693,7 @@ void libvisio::VSDContentCollector::appendCharacters(librevenge::RVNGString &tex } if (U_SUCCESS(status) && conv) { - const char *src = (const char *)&characters[0]; + const auto *src = (const char *)&characters[0]; const char *srcLimit = (const char *)src + characters.size(); while (src < srcLimit) { @@ -3719,7 +3719,7 @@ void libvisio::VSDContentCollector::appendCharacters(librevenge::RVNGString &tex if (U_SUCCESS(status) && conv) { - const char *src = (const char *)&characters[0]; + const auto *src = (const char *)&characters[0]; const char *srcLimit = (const char *)src + characters.size(); while (src < srcLimit) { diff --git a/src/lib/VSDFieldList.cpp b/src/lib/VSDFieldList.cpp index 13b540f..530bb20 100644 --- a/src/lib/VSDFieldList.cpp +++ b/src/lib/VSDFieldList.cpp @@ -23,7 +23,7 @@ libvisio::VSDFieldListElement *libvisio::VSDTextField::clone() librevenge::RVNGString libvisio::VSDTextField::getString(const std::map<unsigned, librevenge::RVNGString> &strVec) { - std::map<unsigned, librevenge::RVNGString>::const_iterator iter = strVec.find(m_nameId); + auto iter = strVec.find(m_nameId); if (iter != strVec.end()) return iter->second; else @@ -52,7 +52,7 @@ librevenge::RVNGString libvisio::VSDNumericField::datetimeToString(const char *f { librevenge::RVNGString result; char buffer[MAX_BUFFER]; - time_t timer = (time_t)(86400 * datetime - 2209161600.0); + auto timer = (time_t)(86400 * datetime - 2209161600.0); const struct tm *const time = gmtime(&timer); if (time) { @@ -176,8 +176,7 @@ libvisio::VSDFieldList::VSDFieldList(const libvisio::VSDFieldList &fieldList) : m_id(fieldList.m_id), m_level(fieldList.m_level) { - std::map<unsigned, VSDFieldListElement *>::const_iterator iter = fieldList.m_elements.begin(); - for (; iter != fieldList.m_elements.end(); ++iter) + for (auto iter = fieldList.m_elements.begin(); iter != fieldList.m_elements.end(); ++iter) m_elements[iter->first] = iter->second->clone(); } @@ -186,8 +185,7 @@ libvisio::VSDFieldList &libvisio::VSDFieldList::operator=(const libvisio::VSDFie if (this != &fieldList) { clear(); - std::map<unsigned, VSDFieldListElement *>::const_iterator iter = fieldList.m_elements.begin(); - for (; iter != fieldList.m_elements.end(); ++iter) + for (auto iter = fieldList.m_elements.begin(); iter != fieldList.m_elements.end(); ++iter) m_elements[iter->first] = iter->second->clone(); m_elementsOrder = fieldList.m_elementsOrder; m_id = fieldList.m_id; diff --git a/src/lib/VSDGeometryList.cpp b/src/lib/VSDGeometryList.cpp index f62ed24..49b2a70 100644 --- a/src/lib/VSDGeometryList.cpp +++ b/src/lib/VSDGeometryList.cpp @@ -573,16 +573,14 @@ libvisio::VSDGeometryList::VSDGeometryList(const VSDGeometryList &geomList) : m_elements(), m_elementsOrder(geomList.m_elementsOrder) { - std::map<unsigned, VSDGeometryListElement *>::const_iterator iter = geomList.m_elements.begin(); - for (; iter != geomList.m_elements.end(); ++iter) + for (auto iter = geomList.m_elements.begin(); iter != geomList.m_elements.end(); ++iter) m_elements[iter->first] = iter->second->clone(); } libvisio::VSDGeometryList &libvisio::VSDGeometryList::operator=(const VSDGeometryList &geomList) { clear(); - std::map<unsigned, VSDGeometryListElement *>::const_iterator iter = geomList.m_elements.begin(); - for (; iter != geomList.m_elements.end(); ++iter) + for (auto iter = geomList.m_elements.begin(); iter != geomList.m_elements.end(); ++iter) m_elements[iter->first] = iter->second->clone(); m_elementsOrder = geomList.m_elementsOrder; return *this; @@ -596,7 +594,7 @@ libvisio::VSDGeometryList::~VSDGeometryList() void libvisio::VSDGeometryList::addGeometry(unsigned id, unsigned level, const boost::optional<bool> &noFill, const boost::optional<bool> &noLine, const boost::optional<bool> &noShow) { - VSDGeometry *tmpElement = dynamic_cast<VSDGeometry *>(m_elements[id]); + auto *tmpElement = dynamic_cast<VSDGeometry *>(m_elements[id]); if (!tmpElement) { clearElement(id); @@ -619,7 +617,7 @@ void libvisio::VSDGeometryList::addEmpty(unsigned id, unsigned level) void libvisio::VSDGeometryList::addMoveTo(unsigned id, unsigned level, const boost::optional<double> &x, const boost::optional<double> &y) { - VSDMoveTo *tmpElement = dynamic_cast<VSDMoveTo *>(m_elements[id]); + auto *tmpElement = dynamic_cast<VSDMoveTo *>(m_elements[id]); if (!tmpElement) { clearElement(id); @@ -634,7 +632,7 @@ void libvisio::VSDGeometryList::addMoveTo(unsigned id, unsigned level, const boo void libvisio::VSDGeometryList::addLineTo(unsigned id, unsigned level, const boost::optional<double> &x, const boost::optional<double> &y) { - VSDLineTo *tmpElement = dynamic_cast<VSDLineTo *>(m_elements[id]); + auto *tmpElement = dynamic_cast<VSDLineTo *>(m_elements[id]); if (!tmpElement) { clearElement(id); @@ -650,7 +648,7 @@ void libvisio::VSDGeometryList::addLineTo(unsigned id, unsigned level, const boo void libvisio::VSDGeometryList::addArcTo(unsigned id, unsigned level, const boost::optional<double> &x2, const boost::optional<double> &y2, const boost::optional<double> &bow) { - VSDArcTo *tmpElement = dynamic_cast<VSDArcTo *>(m_elements[id]); + auto *tmpElement = dynamic_cast<VSDArcTo *>(m_elements[id]); if (!tmpElement) { clearElement(id); @@ -681,7 +679,7 @@ void libvisio::VSDGeometryList::addNURBSTo(unsigned id, unsigned level, const bo const boost::optional<double> &knot, const boost::optional<double> &knotPrev, const boost::optional<double> &weight, const boost::optional<double> &weightPrev, const boost::optional<NURBSData> &data) { - VSDNURBSTo3 *tmpElement = dynamic_cast<VSDNURBSTo3 *>(m_elements[id]); + auto *tmpElement = dynamic_cast<VSDNURBSTo3 *>(m_elements[id]); if (!tmpElement) { clearElement(id); @@ -714,7 +712,7 @@ void libvisio::VSDGeometryList::addPolylineTo(unsigned id, unsigned level, doubl void libvisio::VSDGeometryList::addPolylineTo(unsigned id, unsigned level, boost::optional<double> &x, boost::optional<double> &y, boost::optional<PolylineData> &data) { - VSDPolylineTo3 *tmpElement = dynamic_cast<VSDPolylineTo3 *>(m_elements[id]); + auto *tmpElement = dynamic_cast<VSDPolylineTo3 *>(m_elements[id]); if (!tmpElement) { clearElement(id); @@ -732,7 +730,7 @@ void libvisio::VSDGeometryList::addEllipse(unsigned id, unsigned level, const bo const boost::optional<double> &cy,const boost::optional<double> &xleft, const boost::optional<double> &yleft, const boost::optional<double> &xtop, const boost::optional<double> &ytop) { - VSDEllipse *tmpElement = dynamic_cast<VSDEllipse *>(m_elements[id]); + auto *tmpElement = dynamic_cast<VSDEllipse *>(m_elements[id]); if (!tmpElement) { clearElement(id); @@ -753,7 +751,7 @@ void libvisio::VSDGeometryList::addEllipticalArcTo(unsigned id, unsigned level, const boost::optional<double> &y3, const boost::optional<double> &x2, const boost::optional<double> &y2, const boost::optional<double> &angle, const boost::optional<double> &ecc) { - VSDEllipticalArcTo *tmpElement = dynamic_cast<VSDEllipticalArcTo *>(m_elements[id]); + auto *tmpElement = dynamic_cast<VSDEllipticalArcTo *>(m_elements[id]); if (!tmpElement) { clearElement(id); @@ -774,7 +772,7 @@ void libvisio::VSDGeometryList::addSplineStart(unsigned id, unsigned level, cons const boost::optional<double> &y, const boost::optional<double> &secondKnot, const boost::optional<double> &firstKnot, const boost::optional<double> &lastKnot, const boost::optional<unsigned> °ree) { - VSDSplineStart *tmpElement = dynamic_cast<VSDSplineStart *>(m_elements[id]); + auto *tmpElement = dynamic_cast<VSDSplineStart *>(m_elements[id]); if (!tmpElement) { clearElement(id); @@ -794,7 +792,7 @@ void libvisio::VSDGeometryList::addSplineStart(unsigned id, unsigned level, cons void libvisio::VSDGeometryList::addSplineKnot(unsigned id, unsigned level, const boost::optional<double> &x, const boost::optional<double> &y, const boost::optional<double> &knot) { - VSDSplineKnot *tmpElement = dynamic_cast<VSDSplineKnot *>(m_elements[id]); + auto *tmpElement = dynamic_cast<VSDSplineKnot *>(m_elements[id]); if (!tmpElement) { clearElement(id); @@ -811,7 +809,7 @@ void libvisio::VSDGeometryList::addSplineKnot(unsigned id, unsigned level, const void libvisio::VSDGeometryList::addInfiniteLine(unsigned id, unsigned level, const boost::optional<double> &x1, const boost::optional<double> &y1, const boost::optional<double> &x2, const boost::optional<double> &y2) { - VSDInfiniteLine *tmpElement = dynamic_cast<VSDInfiniteLine *>(m_elements[id]); + auto *tmpElement = dynamic_cast<VSDInfiniteLine *>(m_elements[id]); if (!tmpElement) { clearElement(id); @@ -830,7 +828,7 @@ void libvisio::VSDGeometryList::addRelCubBezTo(unsigned id, unsigned level, cons const boost::optional<double> &y, const boost::optional<double> &a, const boost::optional<double> &b, const boost::optional<double> &c, const boost::optional<double> &d) { - VSDRelCubBezTo *tmpElement = dynamic_cast<VSDRelCubBezTo *>(m_elements[id]); + auto *tmpElement = dynamic_cast<VSDRelCubBezTo *>(m_elements[id]); if (!tmpElement) { clearElement(id); @@ -851,7 +849,7 @@ void libvisio::VSDGeometryList::addRelEllipticalArcTo(unsigned id, unsigned leve const boost::optional<double> &y3, const boost::optional<double> &x2, const boost::optional<double> &y2, const boost::optional<double> &angle, const boost::optional<double> &ecc) { - VSDRelEllipticalArcTo *tmpElement = dynamic_cast<VSDRelEllipticalArcTo *>(m_elements[id]); + auto *tmpElement = dynamic_cast<VSDRelEllipticalArcTo *>(m_elements[id]); if (!tmpElement) { clearElement(id); @@ -870,7 +868,7 @@ void libvisio::VSDGeometryList::addRelEllipticalArcTo(unsigned id, unsigned leve void libvisio::VSDGeometryList::addRelMoveTo(unsigned id, unsigned level, const boost::optional<double> &x, const boost::optional<double> &y) { - VSDRelMoveTo *tmpElement = dynamic_cast<VSDRelMoveTo *>(m_elements[id]); + auto *tmpElement = dynamic_cast<VSDRelMoveTo *>(m_elements[id]); if (!tmpElement) { clearElement(id); @@ -885,7 +883,7 @@ void libvisio::VSDGeometryList::addRelMoveTo(unsigned id, unsigned level, const void libvisio::VSDGeometryList::addRelLineTo(unsigned id, unsigned level, const boost::optional<double> &x, const boost::optional<double> &y) { - VSDRelLineTo *tmpElement = dynamic_cast<VSDRelLineTo *>(m_elements[id]); + auto *tmpElement = dynamic_cast<VSDRelLineTo *>(m_elements[id]); if (!tmpElement) { clearElement(id); @@ -900,7 +898,7 @@ void libvisio::VSDGeometryList::addRelLineTo(unsigned id, unsigned level, const void libvisio::VSDGeometryList::addRelQuadBezTo(unsigned id, unsigned level, const boost::optional<double> &x, const boost::optional<double> &y, const boost::optional<double> &a, const boost::optional<double> &b) { - VSDRelQuadBezTo *tmpElement = dynamic_cast<VSDRelQuadBezTo *>(m_elements[id]); + auto *tmpElement = dynamic_cast<VSDRelQuadBezTo *>(m_elements[id]); if (!tmpElement) { clearElement(id); @@ -967,7 +965,7 @@ libvisio::VSDGeometryListElement *libvisio::VSDGeometryList::getElement(unsigned if (m_elementsOrder.size() > index) index = m_elementsOrder[index]; - std::map<unsigned, VSDGeometryListElement *>::const_iterator iter = m_elements.find(index); + auto iter = m_elements.find(index); if (iter != m_elements.end()) return iter->second; else @@ -976,7 +974,7 @@ libvisio::VSDGeometryListElement *libvisio::VSDGeometryList::getElement(unsigned void libvisio::VSDGeometryList::clearElement(unsigned id) { - std::map<unsigned, VSDGeometryListElement *>::iterator iter = m_elements.find(id); + auto iter = m_elements.find(id); if (m_elements.end() != iter) { if (iter->second) diff --git a/src/lib/VSDLayerList.cpp b/src/lib/VSDLayerList.cpp index e8aad03..43fc8d6 100644 --- a/src/lib/VSDLayerList.cpp +++ b/src/lib/VSDLayerList.cpp @@ -35,8 +35,7 @@ libvisio::VSDLayerList::VSDLayerList() : libvisio::VSDLayerList::VSDLayerList(const libvisio::VSDLayerList &layerList) : m_elements() { - std::map<unsigned, VSDLayer>::const_iterator iter = layerList.m_elements.begin(); - for (; iter != layerList.m_elements.end(); ++iter) + for (auto iter = layerList.m_elements.begin(); iter != layerList.m_elements.end(); ++iter) m_elements[iter->first] = iter->second; } @@ -45,8 +44,7 @@ libvisio::VSDLayerList &libvisio::VSDLayerList::operator=(const libvisio::VSDLay if (this != &layerList) { clear(); - std::map<unsigned, VSDLayer>::const_iterator iter = layerList.m_elements.begin(); - for (; iter != layerList.m_elements.end(); ++iter) + for (auto iter = layerList.m_elements.begin(); iter != layerList.m_elements.end(); ++iter) m_elements[iter->first] = iter->second; } return *this; diff --git a/src/lib/VSDMetaData.cpp b/src/lib/VSDMetaData.cpp index af10ed5..c200b5f 100644 --- a/src/lib/VSDMetaData.cpp +++ b/src/lib/VSDMetaData.cpp @@ -277,7 +277,7 @@ librevenge::RVNGString libvisio::VSDMetaData::readCodePageString(librevenge::RVN if (U_SUCCESS(status) && conv) { assert(!characters.empty()); - const char *src = (const char *)&characters[0]; + const auto *src = (const char *)&characters[0]; const char *srcLimit = (const char *)src + characters.size(); while (src < srcLimit) { diff --git a/src/lib/VSDPages.cpp b/src/lib/VSDPages.cpp index a0294ad..335dd69 100644 --- a/src/lib/VSDPages.cpp +++ b/src/lib/VSDPages.cpp @@ -118,7 +118,7 @@ void libvisio::VSDPages::_drawWithBackground(librevenge::RVNGDrawingInterface *p if (page.m_backgroundPageID != MINUS_ONE) { - std::map<unsigned, libvisio::VSDPage>::iterator iter = m_backgroundPages.find(page.m_backgroundPageID); + auto iter = m_backgroundPages.find(page.m_backgroundPageID); if (iter != m_backgroundPages.end()) _drawWithBackground(painter, iter->second); } diff --git a/src/lib/VSDParagraphList.cpp b/src/lib/VSDParagraphList.cpp index cfb70b1..f279bb8 100644 --- a/src/lib/VSDParagraphList.cpp +++ b/src/lib/VSDParagraphList.cpp @@ -83,16 +83,14 @@ libvisio::VSDParagraphList::VSDParagraphList(const libvisio::VSDParagraphList &p m_elements(), m_elementsOrder(paraList.m_elementsOrder) { - std::map<unsigned, VSDParagraphListElement *>::const_iterator iter = paraList.m_elements.begin(); - for (; iter != paraList.m_elements.end(); ++iter) + for (auto iter = paraList.m_elements.begin(); iter != paraList.m_elements.end(); ++iter) m_elements[iter->first] = iter->second->clone(); } libvisio::VSDParagraphList &libvisio::VSDParagraphList::operator=(const libvisio::VSDParagraphList ¶List) { clear(); - std::map<unsigned, VSDParagraphListElement *>::const_iterator iter = paraList.m_elements.begin(); - for (; iter != paraList.m_elements.end(); ++iter) + for (auto iter = paraList.m_elements.begin(); iter != paraList.m_elements.end(); ++iter) m_elements[iter->first] = iter->second->clone(); m_elementsOrder = paraList.m_elementsOrder; return *this; @@ -111,10 +109,10 @@ void libvisio::VSDParagraphList::addParaIX(unsigned id, unsigned level, unsigned const boost::optional<VSDName> &bulletFont, const boost::optional<double> &bulletFontSize, const boost::optional<double> &textPosAfterBullet, const boost::optional<unsigned> &flags) { - VSDParaIX *tmpElement = dynamic_cast<VSDParaIX *>(m_elements[id]); + auto *tmpElement = dynamic_cast<VSDParaIX *>(m_elements[id]); if (!tmpElement) { - std::map<unsigned, VSDParagraphListElement *>::iterator iter = m_elements.find(id); + auto iter = m_elements.find(id); if (m_elements.end() != iter) { if (iter->second) @@ -142,7 +140,7 @@ void libvisio::VSDParagraphList::addParaIX(unsigned id, unsigned level, const VS unsigned libvisio::VSDParagraphList::getCharCount(unsigned id) const { - std::map<unsigned, VSDParagraphListElement *>::const_iterator iter = m_elements.find(id); + auto iter = m_elements.find(id); if (iter != m_elements.end() && iter->second) return iter->second->getCharCount(); else @@ -151,7 +149,7 @@ unsigned libvisio::VSDParagraphList::getCharCount(unsigned id) const void libvisio::VSDParagraphList::setCharCount(unsigned id, unsigned charCount) { - std::map<unsigned, VSDParagraphListElement *>::iterator iter = m_elements.find(id); + auto iter = m_elements.find(id); if (iter != m_elements.end() && iter->second) iter->second->setCharCount(charCount); } diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp index 7ec88ae..6bf380a 100644 --- a/src/lib/VSDParser.cpp +++ b/src/lib/VSDParser.cpp @@ -41,7 +41,7 @@ void libvisio::VSDParser::_nameFromId(VSDName &name, unsigned id, unsigned level std::map<unsigned, std::map<unsigned, VSDName> >::const_iterator iter1 = m_namesMapMap.find(level); if (iter1 != m_namesMapMap.end()) { - std::map<unsigned, VSDName>::const_iterator iter = iter1->second.find(id); + auto iter = iter1->second.find(id); if (iter != iter1->second.end()) name = iter->second; } @@ -1283,11 +1283,11 @@ void libvisio::VSDParser::readShape(librevenge::RVNGInputStream *input) m_currentShapeID = m_header.id; m_currentShapeLevel = m_header.level; unsigned parent = 0; - unsigned masterPage = MINUS_ONE; - unsigned masterShape = MINUS_ONE; - unsigned lineStyle = MINUS_ONE; - unsigned fillStyle = MINUS_ONE; - unsigned textStyle = MINUS_ONE; + auto masterPage = MINUS_ONE; + auto masterShape = MINUS_ONE; + auto lineStyle = MINUS_ONE; + auto fillStyle = MINUS_ONE; + auto textStyle = MINUS_ONE; try { @@ -1771,14 +1771,14 @@ void libvisio::VSDParser::readFontIX(librevenge::RVNGInputStream *input) { long tmpAdjust = input->tell(); input->seek(2, librevenge::RVNG_SEEK_CUR); - unsigned char codePage = (unsigned char)(getUInt(input) & 0xff); + auto codePage = (unsigned char)(getUInt(input) & 0xff); tmpAdjust -= input->tell(); std::string fontName; for (long i = 0; i < (long)(m_header.dataLength + tmpAdjust); i++) { - char curchar = (char)readU8(input); + auto curchar = (char)readU8(input); if (curchar == 0) break; fontName.append(1, curchar); diff --git a/src/lib/VSDStencils.cpp b/src/lib/VSDStencils.cpp index a9d5bbd..91865bd 100644 --- a/src/lib/VSDStencils.cpp +++ b/src/lib/VSDStencils.cpp @@ -163,7 +163,7 @@ void libvisio::VSDStencil::setFirstShape(unsigned id) const libvisio::VSDShape *libvisio::VSDStencil::getStencilShape(unsigned id) const { - std::map<unsigned, VSDShape>::const_iterator iter = m_shapes.find(id); + auto iter = m_shapes.find(id); if (iter != m_shapes.end()) return &(iter->second); else @@ -188,7 +188,7 @@ void libvisio::VSDStencils::addStencil(unsigned idx, const libvisio::VSDStencil const libvisio::VSDStencil *libvisio::VSDStencils::getStencil(unsigned idx) const { - std::map<unsigned, VSDStencil>::const_iterator iter = m_stencils.find(idx); + auto iter = m_stencils.find(idx); if (iter != m_stencils.end()) return &(iter->second); else diff --git a/src/lib/VSDStyles.cpp b/src/lib/VSDStyles.cpp index 3b2cf80..cc87a68 100644 --- a/src/lib/VSDStyles.cpp +++ b/src/lib/VSDStyles.cpp @@ -29,7 +29,7 @@ T getOptionalStyle(const std::map<unsigned, unsigned> &styleMasters, const std:: styleIdStack.push(styleIndex); while (true) { - std::map<unsigned, unsigned>::const_iterator iter = styleMasters.find(styleIdStack.top()); + auto iter = styleMasters.find(styleIdStack.top()); if (iter != styleMasters.end() && iter->second != MINUS_ONE) { if (foundStyles.insert(iter->second).second) @@ -42,7 +42,7 @@ T getOptionalStyle(const std::map<unsigned, unsigned> &styleMasters, const std:: } while (!styleIdStack.empty()) { - typename std::map<unsigned, T>::const_iterator iter = styles.find(styleIdStack.top()); + auto iter = styles.find(styleIdStack.top()); if (iter != styles.end()) style.override(iter->second); styleIdStack.pop(); diff --git a/src/lib/VSDStylesCollector.cpp b/src/lib/VSDStylesCollector.cpp index 7f849f7..527bc33 100644 --- a/src/lib/VSDStylesCollector.cpp +++ b/src/lib/VSDStylesCollector.cpp @@ -430,9 +430,9 @@ void libvisio::VSDStylesCollector::endPage() while (!m_groupShapeOrder.empty() && changed) { changed = false; - for (std::list<unsigned>::iterator j = m_pageShapeOrder.begin(); j != m_pageShapeOrder.end();) + for (auto j = m_pageShapeOrder.begin(); j != m_pageShapeOrder.end();) { - std::map<unsigned, std::list<unsigned> >::iterator iter = m_groupShapeOrder.find(*j++); + auto iter = m_groupShapeOrder.find(*j++); if (m_groupShapeOrder.end() != iter) { m_pageShapeOrder.splice(j, iter->second, iter->second.begin(), iter->second.end()); diff --git a/src/lib/VSDXMLHelper.cpp b/src/lib/VSDXMLHelper.cpp index 6df3255..80f62a5 100644 --- a/src/lib/VSDXMLHelper.cpp +++ b/src/lib/VSDXMLHelper.cpp @@ -152,7 +152,7 @@ const libvisio::VSDXRelationship *libvisio::VSDXRelationships::getRelationshipBy { if (!type) return nullptr; - std::map<std::string, libvisio::VSDXRelationship>::const_iterator iter = m_relsByType.find(type); + auto iter = m_relsByType.find(type); if (iter != m_relsByType.end()) return &(iter->second); return nullptr; @@ -162,7 +162,7 @@ const libvisio::VSDXRelationship *libvisio::VSDXRelationships::getRelationshipBy { if (!id) return nullptr; - std::map<std::string, libvisio::VSDXRelationship>::const_iterator iter = m_relsById.find(id); + auto iter = m_relsById.find(id); if (iter != m_relsById.end()) return &(iter->second); return nullptr; diff --git a/src/lib/VSDXMLParserBase.cpp b/src/lib/VSDXMLParserBase.cpp index 678e302..e1d9d0d 100644 --- a/src/lib/VSDXMLParserBase.cpp +++ b/src/lib/VSDXMLParserBase.cpp @@ -1067,8 +1067,8 @@ void libvisio::VSDXMLParserBase::readPage(xmlTextReaderPtr reader) pageName.reset(xmlTextReaderGetAttribute(reader, BAD_CAST("NameU")), xmlFree); if (id) { - unsigned nId = (unsigned)xmlStringToLong(id); - unsigned backgroundPageID = (unsigned)(bgndPage ? xmlStringToLong(bgndPage) : -1); + auto nId = (unsigned)xmlStringToLong(id); + auto backgroundPageID = (unsigned)(bgndPage ? xmlStringToLong(bgndPage) : -1); bool isBackgroundPage = background ? xmlStringToBool(background) : false; m_isPageStarted = true; m_collector->startPage(nId); @@ -1218,7 +1218,7 @@ void libvisio::VSDXMLParserBase::readCharIX(xmlTextReaderPtr reader) { try { - unsigned fontIndex = (unsigned)xmlStringToLong(stringValue); + auto fontIndex = (unsigned)xmlStringToLong(stringValue); std::map<unsigned, VSDName>::const_iterator iter = m_fonts.find(fontIndex); if (iter != m_fonts.end()) font = iter->second; @@ -1499,7 +1499,7 @@ void libvisio::VSDXMLParserBase::readParaIX(xmlTextReaderPtr reader) { try { - unsigned fontIndex = (unsigned)xmlStringToLong(stringValue); + auto fontIndex = (unsigned)xmlStringToLong(stringValue); if (fontIndex) { std::map<unsigned, VSDName>::const_iterator iter = m_fonts.find(fontIndex); @@ -1556,10 +1556,10 @@ void libvisio::VSDXMLParserBase::readStyleSheet(xmlTextReaderPtr reader) const shared_ptr<xmlChar> textStyle(xmlTextReaderGetAttribute(reader, BAD_CAST("TextStyle")), xmlFree); if (id) { - unsigned nId = (unsigned)xmlStringToLong(id); - unsigned nLineStyle = (unsigned)(lineStyle ? xmlStringToLong(lineStyle) : -1); - unsigned nFillStyle = (unsigned)(fillStyle ? xmlStringToLong(fillStyle) : -1); - unsigned nTextStyle = (unsigned)(textStyle ? xmlStringToLong(textStyle) : -1); + auto nId = (unsigned)xmlStringToLong(id); + auto nLineStyle = (unsigned)(lineStyle ? xmlStringToLong(lineStyle) : -1); + auto nFillStyle = (unsigned)(fillStyle ? xmlStringToLong(fillStyle) : -1); + auto nTextStyle = (unsigned)(textStyle ? xmlStringToLong(textStyle) : -1); m_collector->collectStyleSheet(nId, (unsigned)getElementDepth(reader), nLineStyle, nFillStyle, nTextStyle); } } @@ -1695,7 +1695,7 @@ void libvisio::VSDXMLParserBase::readStencil(xmlTextReaderPtr reader) const shared_ptr<xmlChar> id(xmlTextReaderGetAttribute(reader, BAD_CAST("ID")), xmlFree); if (id) { - unsigned nId = (unsigned)xmlStringToLong(id); + auto nId = (unsigned)xmlStringToLong(id); m_currentStencilID = nId; } else @@ -2228,7 +2228,7 @@ int libvisio::VSDXMLParserBase::readExtendedColourData(Colour &value, xmlTextRea unsigned libvisio::VSDXMLParserBase::getIX(xmlTextReaderPtr reader) { - unsigned ix = MINUS_ONE; + auto ix = MINUS_ONE; const std::shared_ptr<xmlChar> ixString(xmlTextReaderGetAttribute(reader, BAD_CAST("IX")), xmlFree); if (ixString) ix = (unsigned)xmlStringToLong(ixString.get()); @@ -2239,7 +2239,7 @@ void libvisio::VSDXMLParserBase::readTriggerId(unsigned &id, xmlTextReaderPtr re { using namespace boost::spirit::qi; - unsigned triggerId = MINUS_ONE; + auto triggerId = MINUS_ONE; const std::shared_ptr<xmlChar> triggerString(xmlTextReaderGetAttribute(reader, BAD_CAST("F")), xmlFree); if (triggerString) { diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp index efd46b9..154b1d2 100644 --- a/src/lib/VSDXParser.cpp +++ b/src/lib/VSDXParser.cpp @@ -614,7 +614,7 @@ void libvisio::VSDXParser::readPageSheetProperties(xmlTextReaderPtr reader) double pageScale = 1.0; double drawingScale = 1.0; - unsigned level = (unsigned)getElementDepth(reader); + auto level = (unsigned)getElementDepth(reader); int ret = 1; int tokenId = XML_TOKEN_INVALID; int tokenType = -1; @@ -746,7 +746,7 @@ void libvisio::VSDXParser::readStyleProperties(xmlTextReaderPtr reader) boost::optional<double> defaultTabStop; boost::optional<unsigned char> textDirection; - unsigned level = (unsigned)getElementDepth(reader); + auto level = (unsigned)getElementDepth(reader); int ret = 1; int tokenId = XML_TOKEN_INVALID; int tokenType = -1; diff --git a/src/lib/VisioDocument.cpp b/src/lib/VisioDocument.cpp index 50ebc72..bc2b477 100644 --- a/src/lib/VisioDocument.cpp +++ b/src/lib/VisioDocument.cpp @@ -33,7 +33,7 @@ static bool checkVisioMagic(librevenge::RVNGInputStream *input) 0x20, 0x44, 0x72, 0x61, 0x77, 0x69, 0x6e, 0x67, 0x0d, 0x0a, 0x0 }; - int startPosition = (int)input->tell(); + auto startPosition = (int)input->tell(); unsigned long numBytesRead = 0; const unsigned char *buffer = input->read(VSD_NUM_ELEMENTS(magic), numBytesRead); const bool returnValue = VSD_NUM_ELEMENTS(magic) == numBytesRead diff --git a/src/lib/libvisio_xml.cpp b/src/lib/libvisio_xml.cpp index 225d42f..fb18627 100644 --- a/src/lib/libvisio_xml.cpp +++ b/src/lib/libvisio_xml.cpp @@ -30,7 +30,7 @@ extern "C" static int vsdxInputReadFunc(void *context, char *buffer, int len) { - librevenge::RVNGInputStream *input = (librevenge::RVNGInputStream *)context; + auto *input = (librevenge::RVNGInputStream *)context; if ((!input) || (!buffer) || (len < 0)) return -1; @@ -52,7 +52,7 @@ extern "C" static void vsdxReaderErrorFunc(void *arg, const char *, xmlParserSeverities severity, xmlTextReaderLocatorPtr) #endif { - XMLErrorWatcher *const watcher = reinterpret_cast<XMLErrorWatcher *>(arg); + auto *const watcher = reinterpret_cast<XMLErrorWatcher *>(arg); switch (severity) { case XML_PARSER_SEVERITY_VALIDITY_WARNING: _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
