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

List:       kde-commits
Subject:    KDE/kdelibs/kde3support
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2008-10-21 19:42:31
Message-ID: 1224618151.107166.24244.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 874530 by chehrlic:

compile with -DQT_STRICT_ITERATORS

 M  +1 -1      kdecore/k3urldrag.cpp  
 M  +3 -2      kdeui/k3dockwidget.cpp  
 M  +2 -2      kdeui/k3listviewsearchline.cpp  
 M  +9 -9      kio/k3bookmarkdrag.cpp  


--- trunk/KDE/kdelibs/kde3support/kdecore/k3urldrag.cpp #874529:874530
@@ -141,7 +141,7 @@
         if ( ba.size() )
         {
             QString s = ba.data();
-            QStringList l = s.split( "$@@$", QString::SkipEmptyParts );
+            const QStringList l = s.split( "$@@$", QString::SkipEmptyParts );
             QStringList::ConstIterator it = l.begin();
             bool readingKey = true; // true, then false, then true, etc.
             QString key;
--- trunk/KDE/kdelibs/kde3support/kdeui/k3dockwidget.cpp #874529:874530
@@ -913,7 +913,7 @@
 
 void K3DockWidget::show()
 {
-  if ( parent() || manager->main->isVisible() )
+  if ( parent() || manager->main->isVisible() ) {
     if ( !parent() ){
      emit manager->setDockDefaultPos( this );
      emit setDockDefaultPos();
@@ -925,6 +925,7 @@
     } else {
      QWidget::show();
     }
+  }
 }
 
 #ifndef NO_KDE2
@@ -2877,7 +2878,7 @@
 
     if ( type == "TAB_GROUP" ){
       K3DockWidget* tabDockGroup = 0L;
-      QStringList list = cg.readEntry( oname+":tabNames",QStringList() );
+      const QStringList list = cg.readEntry( oname+":tabNames",QStringList() );
       QStringList::const_iterator listit = list.begin();
       K3DockWidget* d1 = getDockWidgetFromName( *listit++ );
       K3DockWidget* d2 = getDockWidgetFromName( *listit++ );
--- trunk/KDE/kdelibs/kde3support/kdeui/k3listviewsearchline.cpp #874529:874530
@@ -258,8 +258,8 @@
     // specifified.  If it is empty default to searching all of the columns.
 
     if(!d->searchColumns.isEmpty()) {
-        QList<int>::ConstIterator it = d->searchColumns.begin();
-        for(; it != d->searchColumns.end(); ++it) {
+        QList<int>::ConstIterator it = d->searchColumns.constBegin();
+        for(; it != d->searchColumns.constEnd(); ++it) {
             if(*it < item->listView()->columns() &&
                item->text(*it).indexOf(s, 0, d->caseSensitive) >= 0)
                 return true;
--- trunk/KDE/kdelibs/kde3support/kio/k3bookmarkdrag.cpp #874529:874530
@@ -27,14 +27,14 @@
 {
     KUrl::List urls;
 
-    for ( Q3ValueListConstIterator<KBookmark> it = bookmarks.begin(); it != \
bookmarks.end(); ++it ) { +    for ( Q3ValueListConstIterator<KBookmark> it = \
bookmarks.constBegin(); it != bookmarks.constEnd(); ++it ) {  urls.append( \
(*it).url() );  }
 
     // See KURLDrag::newDrag
     Q3StrList uris;
-    KUrl::List::ConstIterator uit = urls.begin();
-    KUrl::List::ConstIterator uEnd = urls.end();
+    KUrl::List::ConstIterator uit = urls.constBegin();
+    KUrl::List::ConstIterator uEnd = urls.constEnd();
     // Get each URL encoded in utf8 - and since we get it in escaped
     // form on top of that, .toLatin1().constData() is fine.
     for ( ; uit != uEnd ; ++uit )
@@ -94,8 +94,8 @@
         if ( K3URLDrag::decode( this, m_lstDragURLs ) )
         {
             QStringList uris;
-            KUrl::List::ConstIterator uit = m_lstDragURLs.begin();
-            KUrl::List::ConstIterator uEnd = m_lstDragURLs.end();
+            KUrl::List::ConstIterator uit = m_lstDragURLs.constBegin();
+            KUrl::List::ConstIterator uEnd = m_lstDragURLs.constEnd();
             for ( ; uit != uEnd ; ++uit )
                 uris.append( (*uit).prettyUrl() );
 
@@ -136,8 +136,8 @@
         //kDebug(7043) << "K3BookmarkDrag::decode uri-list";
         if ( K3URLDrag::decode( e, m_lstDragURLs ) )
         {
-            KUrl::List::ConstIterator uit = m_lstDragURLs.begin();
-            KUrl::List::ConstIterator uEnd = m_lstDragURLs.end();
+            KUrl::List::ConstIterator uit = m_lstDragURLs.constBegin();
+            KUrl::List::ConstIterator uEnd = m_lstDragURLs.constEnd();
             for ( ; uit != uEnd ; ++uit )
             {
                 //kDebug(7043) << "K3BookmarkDrag::decode url=" << (*uit).url();
@@ -155,8 +155,8 @@
         {
             
             QStringList listDragURLs = s.split(QChar('\n'), \
                QString::SkipEmptyParts);
-            QStringList::ConstIterator it = listDragURLs.begin();
-            QStringList::ConstIterator end = listDragURLs.end();
+            QStringList::ConstIterator it = listDragURLs.constBegin();
+            QStringList::ConstIterator end = listDragURLs.constEnd();
             for( ; it!=end; ++it)
             {
                 //kDebug(7043)<<"K3BookmarkDrag::decode string"<<(*it);


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