Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

PluginProxy: Set MainApplication as parent

Browse Source
This commit is contained in:
David Rosca 2018-02-07 11:20:42 +01:00
parent f7e64e2353
commit fd759ded62
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/app/mainapplication.cpp
View File

@ -308,7 +308,7 @@ MainApplication::MainApplication(int &argc, char** argv)
translateApp(); translateApp();
loadSettings(); loadSettings();
m_plugins = new PluginProxy; m_plugins = new PluginProxy(this);
m_autoFill = new AutoFill(this); m_autoFill = new AutoFill(this);
if (!noAddons) if (!noAddons)
@ -355,8 +355,9 @@ MainApplication::~MainApplication()
// Delete all classes that are saving data in destructor // Delete all classes that are saving data in destructor
delete m_bookmarks; delete m_bookmarks;
m_bookmarks = nullptr;
delete m_cookieJar; delete m_cookieJar;
delete m_plugins; m_cookieJar = nullptr;
Settings::syncSettings(); Settings::syncSettings();
} }

6
src/lib/plugins/pluginproxy.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* Falkon - Qt web browser * Falkon - Qt web browser
* Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com> * Copyright (C) 2010-2018 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -22,8 +22,8 @@
#include <QMenu> #include <QMenu>
PluginProxy::PluginProxy() PluginProxy::PluginProxy(QObject *parent)
: Plugins() : Plugins(parent)
{ {
connect(this, SIGNAL(pluginUnloaded(PluginInterface*)), this, SLOT(pluginUnloaded(PluginInterface*))); connect(this, SIGNAL(pluginUnloaded(PluginInterface*)), this, SLOT(pluginUnloaded(PluginInterface*)));
} }

2
src/lib/plugins/pluginproxy.h
View File

@ -35,7 +35,7 @@ public:
WheelEventHandler WheelEventHandler
}; };
explicit PluginProxy(); explicit PluginProxy(QObject *parent = nullptr);
void registerAppEventHandler(const EventHandlerType &type, PluginInterface* obj); void registerAppEventHandler(const EventHandlerType &type, PluginInterface* obj);