From a6194c14cc24de796c2167282e053f4220f48206 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 21 Aug 2021 23:44:23 +0300 Subject: [PATCH] akregator: remove browser extension support Signed-off-by: Ivailo Monev --- akregator/src/akregator_part.cpp | 14 -------------- akregator/src/akregator_part.h | 18 +----------------- akregator/src/mainwindow.cpp | 14 -------------- akregator/src/mainwindow.h | 20 -------------------- 4 files changed, 1 insertion(+), 65 deletions(-) diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index 6d14b4c8..f4556d0f 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -151,18 +151,6 @@ static const KAboutData &createAboutData() K_PLUGIN_FACTORY(AkregatorFactory, registerPlugin();) K_EXPORT_PLUGIN(AkregatorFactory(createAboutData())) -BrowserExtension::BrowserExtension(Part *p, const char *name) - : KParts::BrowserExtension( p) -{ - setObjectName(name); - m_part=p; -} - -void BrowserExtension::saveSettings() -{ - m_part->saveSettings(); -} - Part::Part( QWidget *parentWidget, QObject *parent, const QVariantList& ) : inherited(parent) , m_standardListLoaded(false) @@ -216,10 +204,8 @@ Part::Part( QWidget *parentWidget, QObject *parent, const QVariantList& ) ActionManager::setInstance(m_actionManager); m_mainWidget = new Akregator::MainWidget(this, parentWidget, m_actionManager, "akregator_view"); - m_extension = new BrowserExtension(this, "ak_extension"); connect(Kernel::self()->frameManager(), SIGNAL(signalCaptionChanged(QString)), this, SIGNAL(setWindowCaption(QString))); - connect(Kernel::self()->frameManager(), SIGNAL(signalLoadingProgress(int)), m_extension, SIGNAL(loadingProgress(int))); connect(Kernel::self()->frameManager(), SIGNAL(signalCanceled(QString)), this, SIGNAL(canceled(QString))); connect(Kernel::self()->frameManager(), SIGNAL(signalStarted()), this, SLOT(slotStarted())); connect(Kernel::self()->frameManager(), SIGNAL(signalCompleted()), this, SIGNAL(completed())); diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h index 02f68aaf..09d56098 100644 --- a/akregator/src/akregator_part.h +++ b/akregator/src/akregator_part.h @@ -28,9 +28,9 @@ #include #include +#include #include -#include #include #include @@ -39,8 +39,6 @@ class KConfigGroup; class KUrl; class KCMultiDialog; -#include - namespace Akregator { namespace Backend { @@ -56,18 +54,6 @@ class MainWidget; class Part; class TrayIcon; -class BrowserExtension : public KParts::BrowserExtension -{ - Q_OBJECT - - public: - explicit BrowserExtension(Part *p, const char *name=0); - public slots: - void saveSettings(); - private: - Part *m_part; -}; - /** This is a RSS Aggregator "Part". It does all the real work. It is also embeddable into other applications (e.g. for use in Kontact). @@ -219,8 +205,6 @@ class Part : public KParts::ReadOnlyPart bool m_shuttingDown; bool m_doCrashSave; - KParts::BrowserExtension *m_extension; - QTimer* m_autosaveTimer; /** did we backup the feed list already? */ bool m_backedUpList; diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index eafb835e..bfc23744 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -46,16 +46,8 @@ using namespace Akregator; -BrowserInterface::BrowserInterface( MainWindow *shell, const char *name ) - : KParts::BrowserInterface( shell ) -{ - setObjectName(QLatin1String(name)); - m_shell = shell; -} - MainWindow::MainWindow( QWidget* parent, Qt::WindowFlags f ) : KParts::MainWindow( parent, f ) - , m_browserIface( new BrowserInterface( this, "browser_interface" ) ) , m_part() , m_statusLabel( new KSqueezedTextLabel( this ) ) { @@ -110,7 +102,6 @@ bool MainWindow::loadPart() connect(m_part, SIGNAL(setWindowCaption(QString)), this, SLOT(setCaption(QString)) ); createGUI(m_part); - browserExtension(m_part)->setBrowserInterface(m_browserIface); setAutoSaveSettings(); return true; } @@ -165,11 +156,6 @@ void MainWindow::applyNewToolbarConfig() applyMainWindowSettings(KGlobal::config()->group( autoSaveGroup()) ); } -KParts::BrowserExtension *MainWindow::browserExtension(KParts::ReadOnlyPart *p) -{ - return KParts::BrowserExtension::childObject( p ); -} - void MainWindow::slotQuit() { kapp->quit(); diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h index 9d791163..3c803488 100644 --- a/akregator/src/mainwindow.h +++ b/akregator/src/mainwindow.h @@ -27,8 +27,6 @@ #include #include -#include -#include #include #include @@ -41,18 +39,6 @@ namespace Akregator class Part; class MainWindow; -class BrowserInterface : public KParts::BrowserInterface -{ - Q_OBJECT - -public: - BrowserInterface(Akregator::MainWindow *shell, const char *name ); - -private: - Akregator::MainWindow *m_shell; -}; - - /** * This is the application "Shell". It has a menubar, toolbar, and * statusbar but relies on the "Part" to do all the real work. @@ -99,10 +85,6 @@ protected: protected slots: void slotQuit(); -private: - - KParts::BrowserExtension *browserExtension(KParts::ReadOnlyPart *p); - private slots: void optionsConfigureKeys(); @@ -111,8 +93,6 @@ private slots: void slotOnShutdown(); private: - BrowserInterface *m_browserIface; - QPointer m_part; KSqueezedTextLabel *m_statusLabel; }; -- 2.11.0