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

List:       kde-commits
Subject:    branches/work/knewstuffrefactor/knewstuff3
From:       Jeremy Paul Whiting <jeremy () scitools ! com>
Date:       2009-10-27 13:19:17
Message-ID: 1256649557.444548.22546.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1041139 by whiting:

remove deprecated references to Feed class that went away

 M  +0 -1      attica/atticaprovider.cpp  
 M  +0 -1      core/provider.cpp  
 M  +0 -1      engine.cpp  
 M  +34 -34    ui/downloaddialog.cpp  
 M  +4 -5      ui/downloaddialog.h  


--- branches/work/knewstuffrefactor/knewstuff3/attica/atticaprovider.cpp #1041138:1041139
@@ -18,7 +18,6 @@
 #include "atticaprovider.h"
 
 #include "xmlloader.h"
-#include "core/feed.h"
 #include "core/provider_p.h"
 
 #include <kdebug.h>
--- branches/work/knewstuffrefactor/knewstuff3/core/provider.cpp #1041138:1041139
@@ -22,7 +22,6 @@
 #include "knewstuff3/core/provider_p.h"
 
 #include "xmlloader.h"
-#include "core/feed.h"
 
 #include <kdebug.h>
 #include <klocale.h>
--- branches/work/knewstuffrefactor/knewstuff3/engine.cpp #1041138:1041139
@@ -22,7 +22,6 @@
 
 #include "knewstuff3/core/entry.h"
 #include "knewstuff3/core/installation.h"
-#include "knewstuff3/core/feed.h"
 #include "knewstuff3/core/security.h"
 
 #include "knewstuff3/xmlloader.h"
--- branches/work/knewstuffrefactor/knewstuff3/ui/downloaddialog.cpp #1041138:1041139
@@ -376,48 +376,48 @@
 }
 // FIXME: below here, those are for traditional GHNS
 
-void DownloadDialog::slotEntryLoaded(Entry *entry, const Feed *feed, const Provider *provider)
-{
-    Entry::List e = entries[feed];
-    e.append(entry);
-    entries[feed] = e;
+//void DownloadDialog::slotEntryLoaded(Entry *entry, const Feed *feed, const Provider *provider)
+//{
+//    Entry::List e = entries[feed];
+//    e.append(entry);
+//    entries[feed] = e;
 
-    if (!m_entriesByProvider.contains(provider)) {
-        kDebug(551) << "adding provider " << provider->name().representation() << " to combobox";
-        //m_sourceCombo->addItem(provider->name().representation());
-    }
-    m_entriesByProvider[provider].append(entry);
+//    if (!m_entriesByProvider.contains(provider)) {
+//        kDebug(551) << "adding provider " << provider->name().representation() << " to combobox";
+//        //m_sourceCombo->addItem(provider->name().representation());
+//    }
+//    m_entriesByProvider[provider].append(entry);
 
-    // FIXME: what if entry belongs to more than one provider at once?
-    m_entryToProviders[entry] = provider;
+//    // FIXME: what if entry belongs to more than one provider at once?
+//    m_entryToProviders[entry] = provider;
 
-    mMutex.lock();
+//    mMutex.lock();
 
-    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());
-        connect(m_engine, SIGNAL(signalEntryChanged(KNS3::Entry*)),
-                m_models[feed], SLOT(slotEntryChanged(KNS3::Entry*)));
-        //if (provider->name().representation() == m_sourceCombo->currentText()) {
-            // this provider is selected, so refresh the feed combobox
-            //populateSortCombo(provider);
-        //}
-    }
-    mMutex.unlock();
+//    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());
+//        connect(m_engine, SIGNAL(signalEntryChanged(KNS3::Entry*)),
+//                m_models[feed], SLOT(slotEntryChanged(KNS3::Entry*)));
+//        //if (provider->name().representation() == m_sourceCombo->currentText()) {
+//            // this provider is selected, so refresh the feed combobox
+//            //populateSortCombo(provider);
+//        //}
+//    }
+//    mMutex.unlock();
 
-    KNS3::ItemsModel* thisModel = m_models.value(feed);
+//    KNS3::ItemsModel* thisModel = m_models.value(feed);
 
-    Q_ASSERT(thisModel != NULL);
-    thisModel->addEntry(entry);
-}
+//    Q_ASSERT(thisModel != NULL);
+//    thisModel->addEntry(entry);
+//}
 
-void DownloadDialog::slotEntryRemoved(KNS3::Entry *entry, const KNS3::Feed *feed)
-{
-    Q_ASSERT(m_models[feed] != NULL);
+//void DownloadDialog::slotEntryRemoved(KNS3::Entry *entry, const KNS3::Feed *feed)
+//{
+//    Q_ASSERT(m_models[feed] != NULL);
 
-    m_models[feed]->removeEntry(entry);
-}
+//    m_models[feed]->removeEntry(entry);
+//}
 
 void DownloadDialog::refresh()
 {
--- branches/work/knewstuffrefactor/knewstuff3/ui/downloaddialog.h #1041138:1041139
@@ -28,7 +28,6 @@
 #include <ktitlewidget.h>
 
 #include <knewstuff3/engine.h>
-#include <knewstuff3/core/feed.h>
 #include <knewstuff3/core/category.h>
 
 #include "ui_DownloadDialog.h"
@@ -108,8 +107,8 @@
     void slotProvidersFailed();
     
     /** slot to add an entry (connected to the engine's signalEntryAdded */
-    void slotEntryLoaded(KNS3::Entry *entry, const KNS3::Feed *feed, const KNS3::Provider *provider);
-    void slotEntryRemoved(KNS3::Entry *entry, const KNS3::Feed *feed);
+    //void slotEntryLoaded(KNS3::Entry *entry, const KNS3::Feed *feed, const KNS3::Provider *provider);
+    //void slotEntryRemoved(KNS3::Entry *entry, const KNS3::Feed *feed);
     void slotEntriesFailed();
     void slotPayloadFailed(KNS3::Entry * entry);
     void slotPayloadLoaded(KUrl url);
@@ -156,12 +155,12 @@
 
     Engine *m_engine;
     QMap<QString, QString> categorymap;
-    QMap<const Feed*, KNS3::ItemsModel*> m_models;
+    QMap<const QString, KNS3::ItemsModel*> m_models;
     QSortFilterProxyModel * m_filteredModel;
     ItemsViewDelegate * mDelegate;
 
     //QList<Entry*> m_entries;
-    QMap<const Feed*, Entry::List> entries;
+    QMap<const QString, Entry::List> entries;
     QMap<const Provider*, Entry::List> m_entriesByProvider;
     QMap<Entry*, const Provider*> m_entryToProviders;
     
[prev in list] [next in list] [prev in thread] [next in thread]