Code cleanup

- Replace Browser::getProfileManager with WebProfileManager::instance
- Make WebProfileManager::profileMenu a free function
- Replace Browser::loadProfile with Browser::loadProfiles

1 files changed, 13 insertions, 15 deletions

diff --git a/src/browser.h b/src/browser.h
index fb47c46..a16bd6d 100644
--- a/src/browser.h
+++ b/src/browser.h
@@ -11,12 +11,12 @@
 
 #include "session/session.h"
 #include <QJsonObject>
+#include <QMenu>
+#include <QPluginLoader>
 #include <QVector>
 #include <functional>
 #include <memory>
 #include <singleapplication.h>
-#include <QMenu>
-#include <QPluginLoader>
 
 class UrlFilter;
 class Configuration;
@@ -38,14 +38,8 @@ public slots:
 
 public:
     // interface
-    [[deprecated]]
-    WebProfileManager *getProfileManager();
-    [[deprecated]]
-    const QList<QPair<QString, Profile *>> profileList() const;
-    [[deprecated]]
-    QPair<QString, Profile *> loadProfile(const QString &id, bool isOffTheRecord = true);
-    [[deprecated]]
-    void removeProfile(const QString &id);
+    [[deprecated]] const QList<QPair<QString, Profile *>> profileList() const;
+    void loadProfiles(const QStringList &profilePaths);
 
     QPluginLoader *addPlugin(const QString &path = QString());
 
@@ -56,10 +50,12 @@ public:
         return qAsConst(m_windows);
     }
 
-    BookmarksWidget *bookmarks() const {
+    BookmarksWidget *bookmarks() const
+    {
         return m_bookmarks.get();
     }
-    DownloadsWidget *downloads() const {
+    DownloadsWidget *downloads() const
+    {
         return m_downloads.get();
     }
 
@@ -69,10 +65,12 @@ public slots:
 
 private:
     struct PluginInfo {
-        explicit PluginInfo(QPluginLoader *l) {
+        explicit PluginInfo(QPluginLoader *l)
+        {
             this->loader = l;
         }
-        ~PluginInfo() {
+        ~PluginInfo()
+        {
             loader->unload();
             for(auto *m : menus)
                 m->deleteLater();
@@ -91,7 +89,7 @@ private:
     QVector<UrlFilter *> m_filters;
 
     QVector<MainWindow *> m_windows;
-    QVector<PluginInfo*> m_plugins;
+    QVector<PluginInfo *> m_plugins;
 };
 
 #endif // SMOLBOTE_BROWSER_H