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

List:       kde-commits
Subject:    Re: [kde-baseapps] konq-plugins/dirfilter: iterator -> const_iterator
From:       Christophe Giboudeaux <cgiboudeaux () gmx ! com>
Date:       2012-09-18 10:18:53
Message-ID: 2742594.GzSGhYtzSY () yuuko
[Download RAW message or body]


Hi,

On Saturday 15 September 2012 19:53:24 Dawit Alemayehu wrote:
> Git commit b99821f0908f7c15518228749f340eebf9b5df77 by Dawit Alemayehu.
> Committed on 15/09/2012 at 19:51.
> Pushed by adawit into branch 'master'.
> 
> iterator -> const_iterator
> 
> M  +3    -3    konq-plugins/dirfilter/dirfilterplugin.cpp
> 
> http://commits.kde.org/kde-baseapps/b99821f0908f7c15518228749f340eebf9b5df77
> 
> diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp
> b/konq-plugins/dirfilter/dirfilterplugin.cpp index 8b8040f..02e1d1f 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::iterator itEnd = m_pMimeInfo.end();
> +  MimeInfoMap::const_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::iterator itemEnd = m_pMimeInfo.end();
> +        MimeInfoMap::const_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::iterator itEnd = m_pMimeInfo.end();
> +  MimeInfoMap::const_iterator itEnd = m_pMimeInfo.end();
>    for (MimeInfoMap::iterator it = m_pMimeInfo.begin(); it != itEnd; ++it)
>      it.value().useAsFilter = false;

This reverts commit 64b1cc1e and reintroduces the build error.

Please add -DQT_STRICT_ITERATORS to your CXXFLAGS


Christophe

["signature.asc" (application/pgp-signature)]

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