From de9904c73a08b501632a1ab7ed62db48c4dd3e1a Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Mon, 24 Aug 2009 06:27:49 +0000
Subject: [PATCH] Fix pedantic Fix iterator

svn path=/trunk/KDE/kdebase/workspace/; revision=1014880
---
 clients/nitrogen/config/nitrogenconfigurationui.cpp     | 4 ++--
 clients/nitrogen/config/nitrogenexceptiondialog.cpp     | 2 +-
 clients/nitrogen/config/nitrogenexceptiondialog.h       | 2 +-
 clients/nitrogen/config/nitrogenexceptionlistdialog.cpp | 2 +-
 clients/nitrogen/config/nitrogenexceptionlistdialog.h   | 2 +-
 clients/nitrogen/config/nitrogenexceptionmodel.cpp      | 2 +-
 clients/nitrogen/config/nitrogenexceptionmodel.h        | 2 +-
 clients/nitrogen/nitrogen.cpp                           | 2 +-
 clients/nitrogen/nitrogen.h                             | 2 +-
 clients/nitrogen/nitrogenconfiguration.cpp              | 2 +-
 clients/nitrogen/nitrogenconvertexceptions.cpp          | 2 +-
 clients/nitrogen/nitrogenexception.cpp                  | 2 +-
 clients/nitrogen/nitrogenexceptionlist.cpp              | 4 ++--
 clients/nitrogen/nitrogensizegrip.cpp                   | 2 +-
 clients/nitrogen/nitrogensizegrip.h                     | 2 +-
 clients/nitrogen/x11util.h                              | 4 ++--
 16 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/clients/nitrogen/config/nitrogenconfigurationui.cpp b/clients/nitrogen/config/nitrogenconfigurationui.cpp
index 8902014720..296a69e279 100644
--- a/clients/nitrogen/config/nitrogenconfigurationui.cpp
+++ b/clients/nitrogen/config/nitrogenconfigurationui.cpp
@@ -196,6 +196,6 @@ namespace Nitrogen
     
     QMetaObject::connectSlotsByName(this);  
     
-  };
+  }
   
-};
+}
diff --git a/clients/nitrogen/config/nitrogenexceptiondialog.cpp b/clients/nitrogen/config/nitrogenexceptiondialog.cpp
index 7b0798c4ca..60e0aa5aa5 100644
--- a/clients/nitrogen/config/nitrogenexceptiondialog.cpp
+++ b/clients/nitrogen/config/nitrogenexceptiondialog.cpp
@@ -239,4 +239,4 @@ namespace Nitrogen
   bool NitrogenExceptionDialog::ComboBox::isChecked( void ) const
   { return currentText() == Yes; }
   
-};
+}
diff --git a/clients/nitrogen/config/nitrogenexceptiondialog.h b/clients/nitrogen/config/nitrogenexceptiondialog.h
index b3f4a2f61d..4410a88123 100644
--- a/clients/nitrogen/config/nitrogenexceptiondialog.h
+++ b/clients/nitrogen/config/nitrogenexceptiondialog.h
@@ -112,6 +112,6 @@ namespace Nitrogen
   
   };
   
-};
+}
 
 #endif
diff --git a/clients/nitrogen/config/nitrogenexceptionlistdialog.cpp b/clients/nitrogen/config/nitrogenexceptionlistdialog.cpp
index c8e4525ad2..32fa55942e 100644
--- a/clients/nitrogen/config/nitrogenexceptionlistdialog.cpp
+++ b/clients/nitrogen/config/nitrogenexceptionlistdialog.cpp
@@ -343,4 +343,4 @@ namespace Nitrogen
     return true;
   }
   
-};
+}
diff --git a/clients/nitrogen/config/nitrogenexceptionlistdialog.h b/clients/nitrogen/config/nitrogenexceptionlistdialog.h
index d0b1dcaae6..a622b702b3 100644
--- a/clients/nitrogen/config/nitrogenexceptionlistdialog.h
+++ b/clients/nitrogen/config/nitrogenexceptionlistdialog.h
@@ -131,7 +131,7 @@ namespace Nitrogen
     
   };
   
-};
+}
 
 #endif
   
diff --git a/clients/nitrogen/config/nitrogenexceptionmodel.cpp b/clients/nitrogen/config/nitrogenexceptionmodel.cpp
index 3b184d90e8..6ed8c1aebf 100644
--- a/clients/nitrogen/config/nitrogenexceptionmodel.cpp
+++ b/clients/nitrogen/config/nitrogenexceptionmodel.cpp
@@ -96,4 +96,4 @@ namespace Nitrogen
     
   }
     
-};
+}
diff --git a/clients/nitrogen/config/nitrogenexceptionmodel.h b/clients/nitrogen/config/nitrogenexceptionmodel.h
index f0e95b96bb..09cd040066 100644
--- a/clients/nitrogen/config/nitrogenexceptionmodel.h
+++ b/clients/nitrogen/config/nitrogenexceptionmodel.h
@@ -83,6 +83,6 @@ namespace Nitrogen
     
   };
     
-};
+}
 #endif
     
diff --git a/clients/nitrogen/nitrogen.cpp b/clients/nitrogen/nitrogen.cpp
index 94843eb60c..d47ec742c1 100644
--- a/clients/nitrogen/nitrogen.cpp
+++ b/clients/nitrogen/nitrogen.cpp
@@ -422,7 +422,7 @@ namespace Nitrogen
     
     QString window_title;
     QString class_name;
-    for( NitrogenExceptionList::const_iterator iter = exceptions_.begin(); iter != exceptions_.end(); iter++ )
+    for( NitrogenExceptionList::const_iterator iter = exceptions_.constBegin(); iter != exceptions_.constEnd(); iter++ )
     {
       
       // discard disabled exceptions
diff --git a/clients/nitrogen/nitrogen.h b/clients/nitrogen/nitrogen.h
index 379bca7946..b1cb83aa19 100644
--- a/clients/nitrogen/nitrogen.h
+++ b/clients/nitrogen/nitrogen.h
@@ -161,6 +161,6 @@ namespace Nitrogen
     
   };
       
-};
+}
 
 #endif
diff --git a/clients/nitrogen/nitrogenconfiguration.cpp b/clients/nitrogen/nitrogenconfiguration.cpp
index 3956f7a8f9..9cf409a7f2 100644
--- a/clients/nitrogen/nitrogenconfiguration.cpp
+++ b/clients/nitrogen/nitrogenconfiguration.cpp
@@ -293,4 +293,4 @@ namespace Nitrogen
       useOxygenShadows() == other.useOxygenShadows();
   }
 
-};
+}
diff --git a/clients/nitrogen/nitrogenconvertexceptions.cpp b/clients/nitrogen/nitrogenconvertexceptions.cpp
index a29238dfd1..797b56de8b 100644
--- a/clients/nitrogen/nitrogenconvertexceptions.cpp
+++ b/clients/nitrogen/nitrogenconvertexceptions.cpp
@@ -44,7 +44,7 @@ namespace NitrogenXml
   static const QString TYPE = "type";
   static const QString PATTERN = "pattern";
   static const QString MASK = "mask";
-};
+}
 
 //__________________________________________________________
 NitrogenException readException( QDomElement element )
diff --git a/clients/nitrogen/nitrogenexception.cpp b/clients/nitrogen/nitrogenexception.cpp
index 9febc81a65..fa70a00e42 100644
--- a/clients/nitrogen/nitrogenexception.cpp
+++ b/clients/nitrogen/nitrogenexception.cpp
@@ -89,4 +89,4 @@ namespace Nitrogen
     else return WindowClassName;
   }
   
-};
+}
diff --git a/clients/nitrogen/nitrogenexceptionlist.cpp b/clients/nitrogen/nitrogenexceptionlist.cpp
index 1e2eb7cebf..8526a1fc57 100644
--- a/clients/nitrogen/nitrogenexceptionlist.cpp
+++ b/clients/nitrogen/nitrogenexceptionlist.cpp
@@ -63,7 +63,7 @@ namespace Nitrogen
     
     // also add exceptions
     int index(0);
-    for( NitrogenExceptionList::const_iterator iter = begin(); iter != end(); iter++, index++ )
+    for( NitrogenExceptionList::const_iterator iter = constBegin(); iter != constEnd(); iter++, index++ )
     {
       
       KConfigGroup group( &config, exceptionGroupName( index ) );
@@ -102,4 +102,4 @@ namespace Nitrogen
   }
     
 
-};
+}
diff --git a/clients/nitrogen/nitrogensizegrip.cpp b/clients/nitrogen/nitrogensizegrip.cpp
index e3e463c87f..8588eaa70a 100644
--- a/clients/nitrogen/nitrogensizegrip.cpp
+++ b/clients/nitrogen/nitrogensizegrip.cpp
@@ -256,4 +256,4 @@ namespace Nitrogen
 
   }
   
-};
+}
diff --git a/clients/nitrogen/nitrogensizegrip.h b/clients/nitrogen/nitrogensizegrip.h
index 9dc75ec15f..d9875e4186 100644
--- a/clients/nitrogen/nitrogensizegrip.h
+++ b/clients/nitrogen/nitrogensizegrip.h
@@ -96,6 +96,6 @@ namespace Nitrogen
   };
   
   
-};
+}
 
 #endif
diff --git a/clients/nitrogen/x11util.h b/clients/nitrogen/x11util.h
index 9bd6565c71..38f6e5b70e 100644
--- a/clients/nitrogen/x11util.h
+++ b/clients/nitrogen/x11util.h
@@ -72,7 +72,7 @@ namespace Nitrogen
       _NET_WM_MOVERESIZE_SIZE_LEFT=7,
       _NET_WM_MOVERESIZE_MOVE=8,
       _NET_WM_MOVERESIZE_SIZE_KEYBOARD=9,
-      _NET_WM_MOVERESIZE_MOVE_KEYBOARD=10,    
+      _NET_WM_MOVERESIZE_MOVE_KEYBOARD=10   
     };
       
     //! supported atoms
@@ -132,6 +132,6 @@ namespace Nitrogen
     
   };
   
-};
+}
 
 #endif