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

List:       kde-commits
Subject:    [kdepim/akregator_port] akregator2/src: Remove/port some disabled code
From:       Frank Osterfeld <osterfeld () kde ! org>
Date:       2013-03-02 11:24:24
Message-ID: 20130302112424.ADDADA60D4 () git ! kde ! org
[Download RAW message or body]

Git commit 99098cd2d4796d76e303703b9fbec1823b30e77a by Frank Osterfeld.
Committed on 02/03/2013 at 11:48.
Pushed by osterfeld into branch 'akregator_port'.

Remove/port some disabled code

M  +4    -57   akregator2/src/articleviewer.cpp
M  +0    -4    akregator2/src/articleviewer.h
M  +3    -3    akregator2/src/createfoldercommand.cpp

http://commits.kde.org/kdepim/99098cd2d4796d76e303703b9fbec1823b30e77a

diff --git a/akregator2/src/articleviewer.cpp b/akregator2/src/articleviewer.cpp
index 349f782..ca5948d 100644
--- a/akregator2/src/articleviewer.cpp
+++ b/akregator2/src/articleviewer.cpp
@@ -414,34 +414,6 @@ void ArticleViewer::slotPrint( )
     m_part->view()->print();
 }
 
-
-#ifdef KRSS_PORT_DISABLED
-
-void ArticleViewer::connectToNode(TreeNode* node)
-{
-    if (node)
-    {
-        if (m_viewMode == CombinedView)
-        {
-            connect( node, SIGNAL(signalChanged(Akregator2::TreeNode*)), this, \
                SLOT(slotUpdateCombinedView()) );
-            connect( node, \
SIGNAL(signalArticlesAdded(Akregator2::TreeNode*,QList<Akregator2::Article>)), this, \
                SLOT(slotArticlesAdded(Akregator2::TreeNode*,QList<Akregator2::Article>)));
                
-            connect( node, \
SIGNAL(signalArticlesRemoved(Akregator2::TreeNode*,QList<Akregator2::Article>)), \
                this, \
                SLOT(slotArticlesRemoved(Akregator2::TreeNode*,QList<Akregator2::Article>)));
                
-            connect( node, \
SIGNAL(signalArticlesUpdated(Akregator2::TreeNode*,QList<Akregator2::Article>)), \
                this, \
                SLOT(slotArticlesUpdated(Akregator2::TreeNode*,QList<Akregator2::Article>)));
                
-        }
-        if (m_viewMode == SummaryView)
-            connect( node, SIGNAL(signalChanged(Akregator2::TreeNode*)), this, \
                SLOT(slotShowSummary(Akregator2::TreeNode*)) );
-
-        connect( node, SIGNAL(signalDestroyed(Akregator2::TreeNode*)), this, \
                SLOT(slotClear()) );
-    }
-}
-
-void ArticleViewer::disconnectFromNode(TreeNode* node)
-{
-    if (node)
-        node->disconnect( this );
-}
-#endif //KRSS_PORT_DISABLED
-
 void ArticleViewer::renderContent(const QString& text)
 {
     m_part->closeUrl();
@@ -589,12 +561,10 @@ void ArticleViewer::slotUpdateCombinedView()
 
 void ArticleViewer::slotClear()
 {
-#ifdef KRSS_PORT_DISABLED
-    disconnectFromNode(m_node);
-#else
-    kWarning() << "Code temporarily disabled (Akonadi port)";
-#endif //KRSS_PORT_DISABLED
-
+    if ( m_model ) {
+        m_model->disconnect( this );
+        m_model = 0;
+    }
     renderContent(QString());
 }
 
@@ -635,29 +605,6 @@ static bool lessByDate( const KRss::Item& lhs, const KRss::Item& \
rhs ) {  return lhs.dateUpdated() < rhs.dateUpdated();
 }
 
-#ifdef KRSS_PORT_DISABLED
-void ArticleViewer::slotArticlesListed( KJob* job ) {
-    assert( job );
-    assert( job == m_listJob );
-
-
-    if ( job->error() ) {
-        kWarning() << job->errorText();
-        slotUpdateCombinedView();
-        return;
-    }
-
-    m_items = m_listJob->items();
-    std::sort( m_items.begin(), m_items.end(), !bind( lessByDate, _1, _2 ) );
-
-    if (!m_items.isEmpty())
-        m_link = m_items.first().link();
-    else
-        m_link = KUrl();
-    slotUpdateCombinedView();
-}
-#endif
-
 void ArticleViewer::keyPressEvent(QKeyEvent* e)
 {
     e->ignore();
diff --git a/akregator2/src/articleviewer.h b/akregator2/src/articleviewer.h
index 5a43af0..df74397 100644
--- a/akregator2/src/articleviewer.h
+++ b/akregator2/src/articleviewer.h
@@ -175,10 +175,6 @@ class ArticleViewer : public QWidget
 
         void updateCss();
 
-#ifdef KRSS_PORT_DISABLED
-        void connectToNode(TreeNode* node);
-        void disconnectFromNode(TreeNode* node);
-#endif
         void setArticleActionsEnabled(bool enabled);
 
     private:
diff --git a/akregator2/src/createfoldercommand.cpp \
b/akregator2/src/createfoldercommand.cpp index fb39c0c..ddbc112 100644
--- a/akregator2/src/createfoldercommand.cpp
+++ b/akregator2/src/createfoldercommand.cpp
@@ -77,10 +77,10 @@ void CreateFolderCommand::Private::collectionCreated( KJob* j )
         q->emitResult();
         return;
     }
-#ifdef KRSS_PORT_DISABLED
+    CollectionCreateJob* job = qobject_cast<CollectionCreateJob*>( j );
+    Q_ASSERT( job );
     if ( feedListView )
-        feedListView->scrollToTag( job->tag() );
-#endif
+        feedListView->scrollToCollection( job->collection() );
     q->emitResult();
 }
 


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