minor cleanup of QtSLiM code thanks to clang-tidy and clazy

Author: bhaller

QtSLiM/QtSLiMAppDelegate.cpp

@@ -543,10 +543,11 @@ void QtSLiMAppDelegate::updateRecentFileActions()
 
     const QStringList recentFiles = readRecentFiles(settings);
     const int count = qMin(int(MaxRecentFiles), recentFiles.size());
+    QList<QAction *> actions = menu->actions();
 
     for (int i = 0 ; i < MaxRecentFiles; ++i)
     {
-        QAction *recentAction = menu->actions()[i];
+        QAction *recentAction = actions[i];
 
         if (i < count)
         {
@@ -711,9 +712,9 @@ void QtSLiMAppDelegate::findRecipe(void)
 
     if (result == QDialog::Accepted)
     {
-        QStringList resourceNames = findRecipePanel.selectedRecipeFilenames();
+        const QStringList resourceNames = findRecipePanel.selectedRecipeFilenames();
 
-        for (QString resourceName : resourceNames)
+        for (const QString &resourceName : resourceNames)
         {
             //qDebug() << "recipe name:" << resourceName;
 
@@ -769,8 +770,9 @@ void QtSLiMAppDelegate::openRecipe(void)
 void QtSLiMAppDelegate::playStateChanged(void)
 {
     bool anyPlaying = false;
+    const QWidgetList topLevelWidgets = qApp->topLevelWidgets();
 
-    for (QWidget *widget : qApp->topLevelWidgets())
+    for (QWidget *widget : topLevelWidgets)
     {
         QtSLiMWindow *mainWin = qobject_cast<QtSLiMWindow *>(widget);
 
@@ -1168,7 +1170,6 @@ QWidget *QtSLiMAppDelegate::globalImageWindowWithPath(const QString &path, const
         return nullptr;
     }
 
-    QFileInfo fileInfo(path);
     int window_width = round(image.width() * scaleFactor);
     int window_height = round(image.height() * scaleFactor);
 

QtSLiM/QtSLiMConsoleTextEdit.cpp

@@ -30,7 +30,6 @@
 
 #include <algorithm>
 
-#include "QtSLiMPreferences.h"
 #include "QtSLiMExtras.h"
 #include "eidos_globals.h"
 #include "slim_globals.h"

QtSLiM/QtSLiMEidosConsole.cpp

@@ -30,7 +30,6 @@
 #include <string>
 
 #include "QtSLiMWindow.h"
-#include "QtSLiMPreferences.h"
 #include "QtSLiMVariableBrowser.h"
 #include "QtSLiMExtras.h"
 

QtSLiM/QtSLiMEidosConsole_glue.cpp

@@ -25,7 +25,6 @@
 #include <QKeyEvent>
 #include <QDesktopServices>
 
-#include "QtSLiMWindow.h"
 #include "QtSLiMAppDelegate.h"
 
 

QtSLiM/QtSLiMEidosPrettyprinter.cpp

@@ -154,7 +154,7 @@ bool Eidos_prettyprintTokensFromScript(const std::vector<EidosToken> &tokens, Ei
 			{
                 // We use QString to get intelligent treatment of Unicode and UTF-8; std::string is just too dumb.
                 // In SLiMGui this is done with NSString.  We want to count newlines in a mac/unix/windows agnostic way.
-                QString q_tokenString = QString::fromStdString(tokenString);
+                const QString q_tokenString = QString::fromStdString(tokenString);
                 int newlineCount = 0;
                 bool prevWasCR = false, prevWasLF = false;
 

QtSLiM/QtSLiMExtras.cpp

@@ -751,7 +751,7 @@ QStringList QtSLiMRunLineEditArrayDialog(QWidget *p_parent, QString title, QStri
     {
         QStringList returnList;
 
-        for (QLineEdit *lineEdit : lineEdits)
+        for (QLineEdit *lineEdit : qAsConst(lineEdits))
             returnList.append(lineEdit->text());
 
         delete dialog;

QtSLiM/QtSLiMFindRecipe.cpp

@@ -79,7 +79,7 @@ QtSLiMFindRecipe::~QtSLiMFindRecipe()
 
 QStringList QtSLiMFindRecipe::selectedRecipeFilenames(void)
 {
-    QList<QListWidgetItem *> selectedItems = ui->matchListWidget->selectedItems();
+    const QList<QListWidgetItem *> selectedItems = ui->matchListWidget->selectedItems();
     QStringList selectedFilenames;
 
     for (QListWidgetItem *selectedItem : selectedItems)
@@ -182,7 +182,7 @@ void QtSLiMFindRecipe::updateMatchListWidget(void)
 
     matchList->clear();
 
-    for (const QString &match : matchRecipeFilenames)
+    for (const QString &match : qAsConst(matchRecipeFilenames))
         matchList->addItem(displayStringForRecipeFilename(match));
 }
 
@@ -238,14 +238,14 @@ void QtSLiMFindRecipe::highlightPreview(void)
     QString keyword1 = ui->keyword1LineEdit->text();
     QString keyword2 = ui->keyword2LineEdit->text();
     QString keyword3 = ui->keyword3LineEdit->text();
-    std::vector<QString> keywords{keyword1, keyword2, keyword3};
+    const std::vector<QString> keywords{keyword1, keyword2, keyword3};
 
     QList<QTextEdit::ExtraSelection> extraSelections;
     QTextCharFormat format;
 
     format.setBackground(Qt::yellow);
 
-    for (QString keyword : keywords)
+    for (const QString &keyword : keywords)
     {
         if (keyword.length() == 0)
             continue;

QtSLiM/QtSLiMGraphView.cpp

@@ -118,17 +118,16 @@ void QtSLiMGraphView::addedToWindow(void)
 
 QtSLiMGraphView::~QtSLiMGraphView()
 {
-    cleanup();
+    // It would be nice if we could call these methods automatically for subclasses, but we cannot.  By the time
+    // this destructor has been called, the subclass has already been destructed, and a virtual function call
+    // here calls the QtSLiMGraphView implementation, not the subclass implementation.  Subclasses that use these
+    // methods must call them themselves in their destructors.
+    QtSLiMGraphView::invalidateDrawingCache();
+    QtSLiMGraphView::invalidateCachedData();
 
     controller_ = nullptr;
 }
 
-void QtSLiMGraphView::cleanup()
-{
-    invalidateDrawingCache();
-    invalidateCachedData();
-}
-
 void QtSLiMGraphView::setFocalDisplaySpecies(Species *species)
 {
     if (species)
@@ -875,11 +874,13 @@ void QtSLiMGraphView::paintEvent(QPaintEvent * /* p_paintEvent */)
 void QtSLiMGraphView::invalidateCachedData()
 {
     // GraphView has no cached data, but it supports the idea of it
+    // If anything ever gets added here, calls to super will need to be added in subclasses
 }
 
 void QtSLiMGraphView::invalidateDrawingCache(void)
 {
-	// GraphView has no drawing cache, but it supports the idea of one
+    // GraphView has no drawing cache, but it supports the idea of one
+    // If anything ever gets added here, calls to super will need to be added in subclasses
 }
 
 void QtSLiMGraphView::graphWindowResized(void)

QtSLiM/QtSLiMGraphView.h

@@ -65,13 +65,13 @@ class QtSLiMGraphView : public QWidget
 
 public slots:
     virtual void addedToWindow(void);
-    virtual void invalidateCachedData(void);
-    virtual void invalidateDrawingCache(void);
+    virtual void invalidateCachedData(void);        // subclasses must call this themselves in their destructor - super cannot do it!
+    virtual void invalidateDrawingCache(void);      // subclasses must call this themselves in their destructor - super cannot do it!
     virtual void graphWindowResized(void);
-    virtual void controllerRecycled(void);
+    virtual void controllerRecycled(void);          // subclasses must call super: QtSLiMGraphView::controllerRecycled()
     virtual void controllerChromosomeSelectionChanged(void);
     virtual void controllerTickFinished(void);
-    virtual void updateAfterTick(void);
+    virtual void updateAfterTick(void);             // subclasses must call super: QtSLiMGraphView::updateAfterTick()
     void actionButtonRunMenu(QtSLiMPushButton *actionButton);
 
 protected:
@@ -106,7 +106,6 @@ public slots:
     virtual void appendStringForData(QString &string) = 0;
 
     // Optional subclass overrides
-    virtual void cleanup();
     virtual void willDraw(QPainter &painter, QRect interiorRect);
     virtual bool providesStringForData(void);
     virtual QtSLiMLegendSpec legendKey(void);

QtSLiM/QtSLiMGraphView_1DSampleSFS.cpp

@@ -88,6 +88,8 @@ void QtSLiMGraphView_1DSampleSFS::addedToWindow(void)
 
 QtSLiMGraphView_1DSampleSFS::~QtSLiMGraphView_1DSampleSFS()
 {
+    // We are responsible for our own destruction
+    QtSLiMGraphView_1DSampleSFS::invalidateCachedData();
 }
 
 void QtSLiMGraphView_1DSampleSFS::subpopulation1PopupChanged(int /* index */)