[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim/work/akonadi-ports] akregator/src: kill the kernel
From: Frank Osterfeld <frank.osterfeld () kdab ! com>
Date: 2011-09-26 21:50:18
Message-ID: 20110926215018.E0E14A607A () git ! kde ! org
[Download RAW message or body]
Git commit 38a9e3866cb9d76157efb6368bbb6b2192a0dfcd by Frank Osterfeld.
Committed on 26/09/2011 at 21:45.
Pushed by osterfeld into branch 'work/akonadi-ports'.
kill the kernel
M +0 -1 akregator/src/CMakeLists.txt
M +0 -1 akregator/src/actionmanagerimpl.cpp
M +0 -1 akregator/src/addfeeddialog.cpp
M +6 -7 akregator/src/akregator_part.cpp
D +0 -68 akregator/src/kernel.cpp
D +0 -53 akregator/src/kernel.h
M +26 -21 akregator/src/mainwidget.cpp
M +4 -0 akregator/src/mainwidget.h
M +0 -1 akregator/src/tabwidget.cpp
M +1 -1 akregator/src/utils/filtercolumnsproxymodel.cpp
http://commits.kde.org/kdepim/38a9e3866cb9d76157efb6368bbb6b2192a0dfcd
diff --git a/akregator/src/CMakeLists.txt b/akregator/src/CMakeLists.txt
index 450e107..45987ea 100644
--- a/akregator/src/CMakeLists.txt
+++ b/akregator/src/CMakeLists.txt
@@ -86,7 +86,6 @@ set(akregatorpart_PART_SRCS
# importitemsjob.cpp
tabwidget.cpp
# progressmanager.cpp
- kernel.cpp
modifycommands.cpp
akregator_part.cpp
mainwidget.cpp
diff --git a/akregator/src/actionmanagerimpl.cpp \
b/akregator/src/actionmanagerimpl.cpp index 5fcad75..b17a121 100644
--- a/akregator/src/actionmanagerimpl.cpp
+++ b/akregator/src/actionmanagerimpl.cpp
@@ -28,7 +28,6 @@
#include "articlelistview.h"
#include "articleviewer.h"
#include "framemanager.h"
-#include "kernel.h"
#include "mainwidget.h"
#include "speechclient.h"
#include "tabwidget.h"
diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp
index 96ce0df..1905958 100644
--- a/akregator/src/addfeeddialog.cpp
+++ b/akregator/src/addfeeddialog.cpp
@@ -23,7 +23,6 @@
*/
#include "addfeeddialog.h"
-#include "kernel.h"
#include <kdebug.h>
#include <kiconloader.h>
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index f2962da..a676906 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -29,7 +29,6 @@
#include "actionmanagerimpl.h"
#include "feediconmanager.h"
#include "framemanager.h"
-#include "kernel.h"
#include "mainwidget.h"
#include "notificationmanager.h"
#include "plugin.h"
@@ -121,12 +120,12 @@ Part::Part( QWidget *parentWidget, QObject *parent, const \
QVariantList& )
m_mainWidget = new MainWidget( this, m_parentWidget, m_actionManager );
- connect(Kernel::self()->frameManager(), SIGNAL(signalCaptionChanged(const \
QString&)), this, SIGNAL(setWindowCaption(const QString&)));
- connect(Kernel::self()->frameManager(), SIGNAL(signalStatusText(const \
QString&)), this, SLOT(slotSetStatusText(const QString&)));
- connect(Kernel::self()->frameManager(), SIGNAL(signalLoadingProgress(int)), \
m_extension, SIGNAL(loadingProgress(int)));
- connect(Kernel::self()->frameManager(), SIGNAL(signalCanceled(const QString&)), \
this, SIGNAL(canceled(const QString&)));
- connect(Kernel::self()->frameManager(), SIGNAL(signalStarted()), this, \
SLOT(slotStarted()));
- connect(Kernel::self()->frameManager(), SIGNAL(signalCompleted()), this, \
SIGNAL(completed())); + connect(m_mainWidget->frameManager(), \
SIGNAL(signalCaptionChanged(const QString&)), this, SIGNAL(setWindowCaption(const \
QString&))); + connect(m_mainWidget->frameManager(), SIGNAL(signalStatusText(const \
QString&)), this, SLOT(slotSetStatusText(const QString&))); + \
connect(m_mainWidget->frameManager(), SIGNAL(signalLoadingProgress(int)), \
m_extension, SIGNAL(loadingProgress(int))); + \
connect(m_mainWidget->frameManager(), SIGNAL(signalCanceled(const QString&)), this, \
SIGNAL(canceled(const QString&))); + connect(m_mainWidget->frameManager(), \
SIGNAL(signalStarted()), this, SLOT(slotStarted())); + \
connect(m_mainWidget->frameManager(), SIGNAL(signalCompleted()), this, \
SIGNAL(completed()));
// notify the part that this is our internal widget
setWidget(m_mainWidget);
diff --git a/akregator/src/kernel.cpp b/akregator/src/kernel.cpp
deleted file mode 100644
index dc9feed..0000000
--- a/akregator/src/kernel.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- This file is part of Akregator.
-
- Copyright (C) 2005 Frank Osterfeld <osterfeld@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
-*/
-
-#include "kernel.h"
-#include "framemanager.h"
-
-#include <k3staticdeleter.h>
-
-namespace Akregator
-{
-
-Kernel* Kernel::m_self = 0;
-
-static K3StaticDeleter<Kernel> kernelsd;
-
-Kernel* Kernel::self()
-{
- if (!m_self)
- m_self = kernelsd.setObject(m_self, new Kernel);
- return m_self;
-}
-
-class Kernel::KernelPrivate
-{
- public:
-
- FrameManager* frameManager;
-};
-
-Kernel::Kernel() : d(new KernelPrivate)
-{
- d->frameManager = new FrameManager();
-}
-
-Kernel::~Kernel()
-{
- delete d->frameManager;
- delete d;
- d = 0;
-}
-
-FrameManager* Kernel::frameManager()
-{
- return d->frameManager;
-}
-
-} // namespace Akregator
diff --git a/akregator/src/kernel.h b/akregator/src/kernel.h
deleted file mode 100644
index 678f248..0000000
--- a/akregator/src/kernel.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- This file is part of Akregator.
-
- Copyright (C) 2005 Frank Osterfeld <osterfeld@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- As a special exception, permission is given to link this program
- with any edition of Qt, and distribute the resulting executable,
- without including the source code for Qt in the source distribution.
-*/
-
-#ifndef AKREGATOR_KERNEL_H
-#define AKREGATOR_KERNEL_H
-
-namespace Akregator {
-
-class FrameManager;
-
-class Kernel
-{
- public:
-
- static Kernel* self();
-
- ~Kernel();
-
- FrameManager* frameManager();
-
- private:
- Kernel();
-
- static Kernel* m_self;
-
- class KernelPrivate;
- KernelPrivate* d;
-};
-
-} // namespace Akregator
-
-#endif // AKREGATOR_KERNEL_H
diff --git a/akregator/src/mainwidget.cpp b/akregator/src/mainwidget.cpp
index 52b87db..6a51b08 100644
--- a/akregator/src/mainwidget.cpp
+++ b/akregator/src/mainwidget.cpp
@@ -40,7 +40,6 @@
#include "importfeedlistcommand.h"
#include "exportfeedlistcommand.h"
#include "framemanager.h"
-#include "kernel.h"
#include "notificationmanager.h"
#include "openurlrequest.h"
#ifdef WITH_LIBKDEPIM
@@ -123,14 +122,20 @@ Akregator::MainWidget::~MainWidget()
delete d;
}
+Akregator::FrameManager* Akregator::MainWidget::frameManager() const {
+ return m_frameManager;
+}
+
Akregator::MainWidget::MainWidget( Part *part, QWidget *parent, ActionManagerImpl* \
actionManager) : QWidget(parent),
d( new Private( this ) ),
m_viewMode(NormalView),
- m_actionManager(actionManager)
+ m_actionManager(actionManager),
+ m_frameManager( new FrameManager( this, this ) )
+
{
m_actionManager->initMainWidget(this);
- m_actionManager->initFrameManager(Kernel::self()->frameManager());
+ m_actionManager->initFrameManager(m_frameManager);
m_part = part;
m_shuttingDown = false;
m_displayingAboutPage = false;
@@ -161,24 +166,24 @@ Akregator::MainWidget::MainWidget( Part *part, QWidget *parent, \
ActionManagerImp m_tabWidget, SLOT(slotSettingsChanged()));
connect( m_tabWidget, SIGNAL(signalCurrentFrameChanged(int)),
- Kernel::self()->frameManager(), SLOT(slotChangeFrame(int)));
+ m_frameManager, SLOT(slotChangeFrame(int)));
connect( m_tabWidget, SIGNAL(signalRemoveFrameRequest(int)),
- Kernel::self()->frameManager(), SLOT(slotRemoveFrame(int)));
+ m_frameManager, SLOT(slotRemoveFrame(int)));
connect( m_tabWidget, SIGNAL(signalOpenUrlRequest(Akregator::OpenUrlRequest&)),
- Kernel::self()->frameManager(), \
SLOT(slotOpenUrlRequest(Akregator::OpenUrlRequest&))); + m_frameManager, \
SLOT(slotOpenUrlRequest(Akregator::OpenUrlRequest&)));
- connect( Kernel::self()->frameManager(), \
SIGNAL(signalFrameAdded(Akregator::Frame*)), + connect( m_frameManager, \
SIGNAL(signalFrameAdded(Akregator::Frame*)), m_tabWidget, \
SLOT(slotAddFrame(Akregator::Frame*)));
- connect( Kernel::self()->frameManager(), SIGNAL(signalSelectFrame(int)),
+ connect( m_frameManager, SIGNAL(signalSelectFrame(int)),
m_tabWidget, SLOT(slotSelectFrame(int)) );
- connect( Kernel::self()->frameManager(), SIGNAL(signalFrameRemoved(int)),
+ connect( m_frameManager, SIGNAL(signalFrameRemoved(int)),
m_tabWidget, SLOT(slotRemoveFrame(int)));
- connect( Kernel::self()->frameManager(), SIGNAL(signalRequestNewFrame(int&)),
+ connect( m_frameManager, SIGNAL(signalRequestNewFrame(int&)),
this, SLOT( slotRequestNewFrame(int&) ) );
m_tabWidget->setWhatsThis( i18n("You can view multiple articles in several open \
tabs.")); @@ -244,7 +249,7 @@ Akregator::MainWidget::MainWidget( Part *part, QWidget \
*parent, ActionManagerImp m_articleListView->setFocusProxy(m_articleViewer);
connect( m_articleViewer, SIGNAL(signalOpenUrlRequest(Akregator::OpenUrlRequest& \
)),
- Kernel::self()->frameManager(), SLOT(slotOpenUrlRequest( \
Akregator::OpenUrlRequest& )) ); + m_frameManager, \
SLOT(slotOpenUrlRequest( Akregator::OpenUrlRequest& )) );
connect( m_articleViewer->part()->browserExtension(), SIGNAL(mouseOverInfo( \
KFileItem )), this, SLOT(slotMouseOverInfo( KFileItem )) );
connect( m_part, SIGNAL(signalSettingsChanged()),
@@ -258,7 +263,7 @@ Akregator::MainWidget::MainWidget( Part *part, QWidget *parent, \
ActionManagerImp
m_mainFrame = new MainFrame( this, m_part, m_mainTab );
m_mainFrame->slotSetTitle( i18n("Articles") );
- Kernel::self()->frameManager()->slotAddFrame(m_mainFrame);
+ m_frameManager->slotAddFrame(m_mainFrame);
const QList<int> sp1sizes = Settings::splitter1Sizes();
if ( sp1sizes.count() >= m_horizontalSplitter->count() )
@@ -343,7 +348,7 @@ void Akregator::MainWidget::slotRequestNewFrame(int& frameId)
connect( m_part, SIGNAL(signalSettingsChanged()), frame, \
SLOT(slotPaletteOrFontChanged()));
- Kernel::self()->frameManager()->slotAddFrame(frame);
+ m_frameManager->slotAddFrame(frame);
frameId = frame->id();
}
@@ -353,7 +358,7 @@ void Akregator::MainWidget::sendArticle(bool attach)
QByteArray text;
QString title;
- Frame* frame = Kernel::self()->frameManager()->currentFrame();
+ Frame* frame = m_frameManager->currentFrame();
if (frame && frame->id() > 0) { // are we in some other tab than the \
articlelist? text = frame->url().prettyUrl().toLatin1();
@@ -762,7 +767,7 @@ void Akregator::MainWidget::slotMouseButtonPressed(int button, \
const KUrl& url) req.setOpenInBackground(false);
}
- Kernel::self()->frameManager()->slotOpenUrlRequest(req);
+ m_frameManager->slotOpenUrlRequest(req);
}
void Akregator::MainWidget::slotOpenHomepage()
@@ -776,7 +781,7 @@ void Akregator::MainWidget::slotOpenHomepage()
if (url.isValid()) {
OpenUrlRequest req( url );
req.setOptions(OpenUrlRequest::ExternalBrowser);
- Kernel::self()->frameManager()->slotOpenUrlRequest(req);
+ m_frameManager->slotOpenUrlRequest(req);
}
}
@@ -796,7 +801,7 @@ void Akregator::MainWidget::slotOpenItemInBrowser( const \
KRss::Item& item )
OpenUrlRequest req( link );
req.setOptions( OpenUrlRequest::ExternalBrowser );
- Kernel::self()->frameManager()->slotOpenUrlRequest( req );
+ m_frameManager->slotOpenUrlRequest( req );
}
@@ -815,7 +820,7 @@ void Akregator::MainWidget::slotOpenSelectedArticles()
// TODO: (re-)add a setting for foreground/background
// and use it here
//req.setOpenInBackground( true );
- Kernel::self()->frameManager()->slotOpenUrlRequest( req );
+ m_frameManager->slotOpenUrlRequest( req );
}
}
@@ -967,7 +972,7 @@ void Akregator::MainWidget::slotSetSelectedArticleRead()
void Akregator::MainWidget::slotTextToSpeechRequest()
{
- if (Kernel::self()->frameManager()->currentFrame() == m_mainFrame)
+ if (m_frameManager->currentFrame() == m_mainFrame)
{
if (m_viewMode != CombinedView)
{
@@ -1031,7 +1036,7 @@ void Akregator::MainWidget::readProperties(const KConfigGroup \
&config)
connect( m_part, SIGNAL(signalSettingsChanged()), frame, \
SLOT(slotPaletteOrFontChanged()));
- Kernel::self()->frameManager()->slotAddFrame(frame);
+ m_frameManager->slotAddFrame(frame);
}
}
@@ -1042,7 +1047,7 @@ void Akregator::MainWidget::saveProperties(KConfigGroup & \
config) config.writeEntry("searchLine", m_searchBar->text());
config.writeEntry("searchCombo", m_searchBar->status());
- Kernel::self()->frameManager()->saveProperties(config);
+ m_frameManager->saveProperties(config);
}
void Akregator::MainWidget::slotJobFinished( KJob *job )
diff --git a/akregator/src/mainwidget.h b/akregator/src/mainwidget.h
index d72df67..2c899dd 100644
--- a/akregator/src/mainwidget.h
+++ b/akregator/src/mainwidget.h
@@ -64,6 +64,7 @@ class ArticleViewer;
class Folder;
class FeedList;
class Frame;
+class FrameManager;
class Part;
class SearchBar;
class SubscriptionListView;
@@ -92,6 +93,8 @@ class AKREGATORPART_EXPORT MainWidget : public QWidget
/** saves settings. Make sure that the Settings singleton is not destroyed \
yet when saveSettings is called */ void saveSettings();
+ FrameManager* frameManager() const;
+
/**
* Add a feed to a group.
* @param url The URL of the feed to add.
@@ -254,6 +257,7 @@ class AKREGATORPART_EXPORT MainWidget : public QWidget
bool m_displayingAboutPage;
ActionManagerImpl* m_actionManager;
+ FrameManager* m_frameManager;
};
} // namespace Akregator
diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp
index 03e5d3e..2f4c228 100644
--- a/akregator/src/tabwidget.cpp
+++ b/akregator/src/tabwidget.cpp
@@ -54,7 +54,6 @@
#include "akregatorconfig.h"
#include "frame.h"
#include "framemanager.h"
-#include "kernel.h"
#include "openurlrequest.h"
#include "utils/temporaryvalue.h"
diff --git a/akregator/src/utils/filtercolumnsproxymodel.cpp \
b/akregator/src/utils/filtercolumnsproxymodel.cpp index 18450bd..97a71ec 100644
--- a/akregator/src/utils/filtercolumnsproxymodel.cpp
+++ b/akregator/src/utils/filtercolumnsproxymodel.cpp
@@ -29,7 +29,7 @@
using namespace Akregator;
FilterColumnsProxyModel::FilterColumnsProxyModel( QObject* parent )
- : QSortFilterProxyModel( parent ), m_mode( Whitelist ), m_vecSize( 0 )
+ : QSortFilterProxyModel( parent ), m_vecSize( 0 ), m_mode( Whitelist )
{
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic