diff options
author | Aqua-sama <aqua@iserlohn-fortress.net> | 2017-09-20 13:04:02 +0200 |
---|---|---|
committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2017-09-20 13:04:02 +0200 |
commit | 7cbcc16156dd6ab4786d466ea39857bde4bdd2c7 (patch) | |
tree | 9d6a4a0cdb80130c55756b2357deffee37d49185 /src/browser.h | |
parent | Fixed bug opening URLs from the command line while instance is running (diff) | |
download | smolbote-7cbcc16156dd6ab4786d466ea39857bde4bdd2c7.tar.xz |
Fixed bug with starting up if the local socket wasn't cleaned up
Diffstat (limited to 'src/browser.h')
-rw-r--r-- | src/browser.h | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/browser.h b/src/browser.h index 0edaf0c..43ff1f4 100644 --- a/src/browser.h +++ b/src/browser.h @@ -22,7 +22,6 @@ #define BROWSER_H #include "singleapplication.h" -#include <QVector> #include <bookmarks/bookmarkswidget.h> #include "forms/downloadswidget.h" #include "settings.h" @@ -34,8 +33,9 @@ #ifdef qApp #undef qApp -#define qApp Browser::instance() #endif +#define qApp Browser::instance() + #define sSettings Browser::instance()->settings() #define sNetwork Browser::instance()->network() @@ -45,7 +45,7 @@ class Browser : public SingleApplication Q_OBJECT public: - Browser(int &argc, char *argv[]); + explicit Browser(int &argc, char *argv[]); ~Browser(); QString applicationLongVersion() const; @@ -62,7 +62,7 @@ public: DownloadsWidget *downloads(); BlockerManager *blocklists(); - MainWindow *mainWindow(); + MainWindow *activeWindow(); WebEngineProfile *profile(const QString name); QStringList profiles(); @@ -73,21 +73,23 @@ public: public slots: void addWindow(MainWindow* window); MainWindow *addWindow(const QStringList params); - void removeWindow(MainWindow* window); + void clean(); private: - Settings *m_settings; + Q_DISABLE_COPY(Browser) + + Settings *m_settings = nullptr; - QVector<MainWindow *> m_windows; + QVector<QPointer<MainWindow>> m_windows; QHash<QString, WebEngineProfile *> m_profiles; - QNetworkAccessManager *m_networkAccessManager; - UrlRequestInterceptor *m_urlRequestInterceptor; - BookmarksWidget *m_bookmarksManager; - DownloadsWidget *m_downloadManager; - BlockerManager *m_blocklistManager; + QNetworkAccessManager *m_networkAccessManager = nullptr; + UrlRequestInterceptor *m_urlRequestInterceptor = nullptr; + BookmarksWidget *m_bookmarksManager = nullptr; + DownloadsWidget *m_downloadManager = nullptr; + BlockerManager *m_blocklistManager = nullptr; - QObject *m_plugin; + QObject *m_plugin = nullptr; }; |