From a6a80f4bf83eaa1894b83755ec8785af5ed4559f Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Mon, 23 Mar 2020 22:50:05 +0200 Subject: Fix various compiler warnings --- .gitmodules | 2 +- 3rd-party/SingleApplication/SingleApplication.git | 2 +- lib/configuration/qt_specialization.cpp | 13 -------- lib/configuration/qt_specialization.h | 1 - src/mainwindow/addressbar.cpp | 6 ++-- src/mainwindow/mainwindow.cpp | 6 ++-- src/mainwindow/menubar.cpp | 38 +++++++++++------------ src/mainwindow/widgets/completer.cpp | 2 +- src/mainwindow/widgets/navigationbar.cpp | 8 ++--- src/mainwindow/widgets/urllineedit.cpp | 4 +-- src/subwindow/subwindow.cpp | 7 +++-- src/webengine/webpage.cpp | 2 +- src/webengine/webview.h | 2 +- 13 files changed, 41 insertions(+), 52 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1695827..15a621a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "3rd-party/SingleApplication/SingleApplication.git"] path = 3rd-party/SingleApplication/SingleApplication.git - url = https://github.com/itay-grudev/SingleApplication.git + url = https://library.iserlohn-fortress.net/aqua/SingleApplication.git [submodule "3rd-party/args/args.git"] path = 3rd-party/args/args.git url = https://github.com/Taywee/args diff --git a/3rd-party/SingleApplication/SingleApplication.git b/3rd-party/SingleApplication/SingleApplication.git index 33a2617..e10a2e3 160000 --- a/3rd-party/SingleApplication/SingleApplication.git +++ b/3rd-party/SingleApplication/SingleApplication.git @@ -1 +1 @@ -Subproject commit 33a2617a3f96a1aadf22c6c39640f6c3696f1a6b +Subproject commit e10a2e3795319dfdf2f5685e27fce00a2d0c0306 diff --git a/lib/configuration/qt_specialization.cpp b/lib/configuration/qt_specialization.cpp index 4e79492..c58a498 100644 --- a/lib/configuration/qt_specialization.cpp +++ b/lib/configuration/qt_specialization.cpp @@ -21,19 +21,6 @@ callable_when(unconsumed) [[nodiscard]] std::optional Configuration return QString::fromStdString(v.value()).split(';'); } -void setShortcut(QAction *action, const char *name) -{ - Configuration conf; - - if(const auto shortcutText = conf.value(name)) { - const QString tooltip = action->toolTip(); - action->setShortcut(QKeySequence::fromString(shortcutText.value())); - action->setToolTip(QString("%1 (%2)").arg(tooltip, shortcutText.value())); - } else { - throw new std::runtime_error(std::string("fixme: setShortcut found no such value for ") + name); - } -} - template <> callable_when(unconsumed) QAction &Configuration::shortcut(QAction &action, const char *name) const { diff --git a/lib/configuration/qt_specialization.h b/lib/configuration/qt_specialization.h index 8aabf6b..ea16fe0 100644 --- a/lib/configuration/qt_specialization.h +++ b/lib/configuration/qt_specialization.h @@ -13,4 +13,3 @@ callable_when(unconsumed) QAction &Configuration::shortcut(QAction &, const char template <> callable_when(unconsumed) QKeySequence &Configuration::shortcut(QKeySequence &, const char *) const; -[[deprecated("Use Configuration::shortcut(name) instead")]] void setShortcut(QAction *action, const char *name); diff --git a/src/mainwindow/addressbar.cpp b/src/mainwindow/addressbar.cpp index 42fa890..b1d005a 100644 --- a/src/mainwindow/addressbar.cpp +++ b/src/mainwindow/addressbar.cpp @@ -21,17 +21,17 @@ AddressBar::AddressBar(QWidget *parent) ui->urlBar->menuAction->setShortcut(QKeySequence(conf.value("shortcuts.address.menu").value())); auto *focusShortcut = new QShortcut(QKeySequence(conf.value("shortcuts.address.focus").value()), parent); - connect(focusShortcut, &QShortcut::activated, ui->urlBar, [=]() { + connect(focusShortcut, &QShortcut::activated, ui->urlBar, [this]() { ui->urlBar->setFocus(); ui->urlBar->selectAll(); }); - connect(ui->urlBar, &UrlLineEdit::textEdited, [=](const QString &text) { + connect(ui->urlBar, &UrlLineEdit::textEdited, [this](const QString &text) { std::function callback = std::bind(&UrlLineEdit::updateCompleter, ui->urlBar, std::placeholders::_1); emit complete(text, callback); }); - connect(ui->urlBar, &UrlLineEdit::returnPressed, [=]() { + connect(ui->urlBar, &UrlLineEdit::returnPressed, [this]() { const QUrl url = QUrl::fromUserInput(ui->urlBar->text()); // check if url contains \w+:// (matches protocol://) or contains a '.' (matches site.domain) diff --git a/src/mainwindow/mainwindow.cpp b/src/mainwindow/mainwindow.cpp index e03ec46..36f2759 100644 --- a/src/mainwindow/mainwindow.cpp +++ b/src/mainwindow/mainwindow.cpp @@ -56,7 +56,7 @@ MainWindow::MainWindow(QWidget *parent) { QAction *subwindowMenuAction = new QAction(this); QMainWindow::addAction(subwindowMenuAction); - setShortcut(subwindowMenuAction, "shortcuts.subwindow.menu"); + config.shortcut(*subwindowMenuAction, "shortcuts.subwindow.menu"); connect(subwindowMenuAction, &QAction::triggered, this, [this]() { QMdiSubWindow *window = mdiArea->currentSubWindow(); if(window != nullptr) { @@ -131,8 +131,8 @@ MainWindow::MainWindow(QWidget *parent) // search box auto *searchAction = new QAction(this); - setShortcut(searchAction, "shortcuts.window.search"); - connect(searchAction, &QAction::triggered, this, [=]() { + config.shortcut(*searchAction, "shortcuts.window.search"); + connect(searchAction, &QAction::triggered, this, [this]() { /* QTBUG-18665 * When focusing out of the search box and hiding it, the first * (or earlier?) subwindow gets activated for some reason. diff --git a/src/mainwindow/menubar.cpp b/src/mainwindow/menubar.cpp index b695a20..7a2bedc 100644 --- a/src/mainwindow/menubar.cpp +++ b/src/mainwindow/menubar.cpp @@ -73,6 +73,7 @@ MenuBar::MenuBar(MainWindow *parent) { auto *browser = qobject_cast(qApp); Q_CHECK_PTR(browser); + Configuration conf; smolbote = this->addMenu(qApp->applicationName()); { @@ -109,31 +110,30 @@ MenuBar::MenuBar(MainWindow *parent) smolbote->addSeparator(); - Configuration conf; const QString sessionPath = conf.value("session.path").value(); auto *actionSaveSession = smolbote->addAction(tr("Save Session"), parent, [sessionPath]() { auto *sessionDialog = new SaveSessionDialog(nullptr); if(sessionDialog->exec() == QDialog::Accepted) sessionDialog->save(sessionPath); }); - setShortcut(actionSaveSession, "shortcuts.session.save"); + conf.shortcut(*actionSaveSession, "shortcuts.session.save"); auto *actionOpenSession = smolbote->addAction(tr("Open Session"), parent, [parent]() { auto *sessionDialog = new SessionDialog(parent); sessionDialog->exec(); }); - setShortcut(actionOpenSession, "shortcuts.session.open"); + conf.shortcut(*actionOpenSession, "shortcuts.session.open"); smolbote->addSeparator(); auto *actionBookmarks = smolbote->addAction(tr("Bookmarks"), browser, [browser, parent]() { browser->showWidget(browser->bookmarks(), parent); }); - setShortcut(actionBookmarks, "shortcuts.window.bookmarks.show"); + conf.shortcut(*actionBookmarks, "shortcuts.window.bookmarks.show"); auto *actionDownloads = smolbote->addAction(tr("Downloads"), browser, [browser, parent]() { browser->showWidget(browser->downloads(), parent); }); - setShortcut(actionDownloads, "shortcuts.window.downloads.show"); + conf.shortcut(*actionDownloads, "shortcuts.window.downloads.show"); smolbote->addSeparator(); smolbote->addAction(tr("Load Plugin"), browser, [browser]() { @@ -144,29 +144,29 @@ MenuBar::MenuBar(MainWindow *parent) pluginInsertLocation = smolbote->addSeparator(); auto *actionAbout = smolbote->addAction(tr("About"), browser, &Browser::about); - setShortcut(actionAbout, "shortcuts.window.about"); + conf.shortcut(*actionAbout, "shortcuts.window.about"); smolbote->addSeparator(); auto *actionQuit = smolbote->addAction(tr("Quit"), qApp, &QApplication::quit); - setShortcut(actionQuit, "shortcuts.window.quit"); + conf.shortcut(*actionQuit, "shortcuts.window.quit"); } window = this->addMenu(tr("&Window")); { auto *actionNewWindow = window->addAction(tr("New Window"), browser, &Browser::createWindow); - setShortcut(actionNewWindow, "shortcuts.window.newwindow"); + conf.shortcut(*actionNewWindow, "shortcuts.window.newwindow"); auto *actionNewSubwindow = window->addAction(tr("New Subwindow"), parent, [parent]() { parent->createSubWindow(nullptr, true); }); - setShortcut(actionNewSubwindow, "shortcuts.window.newgroup"); + conf.shortcut(*actionNewSubwindow, "shortcuts.window.newgroup"); auto *actionTileSubwindows = window->addAction(tr("Tile Subwindows"), parent->mdiArea, &QMdiArea::tileSubWindows); - setShortcut(actionTileSubwindows, "shortcuts.subwindow.tile"); + conf.shortcut(*actionTileSubwindows, "shortcuts.subwindow.tile"); auto *actionCascadeSubwindows = window->addAction(tr("Cascade Subwindows"), parent->mdiArea, &QMdiArea::cascadeSubWindows); - setShortcut(actionCascadeSubwindows, "shortcuts.subwindow.cascade"); + conf.shortcut(*actionCascadeSubwindows, "shortcuts.subwindow.cascade"); window->addSeparator()->setText(tr("Toolbars")); @@ -178,7 +178,7 @@ MenuBar::MenuBar(MainWindow *parent) action->setChecked(toolbar->isVisible()); connect(toolbar, &QToolBar::visibilityChanged, action, &QAction::setChecked); connect(action, &QAction::triggered, toolbar, &QToolBar::setVisible); - setShortcut(action, qUtf8Printable(toolbar->objectName() + ".show")); + conf.shortcut(*action, qUtf8Printable(toolbar->objectName() + ".show")); if(toolbar->isMovable()) hasMovableToolbar = true; @@ -204,7 +204,7 @@ MenuBar::MenuBar(MainWindow *parent) _subwindow->setCurrentTab(index); }); }); - setShortcut(actionNewTab, "shortcuts.subwindow.newtab"); + conf.shortcut(*actionNewTab, "shortcuts.subwindow.newtab"); subwindow->addSeparator(); @@ -214,7 +214,7 @@ MenuBar::MenuBar(MainWindow *parent) _subwindow->setCurrentTab(index); }); }); - setShortcut(actionRestoreTab, "shortcuts.subwindow.restoretab"); + conf.shortcut(*actionRestoreTab, "shortcuts.subwindow.restoretab"); auto *restoreTabsMenu = subwindow->addMenu(tr("Restore previous tab")); connect(restoreTabsMenu, &QMenu::aboutToShow, parent, [parent, restoreTabsMenu]() { @@ -264,28 +264,28 @@ MenuBar::MenuBar(MainWindow *parent) _subwindow->setCurrentTab(qMax(0, currentIdx - 1)); }); }); - setShortcut(leftTab, "shortcuts.subwindow.tableft"); + conf.shortcut(*leftTab, "shortcuts.subwindow.tableft"); auto *moveTabLeft = subwindow->addAction(tr("Move tab left"), parent, [parent]() { run_if(parent->currentSubWindow(), [](SubWindow *_subwindow, int currentIdx) { _subwindow->moveTab(currentIdx, currentIdx - 1); }); }); - setShortcut(moveTabLeft, "shortcuts.subwindow.movetableft"); + conf.shortcut(*moveTabLeft, "shortcuts.subwindow.movetableft"); auto *rightTab = subwindow->addAction(tr("Switch to tab on the right"), parent, [parent]() { run_if(parent->currentSubWindow(), [](SubWindow *_subwindow, int currentIdx) { _subwindow->setCurrentTab(qMin(currentIdx + 1, _subwindow->tabCount() - 1)); }); }); - setShortcut(rightTab, "shortcuts.subwindow.tabright"); + conf.shortcut(*rightTab, "shortcuts.subwindow.tabright"); auto *moveTabRight = subwindow->addAction(tr("Move tab right"), parent, [parent]() { run_if(parent->currentSubWindow(), [](SubWindow *_subwindow, int currentIdx) { _subwindow->moveTab(currentIdx, currentIdx + 1); }); }); - setShortcut(moveTabRight, "shortcuts.subwindow.movetabright"); + conf.shortcut(*moveTabRight, "shortcuts.subwindow.movetabright"); subwindow->addSeparator(); @@ -294,7 +294,7 @@ MenuBar::MenuBar(MainWindow *parent) _subwindow->closeTab(currentIdx); }); }); - setShortcut(closeTab, "shortcuts.subwindow.closetab"); + conf.shortcut(*closeTab, "shortcuts.subwindow.closetab"); subwindow->addAction(tr("Close tabs to the left"), parent, [parent]() { run_if(parent->currentSubWindow(), [](SubWindow *_subwindow, int currentIdx) { diff --git a/src/mainwindow/widgets/completer.cpp b/src/mainwindow/widgets/completer.cpp index 1295fa3..15cc8b1 100644 --- a/src/mainwindow/widgets/completer.cpp +++ b/src/mainwindow/widgets/completer.cpp @@ -16,7 +16,7 @@ Completer::Completer(QWidget *parent) setWindowFlags(Qt::ToolTip); setEditTriggers(QAbstractItemView::NoEditTriggers); - connect(this, &Completer::activated, [=](const QModelIndex &index) { + connect(this, &Completer::activated, [this](const QModelIndex &index) { hide(); emit completionActivated(index.data().toString()); }); diff --git a/src/mainwindow/widgets/navigationbar.cpp b/src/mainwindow/widgets/navigationbar.cpp index 725003d..799ebec 100644 --- a/src/mainwindow/widgets/navigationbar.cpp +++ b/src/mainwindow/widgets/navigationbar.cpp @@ -29,7 +29,7 @@ NavigationBar::NavigationBar(QWidget *parent) // Back button backAction = addAction(Util::icon(QStyle::SP_ArrowBack), tr("Back")); - setShortcut(backAction, "shortcuts.navigation.back"); + config.shortcut(*backAction, "shortcuts.navigation.back"); connect(backAction, &QAction::triggered, this, [this]() { m_view->history()->back(); }); @@ -57,7 +57,7 @@ NavigationBar::NavigationBar(QWidget *parent) // Forward button forwardAction = addAction(Util::icon(QStyle::SP_ArrowForward), tr("Forward")); - setShortcut(forwardAction, "shortcuts.navigation.forward"); + config.shortcut(*forwardAction, "shortcuts.navigation.forward"); connect(forwardAction, &QAction::triggered, this, [this]() { m_view->history()->forward(); }); @@ -85,7 +85,7 @@ NavigationBar::NavigationBar(QWidget *parent) // Stop/Refresh button stopReloadAction = addAction(Util::icon(QStyle::SP_BrowserReload), tr("Refresh")); - setShortcut(stopReloadAction, "shortcuts.navigation.refresh"); + config.shortcut(*stopReloadAction, "shortcuts.navigation.refresh"); connect(stopReloadAction, &QAction::triggered, this, [this]() { if(m_view->isLoaded()) m_view->reload(); @@ -100,7 +100,7 @@ NavigationBar::NavigationBar(QWidget *parent) // Home button homeAction = addAction(Util::icon(QStyle::SP_DirHomeIcon), tr("Home")); - setShortcut(homeAction, "shortcuts.navigation.home"); + config.shortcut(*homeAction, "shortcuts.navigation.home"); connect(homeAction, &QAction::triggered, this, [this]() { m_view->load(m_view->profile()->homepage()); }); diff --git a/src/mainwindow/widgets/urllineedit.cpp b/src/mainwindow/widgets/urllineedit.cpp index 378945f..5216f31 100644 --- a/src/mainwindow/widgets/urllineedit.cpp +++ b/src/mainwindow/widgets/urllineedit.cpp @@ -40,13 +40,13 @@ UrlLineEdit::UrlLineEdit(QWidget *parent) actions.append(pasteAction); auto *loadAction = new QAction(tr("Paste and load"), this); - connect(loadAction, &QAction::triggered, this, [=]() { + connect(loadAction, &QAction::triggered, this, [this]() { emit addressbar->load(QUrl::fromUserInput(qApp->clipboard()->text())); }); actions.append(loadAction); auto *searchAction = new QAction(tr("Paste and search"), this); - connect(searchAction, &QAction::triggered, this, [=]() { + connect(searchAction, &QAction::triggered, this, [this]() { emit addressbar->search(qApp->clipboard()->text()); }); actions.append(searchAction); diff --git a/src/subwindow/subwindow.cpp b/src/subwindow/subwindow.cpp index 7f2ae05..c6e156e 100644 --- a/src/subwindow/subwindow.cpp +++ b/src/subwindow/subwindow.cpp @@ -35,8 +35,11 @@ SubWindow::SubWindow(QWidget *parent, Qt::WindowFlags flags) m_profile = WebProfile::defaultProfile(); Configuration config; - auto *fullScreen_shortcut = new QShortcut(QKeySequence(config.value("shortcuts.subwindow.fullscreen").value()), this); - connect(fullScreen_shortcut, &QShortcut::activated, this, [=]() { + + QKeySequence fullscreen_shortcut; + config.shortcut(fullscreen_shortcut, "shortcuts.subwindow.fullscreen"); + auto *fullScreen_shortcut = new QShortcut(fullscreen_shortcut, this); + connect(fullScreen_shortcut, &QShortcut::activated, this, [this]() { auto *w = this->window(); if(w->isFullScreen()) w->showNormal(); diff --git a/src/webengine/webpage.cpp b/src/webengine/webpage.cpp index 15d2322..e79db9d 100644 --- a/src/webengine/webpage.cpp +++ b/src/webengine/webpage.cpp @@ -122,7 +122,7 @@ void WebPage::renderProcessCrashed(QWebEnginePage::RenderProcessTerminationStatu "

Press here to reload this tab.

") .arg(tr_terminationStatus(terminationStatus), QString::number(exitCode), this->url().toEncoded())); - QTimer::singleShot(0, this, [=]() { + QTimer::singleShot(0, this, [this, page]() { setHtml(page.toUtf8(), url()); }); } diff --git a/src/webengine/webview.h b/src/webengine/webview.h index e5cd7fb..0223b78 100644 --- a/src/webengine/webview.h +++ b/src/webengine/webview.h @@ -47,7 +47,7 @@ private: SubWindow *m_parentWindow = nullptr; WebProfile *m_profile = nullptr; - bool m_loaded; + bool m_loaded = false; }; #endif // SMOLBOTE_WEBVIEW_H -- cgit v1.2.1