[Libreoffice-commits] .: writerperfect/source

Julien Nabet serval2412 at kemper.freedesktop.org
Mon Oct 24 07:47:39 PDT 2011


 writerperfect/source/filter/FontStyle.cxx    |    4 ++--
 writerperfect/source/filter/OdtGenerator.cxx |   16 ++++++++--------
 writerperfect/source/filter/TextRunStyle.cxx |    8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 510199339092ab83ddaaa3bdfccb2f757024ca74
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Oct 24 16:46:18 2011 +0200

    Some cppcheck cleaning (I let the extra qualified as advised on IRC)

diff --git a/writerperfect/source/filter/FontStyle.cxx b/writerperfect/source/filter/FontStyle.cxx
index 8b24e18..5743e1e 100644
--- a/writerperfect/source/filter/FontStyle.cxx
+++ b/writerperfect/source/filter/FontStyle.cxx
@@ -54,7 +54,7 @@ void FontStyle::write(OdfDocumentHandler *pHandler) const
 void FontStyleManager::clean()
 {
     for (std::map<WPXString, FontStyle *, ltstr>::iterator iter = mHash.begin();
-         iter != mHash.end(); iter++)
+         iter != mHash.end(); ++iter)
     {
         delete(iter->second);
     }
@@ -65,7 +65,7 @@ void FontStyleManager::writeFontsDeclaration(OdfDocumentHandler *pHandler) const
 {
     TagOpenElement("office:font-face-decls").write(pHandler);
     for (std::map<WPXString, FontStyle *, ltstr>::const_iterator iter = mHash.begin();
-         iter != mHash.end(); iter++)
+         iter != mHash.end(); ++iter)
     {
         (iter->second)->write(pHandler);
     }
diff --git a/writerperfect/source/filter/OdtGenerator.cxx b/writerperfect/source/filter/OdtGenerator.cxx
index aba82d8..69e8f24 100644
--- a/writerperfect/source/filter/OdtGenerator.cxx
+++ b/writerperfect/source/filter/OdtGenerator.cxx
@@ -215,7 +215,7 @@ OdtGeneratorPrivate::~OdtGeneratorPrivate()
      WRITER_DEBUG_MSG(("WriterWordPerfect: Cleaning up our mess..\n"));
 
     WRITER_DEBUG_MSG(("Destroying the body elements\n"));
-    for (std::vector<DocumentElement *>::iterator iterBody = mBodyElements.begin(); iterBody != mBodyElements.end(); iterBody++) {
+    for (std::vector<DocumentElement *>::iterator iterBody = mBodyElements.begin(); iterBody != mBodyElements.end(); ++iterBody) {
         delete (*iterBody);
         (*iterBody) = 0;
     }
@@ -225,32 +225,32 @@ OdtGeneratorPrivate::~OdtGeneratorPrivate()
     mFontManager.clean();
 
     for (std::vector<ListStyle *>::iterator iterListStyles = mListStyles.begin();
-        iterListStyles != mListStyles.end(); iterListStyles++) {
+        iterListStyles != mListStyles.end(); ++iterListStyles) {
         delete(*iterListStyles);
     }
     for (std::vector<SectionStyle *>::iterator iterSectionStyles = mSectionStyles.begin();
-        iterSectionStyles != mSectionStyles.end(); iterSectionStyles++) {
+        iterSectionStyles != mSectionStyles.end(); ++iterSectionStyles) {
         delete(*iterSectionStyles);
     }
     for (std::vector<TableStyle *>::iterator iterTableStyles = mTableStyles.begin();
-        iterTableStyles != mTableStyles.end(); iterTableStyles++) {
+        iterTableStyles != mTableStyles.end(); ++iterTableStyles) {
         delete((*iterTableStyles));
     }
 
     for (std::vector<PageSpan *>::iterator iterPageSpans = mPageSpans.begin();
-        iterPageSpans != mPageSpans.end(); iterPageSpans++) {
+        iterPageSpans != mPageSpans.end(); ++iterPageSpans) {
         delete(*iterPageSpans);
     }
     for (std::vector<DocumentElement *>::iterator iterFrameStyles = mFrameStyles.begin();
-        iterFrameStyles != mFrameStyles.end(); iterFrameStyles++) {
+        iterFrameStyles != mFrameStyles.end(); ++iterFrameStyles) {
         delete(*iterFrameStyles);
     }
     for (std::vector<DocumentElement *>::iterator iterFrameAutomaticStyles = mFrameAutomaticStyles.begin();
-        iterFrameAutomaticStyles != mFrameAutomaticStyles.end(); iterFrameAutomaticStyles++) {
+        iterFrameAutomaticStyles != mFrameAutomaticStyles.end(); ++iterFrameAutomaticStyles) {
         delete(*iterFrameAutomaticStyles);
     }
     for (std::vector<DocumentElement *>::iterator iterMetaData = mMetaData.begin();
-        iterMetaData != mMetaData.end(); iterMetaData++) {
+        iterMetaData != mMetaData.end(); ++iterMetaData) {
         delete(*iterMetaData);
     }
 }
diff --git a/writerperfect/source/filter/TextRunStyle.cxx b/writerperfect/source/filter/TextRunStyle.cxx
index 6a1eec6..caa70af 100644
--- a/writerperfect/source/filter/TextRunStyle.cxx
+++ b/writerperfect/source/filter/TextRunStyle.cxx
@@ -184,7 +184,7 @@ void SpanStyle::write(OdfDocumentHandler *pHandler) const
 void ParagraphStyleManager::clean()
 {
   for (std::map<WPXString, ParagraphStyle *, ltstr>::iterator iter = mHash.begin();
-       iter != mHash.end(); iter++) {
+       iter != mHash.end(); ++iter) {
     delete(iter->second);
   }
   mHash.clear();
@@ -193,7 +193,7 @@ void ParagraphStyleManager::clean()
 void ParagraphStyleManager::write(OdfDocumentHandler *pHandler) const
 {
     for (std::map<WPXString, ParagraphStyle *, ltstr>::const_iterator iter = mHash.begin();
-         iter != mHash.end(); iter++)
+         iter != mHash.end(); ++iter)
     {
         if (strcmp(iter->second->getName().cstr(), "Standard") == 0)
             continue;
@@ -237,7 +237,7 @@ WPXString ParagraphStyleManager::findOrAdd (WPXPropertyList const &propList, WPX
 void SpanStyleManager::clean()
 {
     for (std::map<WPXString, SpanStyle *, ltstr>::iterator iter = mHash.begin();
-        iter != mHash.end(); iter++)
+        iter != mHash.end(); ++iter)
         delete(iter->second);
     mHash.clear();
 }
@@ -245,7 +245,7 @@ void SpanStyleManager::clean()
 void SpanStyleManager::write(OdfDocumentHandler *pHandler) const
 {
     for (std::map<WPXString, SpanStyle *, ltstr>::const_iterator iter = mHash.begin();
-         iter != mHash.end(); iter++)
+         iter != mHash.end(); ++iter)
         iter->second->write(pHandler);
 }
 


More information about the Libreoffice-commits mailing list