App: minor code improvements

HuguesDelorme · HuguesDelorme · commit ef0668a412a9 · 2025-12-03T18:08:39.000+01:00
diff --git a/src/app/grid_helper.cpp b/src/app/grid_helper.cpp
@@ -63,13 +63,13 @@ void ProxyModel::setSourceModel(QAbstractItemModel* newModel)
 QVariant ProxyModel::data(const QModelIndex& index, int role) const
 {
     const std::optional<QModelIndex> sourceIndex = this->mapToSource(index);
-    return sourceIndex ? this->sourceModel()->data(*sourceIndex, role) : QVariant();
+    return sourceIndex ? this->sourceModel()->data(*sourceIndex, role) : QVariant{};
 }
 
 Qt::ItemFlags ProxyModel::flags(const QModelIndex& index) const
 {
     const std::optional<QModelIndex> sourceIndex = this->mapToSource(index);
-    return sourceIndex ? this->sourceModel()->flags(*sourceIndex) : Qt::ItemFlags();
+    return sourceIndex ? this->sourceModel()->flags(*sourceIndex) : Qt::ItemFlags{};
 }
 
 bool ProxyModel::hasChildren(const QModelIndex& parent) const
@@ -83,7 +83,7 @@ int ProxyModel::rowCount(const QModelIndex& parent) const
     if (parent.isValid())
         return 0;
 
-    const int rows = this->sourceModel()->rowCount(QModelIndex());
+    const int rows = this->sourceModel()->rowCount({});
     return (rows + m_columnCount - 1) / m_columnCount;
 }
 
@@ -109,7 +109,7 @@ QModelIndex ProxyModel::index(int row, int column, const QModelIndex&) const
 std::optional<QModelIndex> ProxyModel::mapToSource(const QModelIndex& proxyIndex) const
 {
     if (!proxyIndex.isValid())
-        return QModelIndex();
+        return QModelIndex{};
 
     const int sourceRow = proxyIndex.row() * m_columnCount + proxyIndex.column();
     if (sourceRow < sourceModel()->rowCount())
@@ -121,15 +121,16 @@ std::optional<QModelIndex> ProxyModel::mapToSource(const QModelIndex& proxyIndex
 QModelIndex ProxyModel::mapFromSource(const QModelIndex& sourceIndex) const
 {
     if (!sourceIndex.isValid())
-        return QModelIndex();
+        return QModelIndex{};
 
     const int proxyRow = sourceIndex.row() / m_columnCount;
     const int proxyColumn = sourceIndex.row() % m_columnCount;
     return this->index(proxyRow, proxyColumn, QModelIndex());
 }
 
 void ProxyModel::onDataChanged(
-        const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles)
+        const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles
+    )
 {
     emit this->dataChanged(this->mapFromSource(topLeft), this->mapFromSource(bottomRight), roles);
 }
diff --git a/src/app/grid_helper.h b/src/app/grid_helper.h
@@ -22,7 +22,7 @@ class ProxyModel : public QAbstractItemModel {
     Qt::ItemFlags flags(const QModelIndex& index) const override;
     bool hasChildren(const QModelIndex& parent) const override;
     QModelIndex index(int row, int column, const QModelIndex&) const override;
-    QModelIndex parent(const QModelIndex&) const override { return QModelIndex(); }
+    QModelIndex parent(const QModelIndex&) const override { return {}; }
     int rowCount(const QModelIndex& parent) const override;
 
     int columnCount(const QModelIndex& parent) const override;
diff --git a/src/app/list_helper.cpp b/src/app/list_helper.cpp
@@ -57,10 +57,10 @@ int Model::rowCount(const QModelIndex&) const
 QVariant Model::data(const QModelIndex& index, int role) const
 {
     if (!this->hasStorage())
-        return QVariant();
+        return {};
 
     if (!index.isValid() || index.row() >= this->storage()->count())
-        return QVariant();
+        return {};
 
     const ModelItem* item = this->storage()->at(index.row());
     switch (role) {
@@ -76,7 +76,7 @@ QVariant Model::data(const QModelIndex& index, int role) const
             return this->findPixmap(item->imageUrl);
     }
     default:
-        return QVariant();
+        return {};
     }
 }
 
@@ -107,8 +107,7 @@ ItemDelegate::ItemDelegate(QObject* parent)
     m_itemAnimation.setStartValue(0);
     m_itemAnimation.setEndValue(m_itemSize.height());
     QObject::connect(
-        &m_itemAnimation, &QVariantAnimation::valueChanged,
-        this, &ItemDelegate::drawItem
+        &m_itemAnimation, &QVariantAnimation::valueChanged, this, &ItemDelegate::drawItem
     );
 }
 
@@ -130,7 +129,7 @@ void ItemDelegate::paint(
     const bool hovered = option.state & QStyle::State_MouseOver;
     const int yShift = itemBottom - 20;
     const int yName = itemBottom - 20;
-    const QRect rectText = QRect(x, y + yName, w, h);
+    const QRect rectText{x, y + yName, w, h};
     const QPixmap pm = Model::itemPixmapAt(index);
 
     QTextOption textOption;
@@ -169,9 +168,10 @@ void ItemDelegate::paint(
             painter->setPen(m_textColor);
             painter->setFont(fontChange(option.widget).adjustSize(-1));
             painter->drawText(
-                        rectPixmap.adjusted(6, m_itemSpacing, -6, -m_itemSpacing),
-                        item->description,
-                        textOption);
+                rectPixmap.adjusted(6, m_itemSpacing, -6, -m_itemSpacing),
+                item->description,
+                textOption
+            );
         }
 
         painter->setPen(m_pixmapColor);
diff --git a/src/app/theme.cpp b/src/app/theme.cpp
@@ -16,17 +16,18 @@
 
 namespace Mayo {
 
-namespace Internal {
+namespace {
 
-static const QIcon& nullQIcon()
+const QIcon& nullQIcon()
 {
     static const QIcon null;
     return null;
 }
 
-static QString cssFlatComboBox(
+QString cssFlatComboBox(
         const QString& urlPixDownArrow,
-        const QString& urlPixDownArrowDisabled)
+        const QString& urlPixDownArrowDisabled
+    )
 {
     const QPalette appPalette = qApp->palette();
     const QString css = QString(
@@ -59,14 +60,14 @@ static QString cssFlatComboBox(
     return css;
 }
 
-static QPixmap invertedPixmap(const QPixmap& pix)
+QPixmap invertedPixmap(const QPixmap& pix)
 {
     QImage img = pix.toImage();
     img.invertPixels();
     return QPixmap::fromImage(img);
 }
 
-static QString iconFileName(Theme::Icon icn)
+QString iconFileName(Theme::Icon icn)
 {
     switch (icn) {
     case Theme::Icon::AddFile: return "add-file.svg";
@@ -112,7 +113,7 @@ static QString iconFileName(Theme::Icon icn)
     case Theme::Icon::XdeAssembly: return "xde-assembly.svg";
     case Theme::Icon::XdeSimpleShape: return "xde-simple-shape.svg";
     }
-    return QString();
+    return {};
 }
 
 class ThemeClassic : public Theme {
@@ -156,7 +157,7 @@ class ThemeClassic : public Theme {
         case Theme::Color::MessageIndicator_ErrorBackground:
             return QColor(225, 127, 127, 140);
         }
-        return QColor();
+        return {};
     }
 
     const QIcon& icon(Icon icn) const override
@@ -226,7 +227,7 @@ class ThemeDark : public Theme {
         case Theme::Color::MessageIndicator_ErrorBackground:
             return QColor(225, 127, 127, 140);
         }
-        return QColor();
+        return {};
     }
 
     const QIcon& icon(Icon icn) const override
@@ -332,15 +333,15 @@ class ThemeDark : public Theme {
     std::unordered_map<Theme::Icon, QIcon> m_mapIcon;
 };
 
-} // namespace Internal
+} // namespace
 
 Theme* createTheme(const QString& key)
 {
     if (key == "classic")
-        return new Internal::ThemeClassic;
+        return new ThemeClassic;
 
     if (key == "dark")
-        return new Internal::ThemeDark;
+        return new ThemeDark;
 
     return nullptr;
 }

Original file line number	Diff line number	Diff line change
`@@ -63,13 +63,13 @@ void ProxyModel::setSourceModel(QAbstractItemModel* newModel)`
`63`	`63`	`QVariant ProxyModel::data(const QModelIndex& index, int role) const`
`64`	`64`	`{`
`65`	`65`	`const std::optional<QModelIndex> sourceIndex = this->mapToSource(index);`
`66`		`- return sourceIndex ? this->sourceModel()->data(*sourceIndex, role) : QVariant();`
	`66`	`+ return sourceIndex ? this->sourceModel()->data(*sourceIndex, role) : QVariant{};`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`Qt::ItemFlags ProxyModel::flags(const QModelIndex& index) const`
`70`	`70`	`{`
`71`	`71`	`const std::optional<QModelIndex> sourceIndex = this->mapToSource(index);`
`72`		`- return sourceIndex ? this->sourceModel()->flags(*sourceIndex) : Qt::ItemFlags();`
	`72`	`+ return sourceIndex ? this->sourceModel()->flags(*sourceIndex) : Qt::ItemFlags{};`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`bool ProxyModel::hasChildren(const QModelIndex& parent) const`
`@@ -83,7 +83,7 @@ int ProxyModel::rowCount(const QModelIndex& parent) const`
`83`	`83`	`if (parent.isValid())`
`84`	`84`	`return 0;`
`85`	`85`
`86`		`- const int rows = this->sourceModel()->rowCount(QModelIndex());`
	`86`	`+ const int rows = this->sourceModel()->rowCount({});`
`87`	`87`	`return (rows + m_columnCount - 1) / m_columnCount;`
`88`	`88`	`}`
`89`	`89`
`@@ -109,7 +109,7 @@ QModelIndex ProxyModel::index(int row, int column, const QModelIndex&) const`
`109`	`109`	`std::optional<QModelIndex> ProxyModel::mapToSource(const QModelIndex& proxyIndex) const`
`110`	`110`	`{`
`111`	`111`	`if (!proxyIndex.isValid())`
`112`		`- return QModelIndex();`
	`112`	`+ return QModelIndex{};`
`113`	`113`
`114`	`114`	`const int sourceRow = proxyIndex.row() * m_columnCount + proxyIndex.column();`
`115`	`115`	`if (sourceRow < sourceModel()->rowCount())`
`@@ -121,15 +121,16 @@ std::optional<QModelIndex> ProxyModel::mapToSource(const QModelIndex& proxyIndex`
`121`	`121`	`QModelIndex ProxyModel::mapFromSource(const QModelIndex& sourceIndex) const`
`122`	`122`	`{`
`123`	`123`	`if (!sourceIndex.isValid())`
`124`		`- return QModelIndex();`
	`124`	`+ return QModelIndex{};`
`125`	`125`
`126`	`126`	`const int proxyRow = sourceIndex.row() / m_columnCount;`
`127`	`127`	`const int proxyColumn = sourceIndex.row() % m_columnCount;`
`128`	`128`	`return this->index(proxyRow, proxyColumn, QModelIndex());`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`void ProxyModel::onDataChanged(`
`132`		`- const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles)`
	`132`	`+ const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles`
	`133`	`+ )`
`133`	`134`	`{`
`134`	`135`	`emit this->dataChanged(this->mapFromSource(topLeft), this->mapFromSource(bottomRight), roles);`
`135`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,17 +16,18 @@`
`16`	`16`
`17`	`17`	`namespace Mayo {`
`18`	`18`
`19`		`-namespace Internal {`
	`19`	`+namespace {`
`20`	`20`
`21`		`-static const QIcon& nullQIcon()`
	`21`	`+const QIcon& nullQIcon()`
`22`	`22`	`{`
`23`	`23`	`static const QIcon null;`
`24`	`24`	`return null;`
`25`	`25`	`}`
`26`	`26`
`27`		`-static QString cssFlatComboBox(`
	`27`	`+QString cssFlatComboBox(`
`28`	`28`	`const QString& urlPixDownArrow,`
`29`		`- const QString& urlPixDownArrowDisabled)`
	`29`	`+ const QString& urlPixDownArrowDisabled`
	`30`	`+ )`
`30`	`31`	`{`
`31`	`32`	`const QPalette appPalette = qApp->palette();`
`32`	`33`	`const QString css = QString(`
`@@ -59,14 +60,14 @@ static QString cssFlatComboBox(`
`59`	`60`	`return css;`
`60`	`61`	`}`
`61`	`62`
`62`		`-static QPixmap invertedPixmap(const QPixmap& pix)`
	`63`	`+QPixmap invertedPixmap(const QPixmap& pix)`
`63`	`64`	`{`
`64`	`65`	`QImage img = pix.toImage();`
`65`	`66`	`img.invertPixels();`
`66`	`67`	`return QPixmap::fromImage(img);`
`67`	`68`	`}`
`68`	`69`
`69`		`-static QString iconFileName(Theme::Icon icn)`
	`70`	`+QString iconFileName(Theme::Icon icn)`
`70`	`71`	`{`
`71`	`72`	`switch (icn) {`
`72`	`73`	`case Theme::Icon::AddFile: return "add-file.svg";`
`@@ -112,7 +113,7 @@ static QString iconFileName(Theme::Icon icn)`
`112`	`113`	`case Theme::Icon::XdeAssembly: return "xde-assembly.svg";`
`113`	`114`	`case Theme::Icon::XdeSimpleShape: return "xde-simple-shape.svg";`
`114`	`115`	`}`
`115`		`- return QString();`
	`116`	`+ return {};`
`116`	`117`	`}`
`117`	`118`
`118`	`119`	`class ThemeClassic : public Theme {`
`@@ -156,7 +157,7 @@ class ThemeClassic : public Theme {`
`156`	`157`	`case Theme::Color::MessageIndicator_ErrorBackground:`
`157`	`158`	`return QColor(225, 127, 127, 140);`
`158`	`159`	`}`
`159`		`- return QColor();`
	`160`	`+ return {};`
`160`	`161`	`}`
`161`	`162`
`162`	`163`	`const QIcon& icon(Icon icn) const override`
`@@ -226,7 +227,7 @@ class ThemeDark : public Theme {`
`226`	`227`	`case Theme::Color::MessageIndicator_ErrorBackground:`
`227`	`228`	`return QColor(225, 127, 127, 140);`
`228`	`229`	`}`
`229`		`- return QColor();`
	`230`	`+ return {};`
`230`	`231`	`}`
`231`	`232`
`232`	`233`	`const QIcon& icon(Icon icn) const override`
`@@ -332,15 +333,15 @@ class ThemeDark : public Theme {`
`332`	`333`	`std::unordered_map<Theme::Icon, QIcon> m_mapIcon;`
`333`	`334`	`};`
`334`	`335`
`335`		`-} // namespace Internal`
	`336`	`+} // namespace`
`336`	`337`
`337`	`338`	`Theme* createTheme(const QString& key)`
`338`	`339`	`{`
`339`	`340`	`if (key == "classic")`
`340`		`- return new Internal::ThemeClassic;`
	`341`	`+ return new ThemeClassic;`
`341`	`342`
`342`	`343`	`if (key == "dark")`
`343`		`- return new Internal::ThemeDark;`
	`344`	`+ return new ThemeDark;`
`344`	`345`
`345`	`346`	`return nullptr;`
`346`	`347`	`}`