attempt to fix Qt 6.4 build

Signed-off-by: Jared Van Bortel <jared@nomic.ai>

.github/workflows/codespell.yml

@@ -1,19 +0,0 @@
----
-name: Codespell
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-
-jobs:
-  codespell:
-    name: Check for spelling errors
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Codespell
-        uses: codespell-project/actions-codespell@v2

.github/workflows/lint.yml

@@ -0,0 +1,46 @@
+---
+name: Lint
+
+on:
+  push:
+    branches: [main]
+  pull_request: {}
+
+jobs:
+  codespell:
+    name: Codespell
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.2.1
+      - name: Codespell
+        uses: codespell-project/actions-codespell@v2.1
+
+  clazy:
+    name: Clazy
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.2.1
+        with:
+          submodules: "recursive"
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install libopengl-dev qt6-base-private-dev qt6-declarative-dev qt6-httpserver-dev qt6-pdf-dev qt6-svg-dev qt6-tools-dev qt6-websockets-dev
+      - name: Configure
+        run: |
+          cmake -S gpt4all-chat -B gpt4all-chat/build \
+            -DCMAKE_C_COMPILER=clang \
+            -DCMAKE_CXX_COMPILER=clang++ \
+            -DLLMODEL_CUDA=OFF \
+            -DLLMODEL_KOMPUTE=OFF
+      - name: Clazy
+        uses: nomic-ai/clazy-action@009a6378b899ab6d20f26647e624f3038384378e
+        with:
+          version: '1.12'
+          checks: "level0,no-container-anti-pattern,no-qstring-arg,no-qstring-ref,no-strict-iterators,no-unused-non-trivial-variable"
+          database: gpt4all-chat/build
+          path-regex: "gpt4all-(chat|backend)/src"

gpt4all-chat/src/chat.cpp

@@ -14,10 +14,13 @@
 #include <QStringList>
 #include <QVariant>
 #include <Qt>
-#include <QtLogging>
 
 #include <utility>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 Chat::Chat(QObject *parent)
     : QObject(parent)
     , m_id(Network::globalInstance()->generateUniqueId())

gpt4all-chat/src/chatapi.cpp

@@ -16,10 +16,13 @@
 #include <QVariant>
 #include <Qt>
 #include <QtGlobal>
-#include <QtLogging>
 
 #include <iostream>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 using namespace Qt::Literals::StringLiterals;
 
 //#define DEBUG

gpt4all-chat/src/chatlistmodel.h

@@ -16,7 +16,10 @@
 #include <QVector>
 #include <Qt>
 #include <QtGlobal>
-#include <QtLogging>
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
 
 class ChatsRestoreThread : public QThread
 {

gpt4all-chat/src/chatllm.cpp

@@ -24,7 +24,6 @@
 #include <QUrl>
 #include <QWaitCondition>
 #include <Qt>
-#include <QtLogging>
 
 #include <algorithm>
 #include <cctype>
@@ -37,6 +36,10 @@
 #include <utility>
 #include <vector>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 using namespace Qt::Literals::StringLiterals;
 
 //#define DEBUG
@@ -198,7 +201,7 @@ bool ChatLLM::loadDefaultModel()
 {
     ModelInfo defaultModel = ModelList::globalInstance()->defaultModelInfo();
     if (defaultModel.filename().isEmpty()) {
-        emit modelLoadingError(u"Could not find any model to load"_qs);
+        emit modelLoadingError(u"Could not find any model to load"_s);
         return false;
     }
     return loadModel(defaultModel);

gpt4all-chat/src/database.cpp

@@ -24,13 +24,16 @@
 #include <QUtf8StringView>
 #include <QVariant>
 #include <Qt>
-#include <QtLogging>
 
 #include <algorithm>
 #include <cmath>
 #include <optional>
 #include <stdexcept>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 using namespace Qt::Literals::StringLiterals;
 namespace ranges = std::ranges;
 namespace us = unum::usearch;

gpt4all-chat/src/download.cpp

@@ -27,13 +27,16 @@
 #include <QVariant>
 #include <QVector>
 #include <Qt>
-#include <QtLogging>
 
 #include <algorithm>
 #include <compare>
 #include <cstddef>
 #include <utility>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 using namespace Qt::Literals::StringLiterals;
 
 class MyDownload: public Download { };

gpt4all-chat/src/embllm.cpp

@@ -22,12 +22,15 @@
 #include <QUrl>
 #include <Qt>
 #include <QtGlobal>
-#include <QtLogging>
 
 #include <exception>
 #include <utility>
 #include <vector>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 using namespace Qt::Literals::StringLiterals;
 
 static const QString EMBEDDING_MODEL_NAME = u"nomic-embed-text-v1.5"_s;

gpt4all-chat/src/llm.cpp

@@ -11,7 +11,10 @@
 #include <QProcess>
 #include <QSettings>
 #include <QUrl>
-#include <QtLogging>
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
 
 #ifdef GPT4ALL_OFFLINE_INSTALLER
 #   include <QDesktopServices>

gpt4all-chat/src/logger.h

@@ -3,7 +3,11 @@
 
 #include <QFile>
 #include <QString>
-#include <QtLogging>
+#include <QtGlobal>
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
 
 class Logger
 {

gpt4all-chat/src/modellist.cpp

@@ -32,7 +32,6 @@
 #include <QTextStream>
 #include <QTimer>
 #include <QUrl>
-#include <QtLogging>
 
 #include <algorithm>
 #include <cstddef>
@@ -41,6 +40,10 @@
 #include <string>
 #include <utility>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 using namespace Qt::Literals::StringLiterals;
 
 //#define USE_LOCAL_MODELSJSON

gpt4all-chat/src/mysettings.cpp

@@ -15,13 +15,17 @@
 #include <QThread>
 #include <QUrl>
 #include <QVariant>
-#include <QtLogging>
+#include <QtGlobal>
 
 #include <algorithm>
 #include <string>
 #include <thread>
 #include <vector>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 using namespace Qt::Literals::StringLiterals;
 
 // used only for settings serialization, do not translate

gpt4all-chat/src/network.cpp

@@ -29,7 +29,6 @@
 #include <QSysInfo>
 #include <Qt>
 #include <QtGlobal>
-#include <QtLogging>
 #include <QUrl>
 #include <QUuid>
 
@@ -37,6 +36,10 @@
 #include <cstring>
 #include <utility>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 #ifdef __GLIBC__
 #   include <gnu/libc-version.h>
 #endif

gpt4all-chat/src/server.cpp

@@ -26,7 +26,6 @@
 #include <Qt>
 #include <QtCborCommon>
 #include <QtGlobal>
-#include <QtLogging>
 
 #include <cstdint>
 #include <iostream>
@@ -37,6 +36,9 @@
 #include <unordered_map>
 #include <utility>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
 #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
 #   include <QTcpServer>
 #endif

gpt4all-chat/src/xlsxtomd.cpp

@@ -16,10 +16,13 @@
 #include <QStringView>
 #include <QVariant>
 #include <QtGlobal>
-#include <QtLogging>
 
 #include <memory>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#   include <QtLogging>
+#endif
+
 using namespace Qt::Literals::StringLiterals;