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

List:       kde-commits
Subject:    KDE/kdelibs/knewstuff/knewstuff2/ui
From:       Jeremy Paul Whiting <jeremy () scitools ! com>
Date:       2008-03-01 0:04:03
Message-ID: 1204329843.711147.24690.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 780788 by whiting:

clean up the code a bit, and get rid of a crash when entries were installed but not \
in the feeds anymore

 M  +2 -18     downloaddialog.cpp  
 M  +0 -1      downloaddialog.h  
 M  +3 -1      itemsview.cpp  


--- trunk/KDE/kdelibs/knewstuff/knewstuff2/ui/downloaddialog.cpp #780787:780788
@@ -103,7 +103,7 @@
 
     connect( m_buttonBox, SIGNAL( rejected() ), this, SLOT( accept() ) );
     connect( m_engine, SIGNAL( signalProgress( QString, int ) ), SLOT( slotProgress( \
                QString, int ) ) );
-    connect( m_engine, SIGNAL( signalEntryChanged( KNS::Entry* ) ), SLOT( \
slotDownloadItem( KNS::Entry* ) )); +    connect( m_engine, SIGNAL( \
signalEntryChanged( KNS::Entry* ) ), SLOT( slotEntryChanged( KNS::Entry* ) ));  
     connect( m_engine, SIGNAL(signalEntryLoaded(KNS::Entry*, const KNS::Feed*, const \
                KNS::Provider*)),
             this, SLOT(slotEntryLoaded(KNS::Entry*, const KNS::Feed*, const \
KNS::Provider*))); @@ -149,7 +149,7 @@
 //    }
 
     //TODO check for AvailableItem deletion! (avoid broken pointers) -> cancel old \
                jobs
-    slotDownloadItem( entry );
+    slotEntryChanged( entry );
 }
 
 void DownloadDialog::removeItem( Entry *entry )
@@ -304,22 +304,6 @@
 
 ///////////////// DXS ////////////////////
 
-//BEGIN File(s) Transferring
-void DownloadDialog::slotDownloadItem( KNS::Entry *entry )
-{
-//Q_UNUSED(entry);
-    m_list->updateItem(entry);
-/*
-XXX update item status
-    item->setState( AvailableItem::Installing );
-    item->setProgress( 0.0 );
-    d->itemsView->updateItem( item );
-
-XXX inform the user
-    displayMessage( i18n("Installing '%1', this could take some time ...").arg( \
                item->name().representation() ), 3000 );
-*/
-}
-
 void DownloadDialog::slotEntryChanged( KNS::Entry * entry )
 {
     m_list->updateItem(entry);
--- trunk/KDE/kdelibs/knewstuff/knewstuff2/ui/downloaddialog.h #780787:780788
@@ -105,7 +105,6 @@
     void slotFault();
     void slotError();
     // file downloading
-    void slotDownloadItem( KNS::Entry * );
     void slotEntryChanged( KNS::Entry * );
     //void slotItemMessage( KJob *, const QString & );
     //void slotItemPercentage( KJob *, unsigned long );
--- trunk/KDE/kdelibs/knewstuff/knewstuff2/ui/itemsview.cpp #780787:780788
@@ -137,7 +137,9 @@
 void ItemsView::updateItem( Entry *entry )
 {
     // FIXME: change this to call updateEntry once it is complete
-    m_views[entry]->setEntry(entry);
+    if (m_views.contains(entry)) {
+        m_views[entry]->setEntry(entry);
+    }
 }
 
 void ItemsView::buildContents()


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