diff --git a/src/widgets/ColorPicker.cpp b/src/widgets/ColorPicker.cpp
index e35f1c5ff..9e8209748 100644
--- a/src/widgets/ColorPicker.cpp
+++ b/src/widgets/ColorPicker.cpp
@@ -26,8 +26,9 @@ void ColorPickArea::paintEvent(QPaintEvent *event)
 {
     QPainter p(this);
 
-    for (int x = event->rect().x(); x <= event->rect().right(); x++) {
-        for (int y = event->rect().y(); y <= event->rect().bottom(); y++) {
+    const auto& erect = event->rect();
+    for (int x = erect.x(); x <= erect.right(); x++) {
+        for (int y = erect.y(); y <= erect.bottom(); y++) {
             qhelpers::ColorFloat h, s, v;
             QColor c = pointToColor(x, y);
             c.getHsvF(&h, &s, &v);
diff --git a/src/widgets/ColorThemeListView.cpp b/src/widgets/ColorThemeListView.cpp
index c662a5300..83845e91d 100644
--- a/src/widgets/ColorThemeListView.cpp
+++ b/src/widgets/ColorThemeListView.cpp
@@ -371,7 +371,7 @@ void ColorSettingsModel::updateTheme()
     theme.clear();
     ColorThemeWorker::Theme obj = ThemeWorker().getTheme(Config()->getColorTheme());
 
-    for (auto it = obj.constBegin(); it != obj.constEnd(); it++) {
+    for (auto it = obj.constBegin(); it != obj.constEnd(); ++it) {
         theme.push_back({ it.key(), it.value(), false });
     }
 
diff --git a/src/widgets/DecompilerWidget.cpp b/src/widgets/DecompilerWidget.cpp
index c54ad6f93..1a32e8332 100644
--- a/src/widgets/DecompilerWidget.cpp
+++ b/src/widgets/DecompilerWidget.cpp
@@ -57,9 +57,10 @@ DecompilerWidget::DecompilerWidget(MainWindow *main)
         selectedDecompilerId = "ghidra";
     }
     for (Decompiler *dec : decompilers) {
-        ui->decompilerComboBox->addItem(dec->getName(), dec->getId());
+        auto* combobox = ui->decompilerComboBox;
+        combobox->addItem(dec->getName(), dec->getId());
         if (dec->getId() == selectedDecompilerId) {
-            ui->decompilerComboBox->setCurrentIndex(ui->decompilerComboBox->count() - 1);
+            combobox->setCurrentIndex(combobox->count() - 1);
         }
     }
     decompilerSelectionEnabled = decompilers.size() > 1;
diff --git a/src/widgets/GraphGridLayout.cpp b/src/widgets/GraphGridLayout.cpp
index 0cf7840d9..65dd8c516 100644
--- a/src/widgets/GraphGridLayout.cpp
+++ b/src/widgets/GraphGridLayout.cpp
@@ -806,12 +806,12 @@ void calculateSegmentOffsets(std::vector<EdgeSegment> &segments, std::vector<int
         }
         maxSegment.setRange(0, H, -leftColumWidth);
         while (rightSideIt != nodeRightSide.end() && rightSideIt->x + 1 < x) {
-            rightSideIt++;
+            ++rightSideIt;
         }
         while (rightSideIt != nodeRightSide.end() && rightSideIt->x + 1 == x) {
             maxSegment.setRange(rightSideIt->y0, rightSideIt->y1 + 1,
                                 rightSideIt->size - leftColumWidth);
-            rightSideIt++;
+            ++rightSideIt;
         }
 
         while (nextSegmentIt != segments.end() && nextSegmentIt->x == x
@@ -823,7 +823,7 @@ void calculateSegmentOffsets(std::vector<EdgeSegment> &segments, std::vector<int
             y += nextSegmentIt->spacingOverride ? nextSegmentIt->spacingOverride : segmentSpacing;
             maxSegment.setRange(nextSegmentIt->y0, nextSegmentIt->y1 + 1, y);
             edgeOffsets[nextSegmentIt->edgeIndex] = y;
-            nextSegmentIt++;
+            ++nextSegmentIt;
         }
 
         auto firstRightSideSegment = nextSegmentIt;
@@ -836,19 +836,19 @@ void calculateSegmentOffsets(std::vector<EdgeSegment> &segments, std::vector<int
 
         maxSegment.setRange(0, H, -rightColumnWidth);
         while (leftSideIt != nodeLeftSide.end() && leftSideIt->x < x) {
-            leftSideIt++;
+            ++leftSideIt;
         }
         while (leftSideIt != nodeLeftSide.end() && leftSideIt->x == x) {
             maxSegment.setRange(leftSideIt->y0, leftSideIt->y1 + 1,
                                 leftSideIt->size - rightColumnWidth);
-            leftSideIt++;
+            ++leftSideIt;
         }
         while (nextSegmentIt != segments.end() && nextSegmentIt->x == x) {
             int y = maxSegment.rangeMaximum(nextSegmentIt->y0, nextSegmentIt->y1 + 1);
             y += nextSegmentIt->spacingOverride ? nextSegmentIt->spacingOverride : segmentSpacing;
             maxSegment.setRange(nextSegmentIt->y0, nextSegmentIt->y1 + 1, y);
             edgeOffsets[nextSegmentIt->edgeIndex] = y;
-            nextSegmentIt++;
+            ++nextSegmentIt;
         }
         auto rightSideMiddle = std::max(maxSegment.rangeMaximum(0, H), 0);
         rightSideMiddle =
@@ -916,10 +916,10 @@ static void centerEdges(std::vector<int> &segmentOffsets, const std::vector<int>
             int offset = segmentOffsets[it->index];
             left = std::min(left, offset);
             right = std::max(right, offset);
-            it++;
+            ++it;
         }
         int spacing = (edgeColumnWidth[chunkStart->x] - (right - left)) / 2 - left;
-        for (auto segment = chunkStart; segment != it; segment++) {
+        for (auto segment = chunkStart; segment != it; ++segment) {
             if (segment->start) {
                 segmentOffsets[segment->index] += spacing;
             }
@@ -1556,7 +1556,7 @@ static void createInequalitiesFromSegments(std::vector<Segment> segments,
             ++it;
         }
         if (startPos->first < segment.y0) {
-            startPos++;
+            ++startPos;
         }
         lastSegments.erase(startPos, it); // erase segments covered by current one
         lastSegments[segment.y0] = {
diff --git a/src/widgets/HexdumpWidget.cpp b/src/widgets/HexdumpWidget.cpp
index 306582d9f..02dee8dd2 100644
--- a/src/widgets/HexdumpWidget.cpp
+++ b/src/widgets/HexdumpWidget.cpp
@@ -238,7 +238,7 @@ void HexdumpWidget::updateParseWindow(RVA start_address, int size)
         tempConfig.set("asm.arch", arch).set("asm.bits", bits).set("cfg.bigendian", bigEndian);
 
         ui->hexDisasTextEdit->setPlainText(
-                selectedCommand != "" ? Core()->cmdRawAt(
+                !selectedCommand.isEmpty() ? Core()->cmdRawAt(
                         QString("%1 @! %2").arg(selectedCommand).arg(size), start_address)
                                       : "");
     } else {