Commit 9e662646 authored by Harald Sitter's avatar Harald Sitter 🚔

port away from browser extension compat

this extension is only relevant for konqueror and had no impact on actual
functionality so it is a simply removal of affected code
parent cea5c2b3
...@@ -74,8 +74,6 @@ MainWindow::MainWindow() ...@@ -74,8 +74,6 @@ MainWindow::MainWindow()
connect(m_part, &Part::canceled, this, &MainWindow::scanFailed); connect(m_part, &Part::canceled, this, &MainWindow::scanFailed);
connect(m_part, &Part::canceled, m_histories, &HistoryCollection::stop); connect(m_part, &Part::canceled, m_histories, &HistoryCollection::stop);
#warning port
// connect(BrowserExtension::childObject(m_part), &KParts::BrowserExtension::openUrlNotify, this, &MainWindow::urlAboutToChange);
const KConfigGroup config = KSharedConfig::openConfig()->group("general"); const KConfigGroup config = KSharedConfig::openConfig()->group("general");
m_combo->setHistoryItems(config.readPathEntry("comboHistory", QStringList())); m_combo->setHistoryItems(config.readPathEntry("comboHistory", QStringList()));
......
...@@ -50,16 +50,9 @@ ...@@ -50,16 +50,9 @@
namespace Filelight { namespace Filelight {
BrowserExtension::BrowserExtension(Part *parent)
// : KParts::BrowserExtension(parent)
: QObject(parent)
{}
Part::Part(QWidget *parentWidget, QObject *parent, const QList<QVariant>&) Part::Part(QWidget *parentWidget, QObject *parent, const QList<QVariant>&)
: KXmlGuiWindow(parentWidget) : KXmlGuiWindow(parentWidget)
, m_summary(nullptr) , m_summary(nullptr)
, m_ext(new BrowserExtension(this))
, m_map(nullptr) , m_map(nullptr)
, m_started(false) , m_started(false)
, m_widget(nullptr) , m_widget(nullptr)
...@@ -199,10 +192,6 @@ QString Part::prettyUrl() const { ...@@ -199,10 +192,6 @@ QString Part::prettyUrl() const {
void void
Part::updateURL(const QUrl &u) Part::updateURL(const QUrl &u)
{ {
//the map has changed internally, update the interface to reflect this
emit m_ext->openUrlNotify(); //must be done first
emit m_ext->setLocationBarUrl(u.toString(QUrl::PreferLocalFile));
if (m_manager->running()) if (m_manager->running())
m_manager->abort(); m_manager->abort();
......
...@@ -40,23 +40,6 @@ namespace Filelight ...@@ -40,23 +40,6 @@ namespace Filelight
class Part; class Part;
class SummaryWidget; class SummaryWidget;
// COMPAT
class BrowserExtension : public
// KParts::BrowserExtension
QObject
{
Q_OBJECT
public:
explicit BrowserExtension(Part*);
signals:
void openUrlNotify();
void setLocationBarUrl(QString);
};
class Part : public class Part : public
// KParts::ReadOnlyPart // KParts::ReadOnlyPart
KXmlGuiWindow KXmlGuiWindow
...@@ -92,7 +75,6 @@ private: ...@@ -92,7 +75,6 @@ private:
QLayout *m_layout; QLayout *m_layout;
SummaryWidget *m_summary; SummaryWidget *m_summary;
BrowserExtension *m_ext;
RadialMap::Widget *m_map; RadialMap::Widget *m_map;
QWidget *m_stateWidget; QWidget *m_stateWidget;
class ScanManager *m_manager; class ScanManager *m_manager;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment