[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-baseapps/KDE/4.9] konq-plugins/dirfilter: Fix compilation with strict iterators
From:       David Faure <faure () kde ! org>
Date:       2012-10-13 16:39:59
Message-ID: 20121013163959.89765A6078 () git ! kde ! org
[Download RAW message or body]

Git commit 9e601b04c1354230161a8fe0307fb21b2d3d82ed by David Faure.
Committed on 13/10/2012 at 18:41.
Pushed by dfaure into branch 'KDE/4.9'.

Fix compilation with strict iterators

(don't compare const and non-const iterators)

M  +3    -3    konq-plugins/dirfilter/dirfilterplugin.cpp

http://commits.kde.org/kde-baseapps/9e601b04c1354230161a8fe0307fb21b2d3d82ed

diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp
index 02e1d1f..8b8040f 100644
--- a/konq-plugins/dirfilter/dirfilterplugin.cpp
+++ b/konq-plugins/dirfilter/dirfilterplugin.cpp
@@ -260,7 +260,7 @@ void DirFilterPlugin::slotItemSelected (QAction *action)
     return;
 
   MimeInfoMap::iterator it = m_pMimeInfo.begin();
-  MimeInfoMap::const_iterator itEnd = m_pMimeInfo.end();
+  MimeInfoMap::iterator itEnd = m_pMimeInfo.end();
   while (it != itEnd && action != it.value().action)
     it++;
 
@@ -283,7 +283,7 @@ void DirFilterPlugin::slotItemSelected (QAction *action)
         filters << it.key();
 
         MimeInfoMap::iterator item = m_pMimeInfo.begin();
-        MimeInfoMap::const_iterator itemEnd = m_pMimeInfo.end();
+        MimeInfoMap::iterator itemEnd = m_pMimeInfo.end();
         while ( item != itemEnd )
         {
           if ( item != it )
@@ -375,7 +375,7 @@ void DirFilterPlugin::slotReset()
   if (!m_part || !m_listingExt)
     return;
 
-  MimeInfoMap::const_iterator itEnd = m_pMimeInfo.end();
+  MimeInfoMap::iterator itEnd = m_pMimeInfo.end();
   for (MimeInfoMap::iterator it = m_pMimeInfo.begin(); it != itEnd; ++it)
     it.value().useAsFilter = false;
 
[prev in list] [next in list] [prev in thread] [next in thread]