[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:       Dawit A <adawit () kde ! org>
Date:       2012-09-18 15:34:36
Message-ID: CALa28R5wod9HOdSawb60a09Lc3h85YFQeJmtQsOvk5U2-7yXfw () mail ! gmail ! com
[Download RAW message or body]

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
<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  +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
>

[Attachment #3 (text/html)]

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.<br><br><div class="gmail_quote">

On Tue, Sep 18, 2012 at 6:18 AM, Christophe Giboudeaux <span dir="ltr">&lt;<a \
href="mailto:cgiboudeaux@gmx.com" target="_blank">cgiboudeaux@gmx.com</a>&gt;</span> \
wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px \
#ccc solid;padding-left:1ex">

Hi,<br>
<br>
On Saturday 15 September 2012 19:53:24 Dawit Alemayehu wrote:<br>
&gt; Git commit b99821f0908f7c15518228749f340eebf9b5df77 by Dawit Alemayehu.<br>
&gt; Committed on 15/09/2012 at 19:51.<br>
&gt; Pushed by adawit into branch &#39;master&#39;.<br>
&gt;<br>
&gt; iterator -&gt; const_iterator<br>
&gt;<br>
&gt; M   +3      -3      konq-plugins/dirfilter/dirfilterplugin.cpp<br>
&gt;<br>
&gt; <a href="http://commits.kde.org/kde-baseapps/b99821f0908f7c15518228749f340eebf9b5df77" \
target="_blank">http://commits.kde.org/kde-baseapps/b99821f0908f7c15518228749f340eebf9b5df77</a><br>
 &gt;<br>
&gt; diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp<br>
&gt; b/konq-plugins/dirfilter/dirfilterplugin.cpp index 8b8040f..02e1d1f 100644<br>
&gt; --- a/konq-plugins/dirfilter/dirfilterplugin.cpp<br>
&gt; +++ b/konq-plugins/dirfilter/dirfilterplugin.cpp<br>
&gt; @@ -260,7 +260,7 @@ void DirFilterPlugin::slotItemSelected (QAction *action)<br>
&gt; return;<br>
&gt;<br>
&gt;      MimeInfoMap::iterator it = m_pMimeInfo.begin();<br>
&gt; -   MimeInfoMap::iterator itEnd = m_pMimeInfo.end();<br>
&gt; +   MimeInfoMap::const_iterator itEnd = m_pMimeInfo.end();<br>
&gt;      while (it != itEnd &amp;&amp; action != it.value().action)<br>
&gt;         it++;<br>
&gt;<br>
&gt; @@ -283,7 +283,7 @@ void DirFilterPlugin::slotItemSelected (QAction *action)<br>
&gt; filters &lt;&lt; it.key();<br>
&gt;<br>
&gt;               MimeInfoMap::iterator item = m_pMimeInfo.begin();<br>
&gt; -            MimeInfoMap::iterator itemEnd = m_pMimeInfo.end();<br>
&gt; +            MimeInfoMap::const_iterator itemEnd = m_pMimeInfo.end();<br>
&gt;               while ( item != itemEnd )<br>
&gt;               {<br>
&gt;                  if ( item != it )<br>
&gt; @@ -375,7 +375,7 @@ void DirFilterPlugin::slotReset()<br>
&gt;      if (!m_part || !m_listingExt)<br>
&gt;         return;<br>
&gt;<br>
&gt; -   MimeInfoMap::iterator itEnd = m_pMimeInfo.end();<br>
&gt; +   MimeInfoMap::const_iterator itEnd = m_pMimeInfo.end();<br>
&gt;      for (MimeInfoMap::iterator it = m_pMimeInfo.begin(); it != itEnd; ++it)<br>
&gt;         it.value().useAsFilter = false;<br>
<br>
This reverts commit 64b1cc1e and reintroduces the build error.<br>
<br>
Please add -DQT_STRICT_ITERATORS to your CXXFLAGS<br>
<span class="HOEnZb"><font color="#888888"><br>
<br>
Christophe<br>
</font></span></blockquote></div><br>



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