cppcheck

(bzr r10695)

6 files changed, 30 insertions, 30 deletions

diff --git a/src/dom/dom.h b/src/dom/dom.h
index 21ea44669..674a84186 100644
--- a/src/dom/dom.h
+++ b/src/dom/dom.h
@@ -436,7 +436,7 @@ public:
      * Return whether the namespaced name argument is present in the list.
      * This is done lexically, not identically.     
      */
-    virtual bool containsNS(const DOMString namespaceURI,const DOMString &name)
+    virtual bool containsNS(const DOMString &namespaceURI, const DOMString &name)
         {
         for (unsigned int i=0; i<namePairs.size() ; i++)
             {
@@ -962,7 +962,7 @@ protected:
  
     /**
      * For the Ptr smart pointer
-     */	     
+     */
     int _refCnt;
 
 };
@@ -1122,7 +1122,7 @@ public:
     virtual NodePtr getNamedItem(const DOMString& name)
         {
         std::vector<NamedNodeMapEntry>::iterator iter;
-        for (iter = entries.begin() ; iter!=entries.end() ; iter++)
+        for (iter = entries.begin() ; iter!=entries.end() ; ++iter)
             {
             if (iter->name == name)
                 {
@@ -1145,7 +1145,7 @@ public:
         DOMString namespaceURI = arg->getNamespaceURI();
         DOMString name         = arg->getNodeName();
         std::vector<NamedNodeMapEntry>::iterator iter;
-        for (iter = entries.begin() ; iter!=entries.end() ; iter++)
+        for (iter = entries.begin() ; iter!=entries.end() ; ++iter)
             {
             if (iter->name == name)
                 {
@@ -1166,7 +1166,7 @@ public:
     virtual NodePtr removeNamedItem(const DOMString& name) throw(DOMException)
         {
         std::vector<NamedNodeMapEntry>::iterator iter;
-        for (iter = entries.begin() ; iter!=entries.end() ; iter++)
+        for (iter = entries.begin() ; iter!=entries.end() ; ++iter)
             {
             if (iter->name == name)
                 {
@@ -1203,7 +1203,7 @@ public:
                                  const DOMString& localName)
         {
         std::vector<NamedNodeMapEntry>::iterator iter;
-        for (iter = entries.begin() ; iter!=entries.end() ; iter++)
+        for (iter = entries.begin() ; iter!=entries.end() ; ++iter)
             {
             if (iter->namespaceURI == namespaceURI && iter->name == localName)
                 {
@@ -1226,7 +1226,7 @@ public:
         DOMString namespaceURI = arg->getNamespaceURI();
         DOMString name         = arg->getNodeName();
         std::vector<NamedNodeMapEntry>::iterator iter;
-        for (iter = entries.begin() ; iter!=entries.end() ; iter++)
+        for (iter = entries.begin() ; iter!=entries.end() ; ++iter)
             {
             if (iter->namespaceURI == namespaceURI && iter->name == name)
                 {
@@ -1248,7 +1248,7 @@ public:
                                     throw(DOMException)
         {
         std::vector<NamedNodeMapEntry>::iterator iter;
-        for (iter = entries.begin() ; iter!=entries.end() ; iter++)
+        for (iter = entries.begin() ; iter!=entries.end() ; ++iter)
             {
             if (iter->namespaceURI == namespaceURI && iter->name == localName)
                 {
diff --git a/src/dom/events.h b/src/dom/events.h
index 1fd77890c..e6a8e0d6c 100644
--- a/src/dom/events.h
+++ b/src/dom/events.h
@@ -510,7 +510,7 @@ public:
                                      bool useCapture)
         {
         std::vector<EventListenerEntry>::iterator iter;
-        for (iter = listeners.begin() ; iter != listeners.end() ; iter++)
+        for (iter = listeners.begin() ; iter != listeners.end() ; ++iter)
             {
             EventListenerEntry entry = *iter;
             if (entry.eventType == type &&
@@ -568,7 +568,7 @@ public:
                                        bool useCapture)
         {
         std::vector<EventListenerEntry>::iterator iter;
-        for (iter = listeners.begin() ; iter != listeners.end() ; iter++)
+        for (iter = listeners.begin() ; iter != listeners.end() ; ++iter)
             {
             EventListenerEntry entry = *iter;
             if (entry.namespaceURI == namespaceURI &&
@@ -589,7 +589,7 @@ public:
                                const DOMString &type)
         {
         std::vector<EventListenerEntry>::iterator iter;
-        for (iter = listeners.begin() ; iter != listeners.end() ; iter++)
+        for (iter = listeners.begin() ; iter != listeners.end() ; ++iter)
             {
             EventListenerEntry entry = *iter;
             if (entry.namespaceURI == namespaceURI &&
@@ -611,7 +611,7 @@ public:
                                     const DOMString &type)
         {
         std::vector<EventListenerEntry>::iterator iter;
-        for (iter = listeners.begin() ; iter != listeners.end() ; iter++)
+        for (iter = listeners.begin() ; iter != listeners.end() ; ++iter)
             {
             EventListenerEntry entry = *iter;
             if (entry.namespaceURI == namespaceURI &&
diff --git a/src/dom/io/gzipstream.cpp b/src/dom/io/gzipstream.cpp
index 9ac24dc75..9dffceea2 100644
--- a/src/dom/io/gzipstream.cpp
+++ b/src/dom/io/gzipstream.cpp
@@ -197,7 +197,7 @@ void GzipOutputStream::flush()
     gz.writeBuffer(buffer);
 
     std::vector<unsigned char>::iterator iter;
-    for (iter=compBuf.begin() ; iter!=compBuf.end() ; iter++)
+    for (iter=compBuf.begin() ; iter!=compBuf.end() ; ++iter)
         {
         int ch = (int) *iter;
         destination.put(ch);
diff --git a/src/dom/uri.cpp b/src/dom/uri.cpp
index b8a9a04fb..6a34f1838 100644
--- a/src/dom/uri.cpp
+++ b/src/dom/uri.cpp
@@ -179,7 +179,7 @@ static DOMString toStr(const std::vector<int> &arr)
 {
     DOMString buf;
     std::vector<int>::const_iterator iter;
-    for (iter=arr.begin() ; iter!=arr.end() ; iter++)
+    for (iter=arr.begin() ; iter!=arr.end() ; ++iter)
         {
         int ch = *iter;
         if (isprint(ch))
@@ -503,13 +503,13 @@ void URI::normalize()
         else if (sequ(s, "..") && iter != segments.begin() &&
                  !sequ(*(iter-1), ".."))
             {
-            iter--; //back up, then erase two entries
+            --iter; //back up, then erase two entries
             iter = segments.erase(iter);
             iter = segments.erase(iter);
             edited = true;
             }
         else
-            iter++;
+            ++iter;
         }
 
     //## Rebuild path, if necessary
@@ -521,7 +521,7 @@ void URI::normalize()
             path.push_back('/');
             }
         std::vector< std::vector<int> >::iterator iter;
-        for (iter=segments.begin() ; iter!=segments.end() ; iter++)
+        for (iter=segments.begin() ; iter!=segments.end() ; ++iter)
             {
             if (iter != segments.begin())
                 path.push_back('/');
@@ -920,7 +920,7 @@ bool URI::parse(const DOMString &str)
 
     DOMString::const_iterator iter;
     unsigned int i=0;
-    for (iter= str.begin() ; iter!=str.end() ; iter++)
+    for (iter= str.begin() ; iter!=str.end() ; ++iter)
         {
         int ch = *iter;
         if (ch == '\\')
diff --git a/src/dom/util/digest.cpp b/src/dom/util/digest.cpp
index 282979775..f416f5522 100644
--- a/src/dom/util/digest.cpp
+++ b/src/dom/util/digest.cpp
@@ -58,7 +58,7 @@ static std::string toHex(const std::vector<unsigned char> &bytes)
 {
     std::string str;
     std::vector<unsigned char>::const_iterator iter;
-    for (iter = bytes.begin() ; iter != bytes.end() ; iter++)
+    for (iter = bytes.begin() ; iter != bytes.end() ; ++iter)
        {
        unsigned char ch = *iter;
        str.push_back(hexDigits[(ch>>4) & 0x0f]);
diff --git a/src/dom/util/ziptool.cpp b/src/dom/util/ziptool.cpp
index 1e915ab0a..89e85cc84 100644
--- a/src/dom/util/ziptool.cpp
+++ b/src/dom/util/ziptool.cpp
@@ -175,7 +175,7 @@ void Crc32::update(char *str)
 void Crc32::update(const std::vector<unsigned char> &buf)
 {
     std::vector<unsigned char>::const_iterator iter;
-    for (iter=buf.begin() ; iter!=buf.end() ; iter++)
+    for (iter=buf.begin() ; iter!=buf.end() ; ++iter)
         {
         unsigned char ch = *iter;
         update(ch);
@@ -1390,7 +1390,7 @@ bool Deflater::compress()
         while (window.size() < 32768 && iter != uncompressed.end())
             {
             window.push_back(*iter);
-            iter++;
+            ++iter;
             }
         if (window.size() >= 32768)
             putBits(0x00, 1); //0  -- more blocks
@@ -1595,7 +1595,7 @@ bool GzipFile::write()
         }
 
     std::vector<unsigned char>::iterator iter;
-    for (iter=compBuf.begin() ; iter!=compBuf.end() ; iter++)
+    for (iter=compBuf.begin() ; iter!=compBuf.end() ; ++iter)
         {
         unsigned char ch = *iter;
         putByte(ch);
@@ -1636,7 +1636,7 @@ bool GzipFile::writeFile(const std::string &fileName)
     if (!f)
         return false;
     std::vector<unsigned char>::iterator iter;
-    for (iter=fileBuf.begin() ; iter!=fileBuf.end() ; iter++)
+    for (iter=fileBuf.begin() ; iter!=fileBuf.end() ; ++iter)
         {
         unsigned char ch = *iter;
         fputc(ch, f);
@@ -2033,7 +2033,7 @@ void ZipEntry::finish()
     Crc32 c32;
     std::vector<unsigned char>::iterator iter;
     for (iter = uncompressedData.begin() ;
-           iter!= uncompressedData.end() ; iter++)
+           iter!= uncompressedData.end() ; ++iter)
         {
         unsigned char ch = *iter;
         c32.update(ch);
@@ -2044,7 +2044,7 @@ void ZipEntry::finish()
         case 0: //none
             {
             for (iter = uncompressedData.begin() ;
-               iter!= uncompressedData.end() ; iter++)
+               iter!= uncompressedData.end() ; ++iter)
                 {
                 unsigned char ch = *iter;
                 compressedData.push_back(ch);
@@ -2135,7 +2135,7 @@ ZipFile::ZipFile()
 ZipFile::~ZipFile()
 {
     std::vector<ZipEntry *>::iterator iter;
-    for (iter=entries.begin() ; iter!=entries.end() ; iter++)
+    for (iter=entries.begin() ; iter!=entries.end() ; ++iter)
         {
         ZipEntry *entry = *iter;
         delete entry;
@@ -2269,7 +2269,7 @@ bool ZipFile::putByte(unsigned char val)
 bool ZipFile::writeFileData()
 {
     std::vector<ZipEntry *>::iterator iter;
-    for (iter = entries.begin() ; iter != entries.end() ; iter++)
+    for (iter = entries.begin() ; iter != entries.end() ; ++iter)
         {
         ZipEntry *entry = *iter;
         entry->setPosition(fileBuf.size());
@@ -2299,7 +2299,7 @@ bool ZipFile::writeFileData()
         //##### DATA
         std::vector<unsigned char> &buf = entry->getCompressedData();
         std::vector<unsigned char>::iterator iter;
-        for (iter = buf.begin() ; iter != buf.end() ; iter++)
+        for (iter = buf.begin() ; iter != buf.end() ; ++iter)
             {
             unsigned char ch = (unsigned char) *iter;
             putByte(ch);
@@ -2315,7 +2315,7 @@ bool ZipFile::writeCentralDirectory()
 {
     unsigned long cdPosition = fileBuf.size();
     std::vector<ZipEntry *>::iterator iter;
-    for (iter = entries.begin() ; iter != entries.end() ; iter++)
+    for (iter = entries.begin() ; iter != entries.end() ; ++iter)
         {
         ZipEntry *entry = *iter;
         std::string fname   = entry->getFileName();
@@ -2403,7 +2403,7 @@ bool ZipFile::writeFile(const std::string &fileName)
     if (!f)
         return false;
     std::vector<unsigned char>::iterator iter;
-    for (iter=fileBuf.begin() ; iter!=fileBuf.end() ; iter++)
+    for (iter=fileBuf.begin() ; iter!=fileBuf.end() ; ++iter)
         {
         unsigned char ch = *iter;
         fputc(ch, f);