chore: misc static analysis fixes

docs/assets/css/home.css

@@ -71,7 +71,7 @@
 
 /* General */
 
-article h1:first-child
+article h1:first-child,
 article, h2:first-child {
 	margin-top: 0;
 }

docs/docs/commands/szurubooru.js

@@ -39,9 +39,9 @@ async function updateTag(name, version, category) {
 async function setTagCategory(name, category) {
     const tag = await getTag(name);
     if (tag === null) {
-        createTag(name, category);
+        await createTag(name, category);
     } else if (tag.category !== category) {
-        updateTag(name, tag.version, category);
+        await updateTag(name, tag.version, category);
     }
 }
 
@@ -72,7 +72,7 @@ async function setTagCategory(name, category) {
 
     // Parse tags and update categories
     const tags = argv[0].split(" ");
-    for (i = 0; i < tags.length; ++i) {
+    for (let i = 0; i < tags.length; ++i) {
         const parts = tags[i].split(":");
         const category = parts.shift();
         const name = parts.join(":");

docs/docs/sites/javascript-helper.md

@@ -27,15 +27,15 @@ Global match a PCRE regex in a string.
 ```
 \d+ (\d+) (?<third>\d+)
 ```
-```javascript
+```json
 "01 23 45 67 89 01 23 45 67 89"
 ```
-```javascript
+```json
 [
     {
         "0": "01 23 45",
         "1": "23",
-        "2": "45"
+        "2": "45",
         "third": "45"
     },
     {
@@ -78,7 +78,7 @@ Parses the string passed and return the parsed XML tree.
     </post>
 </posts>
 ```
-```javascript
+```json
 {
     "posts": {
         "@attributes": {

scripts/generate-sources-metadata.js

@@ -37,7 +37,7 @@ function getLastCommit(path) {
 
 const args = process.argv.slice(2);
 const branch = args.length > 0 ? args[0] : "master";
-const isNightly = branch == "develop";
+const isNightly = branch === "develop";
 const output = {
     name: "Official Grabber sources" + (isNightly ? " (nightly)" : ""),
     home: "https://github.com/Bionus/imgbrd-grabber",

src/cli/src/cli-commands/get-details-cli-command.h

@@ -33,4 +33,4 @@ class GetDetailsCliCommand : public CliCommand
 		Image *m_image;
 };
 
-#endif // LOAD_TAG_DATABASE_CLI_COMMAND_H
+#endif // GET_DETAILS_CLI_COMMAND_H

src/cli/src/cli.cpp

@@ -166,8 +166,8 @@ int parseAndRunCliArgs(QCoreApplication *app, Profile *profile, bool defaultToGu
 
 	QTextStream stream(stdout);
 	Printer *printer = parser.isSet(jsonOption)
-		? (Printer*) new JsonPrinter(&stream, profile)
-		: (Printer*) new SimplePrinter(&stream, parser.value(tagsFormatOption));
+		? static_cast<Printer*>(new JsonPrinter(&stream, profile))
+		: static_cast<Printer*>(new SimplePrinter(&stream, parser.value(tagsFormatOption)));
 
 	CliCommand *cmd = nullptr;
 

src/cli/src/printers/json-printer.cpp

@@ -3,6 +3,7 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QList>
+#include <QMetaType>
 #include <QSharedPointer>
 #include <QTextStream>
 #include "logger.h"
@@ -90,17 +91,19 @@ QJsonObject JsonPrinter::serializeImage(const Image &image) const
 
 	QJsonObject jsObject;
 
-	const auto tokens = image.tokens(m_profile);
-	for (auto& key : tokens.keys()) {
-		typedef QVariant::Type Type;
+	const auto &tokens = image.tokens(m_profile);
+    for (auto it = tokens.constBegin(); it != tokens.constEnd(); ++it) {
+		typedef QMetaType::Type Type;
+
+        const QString &key = it.key();
 		if (ignoreKeys.contains(key)) {
 			continue;
 		}
 		if (key.contains("search_")) {
 			continue;
 		}
 
-		const QVariant& qvalue = tokens.value(key).value();
+		const QVariant &qvalue = it.value().value();
 		auto type = qvalue.type();
 
 		if (type == QVariant::Type::StringList) {

src/cli/src/printers/json-printer.h

@@ -22,7 +22,7 @@ class JsonPrinter : public Printer
 		void print(int val) const override;
 		void print(const QString &val) const override;
 
-		void print(const Image &val) const override;
+		void print(const Image &image) const override;
 		void print(const QList<QSharedPointer<Image>> &images) const override;
 		void print(const Tag &tag, Site *site) const override;
 		void print(const QList<Tag> &tags, Site *site) const override;

src/cli/src/printers/simple-printer.h

@@ -21,7 +21,7 @@ class SimplePrinter : public Printer
 		void print(int val) const override;
 		void print(const QString &val) const override;
 
-		void print(const Image &val) const override;
+		void print(const Image &image) const override;
 		void print(const QList<QSharedPointer<Image>> &images) const override;
 		void print(const Tag &tag, Site *site) const override;
 		void print(const QList<Tag> &tags, Site *site) const override;

src/gui-qml/src/async-image-provider.cpp

@@ -37,7 +37,7 @@ QQuickImageResponse *AsyncImageProvider::requestImageResponse(const QString &id,
 	auto *reply = manager->get(request);
 
 	auto *ret = new AsyncImageResponse(reply, rect);
-	QObject::connect(ret, &AsyncImageResponse::finished, manager, &QNetworkAccessManager::deleteLater);
+	connect(ret, &AsyncImageResponse::finished, manager, &QNetworkAccessManager::deleteLater);
 
 	return ret;
 }

src/gui-qml/src/async-image-response.cpp

@@ -29,4 +29,4 @@ void AsyncImageResponse::replyFinished()
 	}
 
 	emit finished();
-};
+}

src/gui-qml/src/components/settings/pages/TagSaveSettingsPage.qml

@@ -62,7 +62,7 @@ ColumnLayout {
     }
     SpinBoxSetting {
         name: qsTr("Keep n tags")
-        visible: multipleSetting.value == "keepN"
+        visible: multipleSetting.value === "keepN"
         setting: Setting {
             key: "Save/" + key + "_multiple_keepN"
             def: 1
@@ -71,7 +71,7 @@ ColumnLayout {
     }
     SpinBoxSetting {
         name: qsTr("Keep n tags")
-        visible: multipleSetting.value == "keepNThenAdd"
+        visible: multipleSetting.value === "keepNThenAdd"
         setting: Setting {
             key: "Save/" + key + "_multiple_keepNThenAdd_keep"
             def: 1
@@ -80,7 +80,7 @@ ColumnLayout {
     }
     TextFieldSetting {
         name: qsTr("Then add")
-        visible: multipleSetting.value == "keepNThenAdd"
+        visible: multipleSetting.value === "keepNThenAdd"
         setting: Setting {
             key: "Save/" + key + "_multiple_keepNThenAdd_add"
             def: " (+ %count%)"
@@ -89,7 +89,7 @@ ColumnLayout {
     }
     TextFieldSetting {
         name: qsTr("Replace all tags by")
-        visible: multipleSetting.value == "replaceAll"
+        visible: multipleSetting.value === "replaceAll"
         setting: Setting {
             key: "Save/" + key + "_value"
             def: defaultMultiple

src/gui-qml/src/loaders/search-loader.cpp

@@ -11,7 +11,7 @@
 
 
 SearchLoader::SearchLoader(QObject *parent)
-	: Loader(parent), m_page(1), m_perPage(20), m_hasPrev(false), m_hasNext(false)
+	: Loader(parent), m_page(1), m_perPage(20), m_profile(nullptr), m_hasPrev(false), m_hasNext(false)
 {}
 
 

src/gui-qml/src/main.cpp

@@ -88,10 +88,10 @@ int main(int argc, char *argv[])
 	// Define a few globals
 	engine.rootContext()->setContextProperty("VERSION", QString(VERSION));
 	#ifdef NIGHTLY
-		engine.rootContext()->setContextProperty("NIGHTLY", true);
+		engine.rootContext()->setContextProperty("NIGHTLY", QVariant(true));
 		engine.rootContext()->setContextProperty("NIGHTLY_COMMIT", QString(NIGHTLY_COMMIT));
 	#else
-		engine.rootContext()->setContextProperty("NIGHTLY", false);
+		engine.rootContext()->setContextProperty("NIGHTLY", QVariant(false));
 		engine.rootContext()->setContextProperty("NIGHTLY_COMMIT", QString());
 	#endif
 

src/gui-qml/src/models/qml-image.h

@@ -56,7 +56,7 @@ class QmlImage : public QObject
 		bool isGallery() const { return m_image->isGallery(); }
 
 	public slots:
-		void loadTags() { m_image->loadDetails(); };
+		void loadTags() { m_image->loadDetails(); }
 
 	private:
 		QSharedPointer<Image> m_image;

src/gui-qml/src/share/android/android-share-utils.cpp

@@ -7,6 +7,7 @@ AndroidShareUtils::AndroidShareUtils(QQuickItem* parent)
 	: BaseShareUtils(parent)
 {}
 
+
 bool AndroidShareUtils::share(const QString &text)
 {
 	if (!QJniObject::isClassAvailable("org/bionus/grabber/ShareUtils")) {

src/gui-qml/src/share/android/android-share-utils.h

@@ -9,7 +9,7 @@ class AndroidShareUtils : public BaseShareUtils
 	Q_OBJECT
 
 	public:
-		AndroidShareUtils(QQuickItem* parent = 0);
+		explicit AndroidShareUtils(QQuickItem *parent = nullptr);
 
 		bool share(const QString &text) override;
 		bool sendFile(const QString &path, const QString &mimeType, const QString &title) override;

src/gui-qml/src/share/base-share-utils.h

@@ -8,7 +8,7 @@
 class BaseShareUtils : public QQuickItem
 {
 	public:
-		BaseShareUtils(QQuickItem *parent = 0) : QQuickItem(parent){}
+		explicit BaseShareUtils(QQuickItem *parent = nullptr) : QQuickItem(parent){}
 		virtual ~BaseShareUtils() {}
 
 		virtual bool share(const QString &text) { return true; }

src/gui-qml/src/share/share-utils.h

@@ -11,7 +11,7 @@ class ShareUtils : public QQuickItem
 	Q_OBJECT
 
 	public:
-		explicit ShareUtils(QQuickItem *parent = 0);
+		explicit ShareUtils(QQuickItem *parent = nullptr);
 
 	public slots:
 		void share(const QString &text);

src/gui-qml/src/share/windows/windows-share-utils.h

@@ -10,7 +10,7 @@ class WindowsShareUtils : public BaseShareUtils
 	Q_OBJECT
 
 	public:
-		WindowsShareUtils(QQuickItem *parent = nullptr);
+		explicit WindowsShareUtils(QQuickItem *parent = nullptr);
 
 		bool share(const QString &text) override;
 		bool shareUrl(const QUrl &url);

src/gui-qml/src/syntax-highlighter-helper.h

@@ -13,7 +13,7 @@ class SyntaxHighlighterHelper : public QObject
 	Q_PROPERTY(QQuickTextDocument * quickDocument READ quickDocument WRITE setQuickDocument NOTIFY quickDocumentChanged)
 
 	public:
-		SyntaxHighlighterHelper(QObject *parent = nullptr) : QObject(parent), m_quickDocument(nullptr) {}
+		explicit SyntaxHighlighterHelper(QObject *parent = nullptr) : QObject(parent), m_quickDocument(nullptr) {}
 		QQuickTextDocument *quickDocument() const { return m_quickDocument; }
 		void setQuickDocument(QQuickTextDocument *quickDocument)
 		{

src/gui/src/about-window.h

@@ -18,7 +18,7 @@ class AboutWindow : public QDialog
 	Q_OBJECT
 
 	public:
-		explicit AboutWindow(const QString &v, QWidget *parent = nullptr);
+		explicit AboutWindow(const QString &version, QWidget *parent = nullptr);
 		~AboutWindow() override;
 
 	public slots:

src/gui/src/batch/add-unique-window.cpp

@@ -167,7 +167,7 @@ void AddUniqueWindow::loadNext()
 		connect(m_image.data(), &Image::finishedLoadingTags, this, &AddUniqueWindow::addLoadedImage);
 		m_image->loadDetails();
 	} else {
-		const QString query = (q.id.isEmpty() ? "md5:" + q.md5 : "id:" + q.id);
+		const QString query = q.id.isEmpty() ? "md5:" + q.md5 : "id:" + q.id;
 		const QStringList search { query, "status:any" };
 		m_page = new Page(m_profile, q.site, m_sites.values(), search, 1, 1);
 		connect(m_page, &Page::finishedLoading, this, &AddUniqueWindow::replyFinished);

src/gui/src/batch/batch-window.cpp

@@ -196,7 +196,7 @@ void BatchWindow::addImage(const QUrl &url, int batch, double size)
 	}
 
 	static QIcon pendingIcon(":/images/status/pending.png");
-	QTableWidgetItem *id = new QTableWidgetItem(QString::number(m_items + 1));
+	auto *id = new QTableWidgetItem(QString::number(m_items + 1));
 	id->setIcon(pendingIcon);
 
 	ui->tableWidget->setItem(m_items, 0, id);

src/gui/src/docks/dock.cpp

@@ -2,7 +2,7 @@
 
 
 Dock::Dock(QWidget *parent)
-	: QWidget(parent)
+	: QWidget(parent), m_currentTab(nullptr)
 {}
 
 void Dock::tabChanged(SearchTab *tab)

src/gui/src/docks/favorites-dock.cpp

@@ -49,7 +49,7 @@ void FavoritesDock::contextMenu(const QPoint &pos)
 	}
 
 	const QList<Site*> sites = m_currentTab->loadSites();
-	TagContextMenu *menu = new TagContextMenu(m_hover, {}, {}, m_profile, sites, false, this);
+    auto *menu = new TagContextMenu(m_hover, {}, {}, m_profile, sites, false, this);
 	connect(menu, &TagContextMenu::openNewTab, this, &FavoritesDock::emitOpenInNewTab);
 	menu->exec(QCursor::pos());
 }
@@ -101,7 +101,7 @@ void FavoritesDock::refresh()
 
 	int i = 0;
 	for (const Favorite &fav : qAsConst(m_favorites)) {
-		QAffiche *lab = new QAffiche(QString(fav.getName()), 0, QColor(), this);
+        auto *lab = new QAffiche(QString(fav.getName()), 0, QColor(), this);
 		lab->setText(fav.getName());
 		lab->setToolTip("<img src=\"" + fav.getImagePath() + "\" /><br/>" + tr("<b>Name:</b> %1<br/><b>Note:</b> %2 %%<br/><b>Last view:</b> %3").arg(fav.getName(), QString::number(fav.getNote()), QLocale().toString(fav.getLastViewed(), QLocale::ShortFormat)));
 		lab->setCursor(Qt::PointingHandCursor);

src/gui/src/docks/settings-dock.cpp

@@ -55,13 +55,13 @@ void SettingsDock::reset()
 {
 	// Reload filename history
 	QFile f(m_profile->getPath() + "/filenamehistory.txt");
-	QStringList filenames;
+	QSet<QString> filenames;
 	if (f.open(QFile::ReadOnly | QFile::Text)) {
 		QString line;
 		while (!(line = f.readLine()).isEmpty()) {
 			QString l = line.trimmed();
 			if (!l.isEmpty() && !filenames.contains(l)) {
-				filenames.append(l);
+				filenames.insert(l);
 				ui->comboFilename->addItem(l);
 			}
 		}

src/gui/src/download-group-table-model.cpp

@@ -110,7 +110,7 @@ Qt::ItemFlags DownloadGroupTableModel::flags(const QModelIndex &index) const
 		return Qt::ItemIsEnabled | Qt::ItemIsDropEnabled;
 	}
 
-	Qt::ItemFlags flags = QAbstractItemModel::flags(index);
+	Qt::ItemFlags flags = QAbstractTableModel::flags(index);
 	flags |= Qt::ItemIsDragEnabled;
 
 	const int minColumn = m_downloads[index.row()].query.gallery.isNull() ? 1 : 2; // Cannot edit gallery queries
@@ -188,11 +188,11 @@ bool DownloadGroupTableModel::setData(const QModelIndex &index, const QVariant &
 			break;
 
 		case 9:
-			download.getBlacklisted = (val != "false");
+			download.getBlacklisted = val != "false";
 			break;
 
 		case 10:
-			download.galleriesCountAsOne = (val != "false");
+			download.galleriesCountAsOne = val != "false";
 			break;
 	}
 

src/gui/src/full-width-drop-proxy-style.h

@@ -12,7 +12,7 @@ class QWidget;
 class FullWidthDropProxyStyle : public QProxyStyle
 {
 	public:
-		FullWidthDropProxyStyle(QStyle *style = nullptr);
+		explicit FullWidthDropProxyStyle(QStyle *style = nullptr);
 		void drawPrimitive(QStyle::PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = nullptr) const override;
 };