diff options
author | Aqua-sama <aqua@iserlohn-fortress.net> | 2020-01-04 22:00:25 +0200 |
---|---|---|
committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2020-01-04 23:03:40 +0200 |
commit | 93c92ce9791bb70cf3ff6af71e2f19e9b68d7584 (patch) | |
tree | fabbecb5a6712b400754ea1e5f7c892909d6e65c /src | |
parent | Fix configuration not being read unless explicitly specified (diff) | |
download | smolbote-93c92ce9791bb70cf3ff6af71e2f19e9b68d7584.tar.xz |
Disable plugins as broken
- Fix several Qt deprecated warnings
Diffstat (limited to 'src')
-rw-r--r-- | src/browser.h | 14 | ||||
-rw-r--r-- | src/crashhandler.cpp | 2 | ||||
-rw-r--r-- | src/crashhandler.h | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/src/browser.h b/src/browser.h index 1faf210..fb47c46 100644 --- a/src/browser.h +++ b/src/browser.h @@ -12,7 +12,6 @@ #include "session/session.h" #include <QJsonObject> #include <QVector> -#include <browserinterface.h> #include <functional> #include <memory> #include <singleapplication.h> @@ -24,8 +23,9 @@ class Configuration; class BookmarksWidget; class DownloadsWidget; class MainWindow; +class Profile; class WebProfileManager; -class Browser : public SingleApplication, public BrowserInterface +class Browser : public SingleApplication { Q_OBJECT @@ -38,10 +38,14 @@ public slots: public: // interface + [[deprecated]] WebProfileManager *getProfileManager(); - const QList<QPair<QString, Profile *>> profileList() const override; - QPair<QString, Profile *> loadProfile(const QString &id, bool isOffTheRecord = true) override; - void removeProfile(const QString &id) override; + [[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); QPluginLoader *addPlugin(const QString &path = QString()); diff --git a/src/crashhandler.cpp b/src/crashhandler.cpp index 0c2fec7..ed9298f 100644 --- a/src/crashhandler.cpp +++ b/src/crashhandler.cpp @@ -50,7 +50,7 @@ bool CrashHandler::install_handler(CrashHandler::Context &ctx) google_breakpad::MinidumpDescriptor descriptor(ctx.dumppath.c_str()); // minidump descriptor, filter callback, minidump callback, callback_context, install handler, server_fd - auto *eh = new google_breakpad::ExceptionHandler(descriptor, nullptr, minidumpCb, &ctx, true, -1); + new google_breakpad::ExceptionHandler(descriptor, nullptr, minidumpCb, &ctx, true, -1); return true; } diff --git a/src/crashhandler.h b/src/crashhandler.h index 9b79ecc..ac1bf12 100644 --- a/src/crashhandler.h +++ b/src/crashhandler.h @@ -31,6 +31,6 @@ bool install_handler(Context &ctx) } #endif ; -}; +} #endif // SMOLBOTE_CRASHHANDLER_H |