From 329e8de84fc8e0a2e4a04fbaf85ab0e1632c6084 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Fri, 1 Jun 2018 17:27:58 +0200
Subject: Only add profiles to profile manager at init

---
 plugins/ProfileEditor/forms/profilemanagerdialog.cpp | 20 +++++++++-----------
 plugins/ProfileEditor/forms/profilemanagerdialog.h   |  9 ++++-----
 plugins/ProfileEditor/forms/profileview.cpp          |  2 +-
 3 files changed, 14 insertions(+), 17 deletions(-)

(limited to 'plugins/ProfileEditor/forms')

diff --git a/plugins/ProfileEditor/forms/profilemanagerdialog.cpp b/plugins/ProfileEditor/forms/profilemanagerdialog.cpp
index c5fec2b..fbf7ad4 100644
--- a/plugins/ProfileEditor/forms/profilemanagerdialog.cpp
+++ b/plugins/ProfileEditor/forms/profilemanagerdialog.cpp
@@ -1,17 +1,21 @@
 #include "profilemanagerdialog.h"
+#include "profileview.h"
 #include "ui_profilemanagerdialog.h"
 #include <QWebEngineProfile>
-#include <QLabel>
-#include "profileview.h"
 
-ProfileManagerDialog::ProfileManagerDialog(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::ProfileManagerDialog)
+ProfileManagerDialog::ProfileManagerDialog(QHash<QString, QWebEngineProfile *> &profiles, QWidget *parent)
+    : QDialog(parent)
+    , ui(new Ui::ProfileManagerDialog)
+    , profiles(profiles)
 {
     ui->setupUi(this);
 
     connect(ui->listWidget, &QListWidget::itemPressed, this, &ProfileManagerDialog::showProfile);
     showProfile(nullptr);
+
+    for(const QString &name : profiles.keys()) {
+        ui->listWidget->addItem(name);
+    }
 }
 
 ProfileManagerDialog::~ProfileManagerDialog()
@@ -19,12 +23,6 @@ ProfileManagerDialog::~ProfileManagerDialog()
     delete ui;
 }
 
-void ProfileManagerDialog::addProfile(const QString &name, QWebEngineProfile *profile)
-{
-    profiles.insert(name, profile);
-    ui->listWidget->addItem(name);
-}
-
 void ProfileManagerDialog::showProfile(QListWidgetItem *item)
 {
     // clear out groupbox layout
diff --git a/plugins/ProfileEditor/forms/profilemanagerdialog.h b/plugins/ProfileEditor/forms/profilemanagerdialog.h
index ed79824..9ce177d 100644
--- a/plugins/ProfileEditor/forms/profilemanagerdialog.h
+++ b/plugins/ProfileEditor/forms/profilemanagerdialog.h
@@ -4,7 +4,8 @@
 #include <QDialog>
 #include <QHash>
 
-namespace Ui {
+namespace Ui
+{
 class ProfileManagerDialog;
 }
 
@@ -15,17 +16,15 @@ class ProfileManagerDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit ProfileManagerDialog(QWidget *parent = 0);
+    explicit ProfileManagerDialog(QHash<QString, QWebEngineProfile *> &profiles, QWidget *parent = 0);
     ~ProfileManagerDialog();
 
-    void addProfile(const QString &name, QWebEngineProfile *profile);
-
 private slots:
     void showProfile(QListWidgetItem *item);
 
 private:
     Ui::ProfileManagerDialog *ui;
-    QHash<QString, QWebEngineProfile *> profiles;
+    const QHash<QString, QWebEngineProfile *> profiles;
 };
 
 #endif // PROFILEMANAGERDIALOG_H
diff --git a/plugins/ProfileEditor/forms/profileview.cpp b/plugins/ProfileEditor/forms/profileview.cpp
index e073dbb..b53cc7d 100644
--- a/plugins/ProfileEditor/forms/profileview.cpp
+++ b/plugins/ProfileEditor/forms/profileview.cpp
@@ -12,7 +12,7 @@
 
 inline void connectSetting(QCheckBox *checkBox, QWebEngineSettings *settings, QWebEngineSettings::WebAttribute attr)
 {
-    QObject::connect(checkBox, &QCheckBox::clicked, [settings, attr](bool checked){
+    QObject::connect(checkBox, &QCheckBox::clicked, [settings, attr](bool checked) {
         settings->setAttribute(attr, checked);
     });
 }
-- 
cgit v1.2.1