diff options
author | Aqua-sama <aqua@iserlohn-fortress.net> | 2020-05-26 22:23:25 +0300 |
---|---|---|
committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2020-05-28 19:43:45 +0300 |
commit | 9c4dd932c6d692178bb8d5265c634126cb415767 (patch) | |
tree | 527300f8e710859965c142aed4e779a16b9d4ab6 /src/mainwindow/mainwindow.cpp | |
parent | Update ProfileEditor plugin (diff) | |
download | smolbote-9c4dd932c6d692178bb8d5265c634126cb415767.tar.xz |
Turn on more warnings by default
- fix clazy warnings
- fix various other compiler warnings
- bugfix: connect profiles' downloadRequested signal
Diffstat (limited to 'src/mainwindow/mainwindow.cpp')
-rw-r--r-- | src/mainwindow/mainwindow.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mainwindow/mainwindow.cpp b/src/mainwindow/mainwindow.cpp index 4ec79b1..64c149c 100644 --- a/src/mainwindow/mainwindow.cpp +++ b/src/mainwindow/mainwindow.cpp @@ -24,7 +24,7 @@ #include <QMessageBox> #include <QStatusBar> -MainWindow::MainWindow(const Session::MainWindow &data, QMenu *appMenu, QWidget *parent) +MainWindow::MainWindow(const Session::MainWindow &mainwindow_data, QMenu *appMenu, QWidget *parent) : QMainWindow(parent) { Configuration config; @@ -66,7 +66,7 @@ MainWindow::MainWindow(const Session::MainWindow &data, QMenu *appMenu, QWidget }); QMainWindow::addAction(searchAction); - for(const auto &s : data.subwindows) { + for(const auto &s : mainwindow_data.subwindows) { createSubWindow(s); } if(m_subwindows.isEmpty()) { @@ -115,19 +115,19 @@ void MainWindow::createTab(const QUrl &url) } } -void MainWindow::createTab(const Session::WebView &data) +void MainWindow::createTab(const Session::WebView &tab_data) { auto *w = qobject_cast<SubWindow *>(centralWidget()); if(w != nullptr) { - w->addTab(data); + w->addTab(tab_data); } } -SubWindow *MainWindow::createSubWindow(const Session::SubWindow &data) +SubWindow *MainWindow::createSubWindow(const Session::SubWindow &subwindow_data) { WebProfileManager profileManager; - auto *profile = profileManager.profile(data.profile); + auto *profile = profileManager.profile(subwindow_data.profile); if(profile == nullptr) { profile = WebProfile::defaultProfile(); } @@ -153,11 +153,11 @@ SubWindow *MainWindow::createSubWindow(const Session::SubWindow &data) } }); - if(data.tabs.count() == 0) { + if(subwindow_data.tabs.count() == 0) { w->addTab(profile->newtab()); return w; } - for(const auto &tab : data.tabs) { + for(const auto &tab : subwindow_data.tabs) { w->addTab(tab); } return w; |