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

List:       kde-commits
Subject:    KDE/kdelibs/knewstuff/knewstuff2/ui
From:       Robert Knight <robertknight () gmail ! com>
Date:       2008-06-05 19:44:59
Message-ID: 1212695099.105728.11978.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 817338 by knight:

Fix assert failure when showing download dialog.  When
checking whether a model for a feed exists, use QMap::value()
instead of QMap::contains() since we need to check that
the existing value (if any) is non-null.

Null entries were being inserted by calling the non-const operator[]
on the map when setting the proxy model's source model.  Use value() here
instead which does not construct a new entry if none exists.


 M  +3 -3      downloaddialog.cpp  


--- trunk/KDE/kdelibs/knewstuff/knewstuff2/ui/downloaddialog.cpp #817337:817338
@@ -313,7 +313,7 @@
 
         const Provider * currentProvider = \
m_entriesByProvider.keys()[m_sourceCombo->currentIndex()];  Feed * selectedFeed = \
                currentProvider->downloadUrlFeed(feedType);
-        m_filteredModel->setSourceModel(m_models[selectedFeed]);
+        m_filteredModel->setSourceModel(m_models.value(selectedFeed));
         m_collaborationButton->setEnabled(false);
     }
 }
@@ -336,7 +336,7 @@
             populateSortCombo(providers[i]);
 
             Feed * selectedFeed = \
providers[i]->downloadUrlFeed(m_sortCombo->itemData(m_sortCombo->currentIndex()).toString());
                
-            m_filteredModel->setSourceModel(m_models[selectedFeed]);
+            m_filteredModel->setSourceModel(m_models.value(selectedFeed));
             //m_list->setProvider(providers[i], 
             //    providers[i]->downloadUrlFeed(m_sortCombo->itemData(m_sortCombo->currentIndex()).toString()));
  break;
@@ -410,7 +410,7 @@
 
     mMutex.lock();
 
-    if (!m_models.contains(feed)) {
+    if (!m_models.value(feed)) {
         // new feed
         kDebug(551) << "making a new model for this feed" << feed;
         m_models[feed] = new KNS::ItemsModel(this, \
provider->webService().isValid());


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