--bcaec54c54880c5fd404c9fba32d Content-Type: text/plain; charset=UTF-8 Hmm... That is why the version in 4.9 branch was different from the master one! Anyhow, this will be resolved soon enough since I will soon push my dirfilter plugin changes for the 4.10 release. On Tue, Sep 18, 2012 at 6:18 AM, Christophe Giboudeaux wrote: > 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 > --bcaec54c54880c5fd404c9fba32d Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hmm... That is why the version in 4.9 branch was different from the master = one! Anyhow, this will be resolved soon enough since I will soon push my di= rfilter plugin changes for the 4.10 release.

On Tue, Sep 18, 2012 at 6:18 AM, Christophe Giboudeaux &l= t;cgiboudeaux@gmx.= com> wrote:
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 =C2=A0+3 =C2=A0 =C2=A0-3 =C2=A0 =C2=A0konq-plugins/dirfilter/dirfilt= erplugin.cpp
>
> http://commits.kde.org/kde-baseapps/b9= 9821f0908f7c15518228749f340eebf9b5df77
>
> diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp
> b/konq-plugins/dirfilter/dirfilterplugin.cpp index 8b8040f..02e1d1f 10= 0644
> --- a/konq-plugins/dirfilter/dirfilterplugin.cpp
> +++ b/konq-plugins/dirfilter/dirfilterplugin.cpp
> @@ -260,7 +260,7 @@ void DirFilterPlugin::slotItemSelected (QAction *a= ction)
> return;
>
> =C2=A0 =C2=A0MimeInfoMap::iterator it =3D m_pMimeInfo.begin();
> - =C2=A0MimeInfoMap::iterator itEnd =3D m_pMimeInfo.end();
> + =C2=A0MimeInfoMap::const_iterator itEnd =3D m_pMimeInfo.end();
> =C2=A0 =C2=A0while (it !=3D itEnd && action !=3D it.value().ac= tion)
> =C2=A0 =C2=A0 =C2=A0it++;
>
> @@ -283,7 +283,7 @@ void DirFilterPlugin::slotItemSelected (QAction *a= ction)
> filters << it.key();
>
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0MimeInfoMap::iterator item =3D m_pMi= meInfo.begin();
> - =C2=A0 =C2=A0 =C2=A0 =C2=A0MimeInfoMap::iterator itemEnd =3D m_pMime= Info.end();
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0MimeInfoMap::const_iterator itemEnd =3D m= _pMimeInfo.end();
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0while ( item !=3D itemEnd )
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if ( item !=3D it )
> @@ -375,7 +375,7 @@ void DirFilterPlugin::slotReset()
> =C2=A0 =C2=A0if (!m_part || !m_listingExt)
> =C2=A0 =C2=A0 =C2=A0return;
>
> - =C2=A0MimeInfoMap::iterator itEnd =3D m_pMimeInfo.end();
> + =C2=A0MimeInfoMap::const_iterator itEnd =3D m_pMimeInfo.end();
> =C2=A0 =C2=A0for (MimeInfoMap::iterator it =3D m_pMimeInfo.begin(); it= !=3D itEnd; ++it)
> =C2=A0 =C2=A0 =C2=A0it.value().useAsFilter =3D false;

This reverts commit 64b1cc1e and reintroduces the build error.

Please add -DQT_STRICT_ITERATORS to your CXXFLAGS


Christophe

--bcaec54c54880c5fd404c9fba32d--