From 67d1767533a8bfa87cc0744db469b890177307b7 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Sat, 1 Apr 2017 13:19:55 +0200 Subject: Moved CookiesForm into the ProfileDialog --- src/webengine/webengineprofile.cpp | 10 ++++------ src/webengine/webengineprofile.h | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'src/webengine') diff --git a/src/webengine/webengineprofile.cpp b/src/webengine/webengineprofile.cpp index a72f3cf..1ff27dc 100644 --- a/src/webengine/webengineprofile.cpp +++ b/src/webengine/webengineprofile.cpp @@ -28,7 +28,7 @@ WebEngineProfile::WebEngineProfile(QObject *parent) : { // Off-the-record constructor - m_cookiesForm = new CookiesWidget(cookieStore()); + m_profileDialog = new ProfileDialog(this); } WebEngineProfile::WebEngineProfile(const QString &storageName, QObject *parent) : @@ -37,7 +37,7 @@ WebEngineProfile::WebEngineProfile(const QString &storageName, QObject *parent) setPersistentStoragePath(sSettings->value("browser.profile.path").toString() + storageName); setCachePath(sSettings->value("browser.profile.path").toString() + storageName); - m_cookiesForm = new CookiesWidget(cookieStore()); + m_profileDialog = new ProfileDialog(this); QString profilePath = persistentStoragePath() + "/profile.ini"; qDebug("Reading profile from [%s]", qUtf8Printable(profilePath)); @@ -110,13 +110,11 @@ WebEngineProfile::~WebEngineProfile() if(!isOffTheRecord()) { saveProfile(); } - - m_cookiesForm->deleteLater(); } -CookiesWidget *WebEngineProfile::cookieUI() +ProfileDialog *WebEngineProfile::dialog() { - return m_cookiesForm; + return m_profileDialog; } void WebEngineProfile::saveProfile() diff --git a/src/webengine/webengineprofile.h b/src/webengine/webengineprofile.h index c93ae52..421ff0e 100644 --- a/src/webengine/webengineprofile.h +++ b/src/webengine/webengineprofile.h @@ -22,7 +22,7 @@ #define WEBENGINEPROFILE_H #include -#include "forms/cookiesform.h" +#include "forms/profiledialog.h" class WebEngineProfile : public QWebEngineProfile { @@ -33,7 +33,7 @@ public: ~WebEngineProfile(); - CookiesWidget *cookieUI(); + ProfileDialog *dialog(); signals: @@ -41,7 +41,7 @@ public slots: void saveProfile(); private: - CookiesWidget *m_cookiesForm; + ProfileDialog *m_profileDialog; }; #endif // WEBENGINEPROFILE_H -- cgit v1.2.1