apply some suggestions from the static analyzer.

Author: adriweb

core/keypad.c

@@ -88,7 +88,6 @@ static uint8_t keypad_handle_ghosting(uint8_t data, uint8_t queryMask) {
     uint64_t ghostMatrix = data;
     uint8_t peekRows = 0;
     uint8_t ghostData = 0;
-    uint8_t shift = 0;
     for (uint8_t row = 0; row < KEYPAD_ACTUAL_ROWS; row++) {
         if (!(queryMask & (1 << row))) {
             uint8_t peekData = keypad_peek_keymap(row);

gui/qt/basiccodeviewerwindow.cpp

@@ -89,7 +89,7 @@ void BasicEditor::resizeEvent(QResizeEvent *e)
     lineNumberArea->setGeometry(QRect(cr.left(), cr.top(), lineNumberAreaWidth(), cr.height()));
 }
 
-void BasicEditor::lineNumberAreaPaintEvent(QPaintEvent *event)
+void BasicEditor::lineNumberAreaPaintEvent(QPaintEvent *event) const
 {
     QPainter painter(lineNumberArea);
     painter.fillRect(event->rect(), Qt::lightGray);

gui/qt/basiccodeviewerwindow.h

@@ -63,7 +63,7 @@ class BasicEditor : public QPlainTextEdit
     BasicEditor(QWidget *parent = nullptr);
 
     void updateDarkMode();
-    void lineNumberAreaPaintEvent(QPaintEvent *event);
+    void lineNumberAreaPaintEvent(QPaintEvent *event) const;
     int lineNumberAreaWidth();
     void toggleHighlight();
 

gui/qt/basicdebugger.cpp

@@ -111,13 +111,13 @@ void MainWindow::debugBasicClearEdits() {
     m_basicCodeIndex = 0;
 }
 
-void MainWindow::debugBasicClearHighlights() {
+void MainWindow::debugBasicClearHighlights() const {
     QList<QTextEdit::ExtraSelection> extraSelections;
     ui->basicEdit->setExtraSelections(extraSelections);
     ui->basicTempEdit->setExtraSelections(extraSelections);
 }
 
-void MainWindow::debugBasicGuiState(bool state) {
+void MainWindow::debugBasicGuiState(bool state) const {
     if (state) {
         ui->btnDebugBasicRun->setText(tr("Run"));
         ui->btnDebugBasicRun->setIcon(m_iconRun);

gui/qt/datawidget.cpp

@@ -40,7 +40,7 @@ void DataWidget::updateAllHighlights() {
     connect(this, &DataWidget::cursorPositionChanged, this, &DataWidget::highlightCurrentLine);
 }
 
-QString DataWidget::getSelectedAddr() {
+QString DataWidget::getSelectedAddr() const {
     if (!isEnabled()) {
         return QStringLiteral("000000");
     }
@@ -51,7 +51,7 @@ QString DataWidget::getSelectedAddr() {
     return c.selectedText();
 }
 
-bool DataWidget::labelCheck() {
+bool DataWidget::labelCheck() const {
     if (!isEnabled()) {
         return false;
     }

gui/qt/datawidget.h

@@ -59,8 +59,8 @@ class DataWidget : public QPlainTextEdit {
     void addHighlight(const QColor &lightModeColor, const QColor &darkModeColor);
     void highlightCurrentLine();
     void cursorState(bool movable);
-    bool labelCheck();
-    QString getSelectedAddr();
+    bool labelCheck() const;
+    QString getSelectedAddr() const;
 
 signals:
     void gotoDisasmAddress(uint32_t address);

gui/qt/debugger.cpp

@@ -186,7 +186,7 @@ void MainWindow::debugImportFile(const QString &file) {
     }
 }
 
-void MainWindow::debugExportFile(const QString &filename) {
+void MainWindow::debugExportFile(const QString &filename) const {
     if (filename.isEmpty()) {
         return;
     }
@@ -500,7 +500,7 @@ void MainWindow::debugCommand(int reason, uint32_t data) {
     debugRaise();
 }
 
-void MainWindow::debugSync() {
+void MainWindow::debugSync() const {
     if (!guiDebug) {
         return;
     }
@@ -589,7 +589,7 @@ void MainWindow::debugSync() {
     }
 }
 
-void MainWindow::debugGuiState(bool state) {
+void MainWindow::debugGuiState(bool state) const {
     if (state) {
         ui->buttonRun->setText(tr("Run"));
         ui->buttonRun->setIcon(m_iconRun);
@@ -866,7 +866,7 @@ void MainWindow::debugPopulate() {
 // Clock items
 // ------------------------------------------------
 
-void MainWindow::debugZeroCycles() {
+void MainWindow::debugZeroCycles() const {
     debug.totalCycles = 0;
     debug.dmaCycles = 0;
     debug.flashCacheMisses = 0;
@@ -924,7 +924,7 @@ void MainWindow::breakRemove(uint32_t address) {
     }
 }
 
-int MainWindow::breakGetMask(int row) {
+int MainWindow::breakGetMask(int row) const {
     int mask;
     if (static_cast<QAbstractButton *>(m_breakpoints->cellWidget(row, BREAK_ENABLE_COL))->isChecked()) {
         mask = DBG_MASK_EXEC;
@@ -993,11 +993,11 @@ void MainWindow::breakModified(QTableWidgetItem *item) {
     memUpdate();
 }
 
-QString MainWindow::breakNextLabel() {
+QString MainWindow::breakNextLabel() const {
     return QStringLiteral("Label") + QString::number(m_breakpoints->rowCount());
 }
 
-QString MainWindow::watchNextLabel() {
+QString MainWindow::watchNextLabel() const {
     return QStringLiteral("Label") + QString::number(m_watchpoints->rowCount());
 }
 
@@ -1140,7 +1140,7 @@ void MainWindow::portSetPrev(QTableWidgetItem *current, [[maybe_unused]] QTableW
     }
 }
 
-void MainWindow::portRemoveRow(int row) {
+void MainWindow::portRemoveRow(int row) const {
     uint16_t port = static_cast<uint16_t>(hex2int(m_ports->item(row, PORT_ADDR_COL)->text()));
     debug_ports(port, ~DBG_MASK_NONE, false);
     m_ports->removeRow(row);
@@ -1155,7 +1155,7 @@ void MainWindow::portRemoveSelected() {
     }
 }
 
-void MainWindow::portPopulate(int currRow) {
+void MainWindow::portPopulate(int currRow) const {
     uint16_t port = static_cast<uint16_t>(hex2int(m_ports->item(currRow, PORT_ADDR_COL)->text()));
     uint8_t read = static_cast<uint8_t>(port_peek_byte(port));
 
@@ -1242,7 +1242,7 @@ bool MainWindow::portAdd(uint16_t port, int mask, bool unset) {
     return true;
 }
 
-int MainWindow::portGetMask(int row) {
+int MainWindow::portGetMask(int row) const {
     unsigned int mask = 0;
     if (static_cast<QAbstractButton *>(m_ports->cellWidget(row, PORT_READ_COL))->isChecked()) {
         mask |= DBG_MASK_PORT_READ;
@@ -1589,7 +1589,7 @@ void MainWindow::memUpdate() {
     memDocksUpdate();
 }
 
-int MainWindow::watchGetMask(int row) {
+int MainWindow::watchGetMask(int row) const {
     int mask = 0;
     if (static_cast<QAbstractButton *>(m_watchpoints->cellWidget(row, WATCH_READ_COL))->isChecked()) {
         mask |= DBG_MASK_READ;
@@ -1735,7 +1735,7 @@ void MainWindow::batterySetCharging(bool checked) {
     control.batteryCharging = checked;
 }
 
-void MainWindow::batterySet(int value) {
+void MainWindow::batterySet(int value) const {
     control.setBatteryStatus = static_cast<uint8_t>(value);
     ui->sliderBattery->setValue(value);
     ui->labelBattery->setText(QString::number(value * 20) + "%");
@@ -1917,14 +1917,14 @@ void MainWindow::equatesAddEquate(const QString &name, uint32_t address) {
 }
 
 bool MainWindow::equatesAddEquateInternal(const QString &name, uint32_t address) {
-    std::pair<map_value_t::iterator, bool> inserted = disasm.reverse.emplace(name.toUpper().toStdString(), address);
-    if (!inserted.second) {
-        uint32_t oldAddress = std::exchange(inserted.first->second, address);
+    auto [mapIter, inserted] = disasm.reverse.emplace(name.toUpper().toStdString(), address);
+    if (!inserted) {
+        const uint32_t oldAddress = std::exchange(mapIter->second, address);
         if (oldAddress == address) {
             return false;
         }
-        std::pair<map_t::iterator, map_t::iterator> range = disasm.map.equal_range(oldAddress);
-        for (map_t::iterator it = range.first; it != range.second; ) {
+        auto [addrIt, nameIt] = disasm.map.equal_range(oldAddress);
+        for (auto it = addrIt; it != nameIt; ) {
             if (name.compare(QString::fromStdString(it->second), Qt::CaseInsensitive) == 0) {
                 it = disasm.map.erase(it);
             } else {
@@ -2004,7 +2004,7 @@ void MainWindow::gotoDisasmAddr(uint32_t address) {
     ui->disasm->setFocus();
 }
 
-QAction *MainWindow::gotoDisasmAction(QMenu *menu) {
+QAction *MainWindow::gotoDisasmAction(QMenu *menu) const {
     QAction *gotoDisasm = menu->addAction(ACTION_GOTO_DISASM_VIEW);
     gotoDisasm->setEnabled(m_uiEditMode || ui->debugDisassemblyWidget->isVisible());
     return gotoDisasm;
@@ -2047,7 +2047,7 @@ HexWidget *MainWindow::gotoMemAddrNoRaise(uint32_t address) {
     return memWidget;
 }
 
-QAction *MainWindow::gotoMemAction(QMenu *menu, bool vat) {
+QAction *MainWindow::gotoMemAction(QMenu *menu, bool vat) const {
     QAction *gotoMem = menu->addAction(vat ? ACTION_GOTO_VAT_MEMORY_VIEW : ACTION_GOTO_MEMORY_VIEW);
     gotoMem->setEnabled(m_uiEditMode || ui->debugMemoryWidget->isVisible() || !m_docksMemory.isEmpty());
     return gotoMem;
@@ -2220,7 +2220,7 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *e) {
 // Stack
 // ------------------------------------------------
 
-bool MainWindow::adlState(int state) {
+bool MainWindow::adlState(int state) const {
     bool adl = ui->checkADL->isChecked();
     if (state == Qt::Checked) {
         adl = true;
@@ -2454,7 +2454,7 @@ void MainWindow::osUpdate() {
     connect(ui->fpStack, &QTableWidget::itemChanged, this, &MainWindow::fpModified);
 }
 
-void MainWindow::opModified(QTableWidgetItem *item) {
+void MainWindow::opModified(QTableWidgetItem *item) const {
     if (item == Q_NULLPTR) {
         return;
     }
@@ -2519,7 +2519,7 @@ void MainWindow::opModified(QTableWidgetItem *item) {
     sender()->blockSignals(false);
 }
 
-void MainWindow::fpModified(QTableWidgetItem *item) {
+void MainWindow::fpModified(QTableWidgetItem *item) const {
     if (item == Q_NULLPTR) {
         return;
     }
@@ -2637,7 +2637,7 @@ void MainWindow::contextVat(const QPoint &posa) {
     }
 }
 
-void MainWindow::memDocksUpdate() {
+void MainWindow::memDocksUpdate() const {
     QList<QDockWidget*> docks = findChildren<QDockWidget*>();
     foreach (QDockWidget* dock, docks) {
         if (dock->windowTitle().contains(TXT_MEM_DOCK)) {

gui/qt/debugger/disasm.cpp

@@ -11,16 +11,16 @@ disasm_state_t disasm;
 static char tmpbuf[20];
 
 static std::string strW(uint32_t data) {
-    std::pair<map_t::iterator, map_t::iterator> range;
-    map_t::iterator sit;
-    std::string ret;
     bool high = data > 511;
     if (disasm.il) {
         snprintf(tmpbuf, sizeof(tmpbuf), "$%06X", data);
     } else {
         snprintf(tmpbuf, sizeof(tmpbuf), "$%04X", data);
     }
     if (high) {
+        std::pair<map_t::iterator, map_t::iterator> range;
+        map_t::iterator sit;
+        std::string ret;
         range = disasm.map.equal_range(data);
         for (sit = range.first; sit != range.second; ++sit) {
             ret += sit->second;
@@ -45,15 +45,14 @@ static std::string strW(uint32_t data) {
             }
         }
     }
-    return std::string(tmpbuf);
+    return {tmpbuf};
 }
 
 static std::string strA(uint32_t data) {
-    std::pair<map_t::iterator, map_t::iterator> range;
     map_t::iterator sit;
     std::string ret;
-    bool high = data > 511;
-    range = disasm.map.equal_range(data);
+    const bool high = data > 511;
+    std::pair<map_t::iterator, map_t::iterator> range = disasm.map.equal_range(data);
     for (sit = range.first; sit != range.second; ++sit) {
         if (high || sit->second[0] == '_') {
             if (!ret.empty()) {
@@ -85,7 +84,7 @@ static std::string strA(uint32_t data) {
         }
         snprintf(tmpbuf, sizeof(tmpbuf), "$%04X", data);
     }
-    return std::string(tmpbuf);
+    return {tmpbuf};
 }
 
 static int disasmFetch([[maybe_unused]] struct zdis_ctx *ctx, uint32_t addr) {

gui/qt/debugger/hexwidget.h

@@ -33,8 +33,8 @@ class HexWidget : public QAbstractScrollArea {
     int indexPrevOf(const QByteArray &ba);
     int indexPrevNotOf(const QByteArray &ba);
     int indexOf(const QByteArray &ba);
-    const char *data() { return m_data.constData(); }
-    const char *modified() { return m_modified.constData(); }
+    const char *data() const { return m_data.constData(); }
+    const char *modified() const { return m_modified.constData(); }
 
 protected:
     virtual void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE;

gui/qt/debugger/visualizerdisplaywidget.cpp

@@ -115,7 +115,7 @@ void VisualizerDisplayWidget::setConfig(uint32_t bppstep, int w, int h, uint32_t
     m_image = new QImage(w, h, QImage::Format_RGB32);
 }
 
-void VisualizerDisplayWidget::contextMenu(const QPoint& posa) {
+void VisualizerDisplayWidget::contextMenu(const QPoint& posa) const {
     QString copyStr = tr("Copy Address");
     QString coordStr = tr("Coordinate: ");