From abc6beaf783fad2dacf9e4ed75208854e0760f5e Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Fri, 22 Sep 2017 17:26:40 +0200
Subject: Some fixes based on clazy

---
 src/browser.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'src/browser.cpp')

diff --git a/src/browser.cpp b/src/browser.cpp
index c01c165..15a7029 100644
--- a/src/browser.cpp
+++ b/src/browser.cpp
@@ -75,7 +75,8 @@ void Browser::loadPlugins()
     dir.cd("../lib/smolbote/plugins");
 
     // Load all plugins
-    for(QString filename : dir.entryList(QDir::Files | QDir::Readable)) {
+    const QStringList files = dir.entryList(QDir::Files | QDir::Readable);
+    for(const QString &filename : files) {
         qDebug("Loading %s", qUtf8Printable(filename));
 
         QPluginLoader loader(dir.absoluteFilePath(filename));
@@ -99,14 +100,15 @@ void Browser::loadProfiles()
     qDebug(">> Looking for profiles...");
     profile("");
     QDir dir(settings()->value("browser.profile.path").toString());
-    for(const QString name : dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
+    const QStringList profileList = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
+    for(const QString &name : profileList) {
         qDebug("- Adding profile %s", qUtf8Printable(name));
         profile(name);
     }
     qDebug("<< Profiles end...");
 
     //connect(this, SIGNAL(messageAvailable(QStringList)), this, SLOT(addWindow(QStringList)));
-    connect(this, &Browser::messageAvailable, [this](const QHash<QString, QVariant> params) {
+    connect(this, &Browser::messageAvailable, this, [&](const QHash<QString, QVariant> params) {
 
         //qDebug("Creating new window for [%s]", qUtf8Printable(params["urls"].toString()));
 
@@ -224,7 +226,7 @@ void Browser::addWindow(MainWindow *window)
     Q_ASSERT(window != nullptr);
 
     m_windows.append(QPointer<MainWindow>(window));
-    connect(window, &QObject::destroyed, [this]() {
+    connect(window, &QObject::destroyed, this, [&]() {
         this->clean();
     });
 
@@ -240,9 +242,12 @@ MainWindow *Browser::addWindow(const QStringList params)
 
 void Browser::clean()
 {
-    for(int i = m_windows.size(); i >= 0; i--) {
+    for(int i = m_windows.count() - 1; i >= 0; i--) {
         if(m_windows[i].isNull()) {
             m_windows.removeAt(i);
+#ifdef QT_DEBUG
+            qDebug("Removed deleted window from window list");
+#endif
         }
     }
 }
@@ -274,7 +279,8 @@ WebEngineProfile* Browser::profile(const QString name)
 QStringList Browser::profiles()
 {
     QStringList l;
-    for(QString key : m_profiles.keys()) {
+    const QStringList keys = m_profiles.keys();
+    for(const QString &key : keys) {
         l.append(key);
     }
     return l;
-- 
cgit v1.2.1