Use auto when declaring iterators and when initializing with a cast

Change-Id: I9c72f04ed4d3e1bbe75918f851f9a6d300ed875f

5 files changed, 10 insertions, 10 deletions

diff --git a/src/lib/ABWContentCollector.cpp b/src/lib/ABWContentCollector.cpp
index 943ef85..97de293 100644
--- a/src/lib/ABWContentCollector.cpp
+++ b/src/lib/ABWContentCollector.cpp
@@ -273,7 +273,7 @@ std::string findProperty(const ABWPropertyMap &propMap, const char *const name)
 {
   if (!name)
     return std::string();
-  ABWPropertyMap::const_iterator iter = propMap.find(name);
+  auto iter = propMap.find(name);
   if (iter != propMap.end())
     return iter->second;
   return std::string();
@@ -1460,8 +1460,8 @@ void libabw::ABWContentCollector::_openTable()
 
   librevenge::RVNGPropertyListVector tmpColumns;
   parseTableColumns(_findTableProperty("table-column-props"), tmpColumns);
-  unsigned numColumns = unsigned(tmpColumns.count());
-  std::map<int, int>::const_iterator iter = m_tableSizes.find(m_ps->m_tableStates.top().m_currentTableId);
+  auto numColumns = unsigned(tmpColumns.count());
+  auto iter = m_tableSizes.find(m_ps->m_tableStates.top().m_currentTableId);
   if (iter != m_tableSizes.end())
     numColumns = unsigned(iter->second);
   librevenge::RVNGPropertyListVector columns;
@@ -2175,7 +2175,7 @@ void libabw::ABWContentCollector::openFrame(const char *props, const char *image
   else if (iter->second=="image")
   {
     m_ps->m_parsingContext=ABW_FRAME_IMAGE;
-    std::map<std::string, ABWData>::const_iterator imIter = m_data.end();
+    auto imIter = m_data.end();
     if (imageId) imIter= m_data.find(imageId);
     if (imIter==m_data.end())
     {
@@ -2251,7 +2251,7 @@ void libabw::ABWContentCollector::insertImage(const char *dataid, const char *pr
     parsePropString(props, properties);
   if (dataid)
   {
-    std::map<std::string, ABWData>::const_iterator iter = m_data.find(dataid);
+    auto iter = m_data.find(dataid);
     if (iter != m_data.end())
     {
       librevenge::RVNGPropertyList propList;
diff --git a/src/lib/ABWOutputElements.cpp b/src/lib/ABWOutputElements.cpp
index 53b08ee..833a728 100644
--- a/src/lib/ABWOutputElements.cpp
+++ b/src/lib/ABWOutputElements.cpp
@@ -817,7 +817,7 @@ void libabw::ABWOpenPageSpanElement::_writeElements(librevenge::RVNGTextInterfac
   if (!elements || id < 0 || !iface)
     return;
 
-  OutputElementsMap_t::const_iterator iterMap = elements->find(id);
+  auto iterMap = elements->find(id);
   if (iterMap == elements->end() || iterMap->second.empty())
     return;
 
diff --git a/src/lib/ABWParser.cpp b/src/lib/ABWParser.cpp
index 7d251af..60ca7d7 100644
--- a/src/lib/ABWParser.cpp
+++ b/src/lib/ABWParser.cpp
@@ -191,14 +191,14 @@ void libabw::ABWParser::processXmlNode(xmlTextReaderPtr reader)
   int emptyToken = xmlTextReaderIsEmptyElement(reader);
   if (XML_READER_TYPE_SIGNIFICANT_WHITESPACE == tokenType)
   {
-    const char *text = (const char *)xmlTextReaderConstValue(reader);
+    const auto *text = (const char *)xmlTextReaderConstValue(reader);
     if (!m_state->m_inMetadata && text && text[0]==' ' && text[1]==0)
       m_collector->insertText(text);
     return;
   }
   else if (XML_READER_TYPE_TEXT == tokenType)
   {
-    const char *text = (const char *)xmlTextReaderConstValue(reader);
+    const auto *text = (const char *)xmlTextReaderConstValue(reader);
     ABW_DEBUG_MSG(("ABWParser::processXmlNode: text %s\n", text));
     if (m_state->m_inMetadata)
     {
diff --git a/src/lib/ABWStylesCollector.cpp b/src/lib/ABWStylesCollector.cpp
index b3215b9..efcd798 100644
--- a/src/lib/ABWStylesCollector.cpp
+++ b/src/lib/ABWStylesCollector.cpp
@@ -89,7 +89,7 @@ static int abw_unichar_to_utf8(unsigned c, char *outbuf)
 
   if (outbuf)
   {
-    for (unsigned char i = (unsigned char)(len - 1); i > 0; --i)
+    for (auto i = (unsigned char)(len - 1); i > 0; --i)
     {
       outbuf[i] = (char)((c & 0x3f) | 0x80);
       c >>= 6;
diff --git a/src/lib/ABWXMLHelper.cpp b/src/lib/ABWXMLHelper.cpp
index 3f82938..ec3f55b 100644
--- a/src/lib/ABWXMLHelper.cpp
+++ b/src/lib/ABWXMLHelper.cpp
@@ -29,7 +29,7 @@ extern "C" {
 
   static int abwxmlInputReadFunc(void *context, char *buffer, int len)
   {
-    librevenge::RVNGInputStream *input = (librevenge::RVNGInputStream *)context;
+    auto *input = (librevenge::RVNGInputStream *)context;
 
     if ((!input) || (!buffer) || (len < 0))
       return -1;