From 97a2e18149837b988b6fed99ca8b938b824646b6 Mon Sep 17 00:00:00 2001
From: Jared Van Bortel <jared@nomic.ai>
Date: Thu, 20 Feb 2025 15:53:36 -0500
Subject: [PATCH] WIP: fix import order and enable module scanning

---
 gpt4all-backend-test/src/main.cpp  | 4 ++--
 gpt4all-chat/CMakeLists.txt        | 1 +
 gpt4all-chat/src/chatapi.cpp       | 4 ++--
 gpt4all-chat/src/chatllm.cpp       | 3 ++-
 gpt4all-chat/src/chatmodel.h       | 4 ++--
 gpt4all-chat/src/database.cpp      | 3 ++-
 gpt4all-chat/src/jinja_helpers.cpp | 2 ++
 gpt4all-chat/src/server.cpp        | 3 ++-
 gpt4all-chat/src/utils.h           | 5 ++---
 9 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/gpt4all-backend-test/src/main.cpp b/gpt4all-backend-test/src/main.cpp
index 6aabf475..641e47b7 100644
--- a/gpt4all-backend-test/src/main.cpp
+++ b/gpt4all-backend-test/src/main.cpp
@@ -1,9 +1,9 @@
+#include <QLatin1StringView>
+
 import fmt;
 import gpt4all.backend.main;
 import gpt4all.test.config;
 
-#include <QLatin1StringView>
-
 using gpt4all::backend::LLMProvider;
 
 
diff --git a/gpt4all-chat/CMakeLists.txt b/gpt4all-chat/CMakeLists.txt
index 6e56182a..9e203743 100644
--- a/gpt4all-chat/CMakeLists.txt
+++ b/gpt4all-chat/CMakeLists.txt
@@ -391,6 +391,7 @@ qt_add_translations(chat
 )
 
 set_target_properties(chat PROPERTIES
+    CXX_SCAN_FOR_MODULES ON
     WIN32_EXECUTABLE TRUE
 )
 
diff --git a/gpt4all-chat/src/chatapi.cpp b/gpt4all-chat/src/chatapi.cpp
index aa2a7f6f..363aa5a0 100644
--- a/gpt4all-chat/src/chatapi.cpp
+++ b/gpt4all-chat/src/chatapi.cpp
@@ -2,8 +2,6 @@
 
 #include "utils.h"
 
-#include <fmt/format.h>
-
 #include <QAnyStringView>
 #include <QCoreApplication>
 #include <QDebug>
@@ -30,6 +28,8 @@
 #include <iostream>
 #include <utility>
 
+import fmt;
+
 using namespace Qt::Literals::StringLiterals;
 
 //#define DEBUG
diff --git a/gpt4all-chat/src/chatllm.cpp b/gpt4all-chat/src/chatllm.cpp
index 1fbcce8c..1fb59165 100644
--- a/gpt4all-chat/src/chatllm.cpp
+++ b/gpt4all-chat/src/chatllm.cpp
@@ -11,7 +11,6 @@
 #include "toolmodel.h"
 #include "toolcallparser.h"
 
-#include <fmt/format.h>
 #include <minja/minja.hpp>
 #include <nlohmann/json.hpp>
 
@@ -62,6 +61,8 @@
 #include <utility>
 #include <vector>
 
+import fmt;
+
 using namespace Qt::Literals::StringLiterals;
 using namespace ToolEnums;
 namespace ranges = std::ranges;
diff --git a/gpt4all-chat/src/chatmodel.h b/gpt4all-chat/src/chatmodel.h
index 21adefcb..4eed504b 100644
--- a/gpt4all-chat/src/chatmodel.h
+++ b/gpt4all-chat/src/chatmodel.h
@@ -7,8 +7,6 @@
 #include "utils.h" // IWYU pragma: keep
 #include "xlsxtomd.h"
 
-#include <fmt/format.h>
-
 #include <QAbstractListModel>
 #include <QBuffer>
 #include <QByteArray>
@@ -42,6 +40,8 @@
 #include <utility>
 #include <vector>
 
+import fmt;
+
 using namespace Qt::Literals::StringLiterals;
 namespace ranges = std::ranges;
 namespace views  = std::views;
diff --git a/gpt4all-chat/src/database.cpp b/gpt4all-chat/src/database.cpp
index 51bc705f..199753ff 100644
--- a/gpt4all-chat/src/database.cpp
+++ b/gpt4all-chat/src/database.cpp
@@ -4,7 +4,6 @@
 #include "utils.h" // IWYU pragma: keep
 
 #include <duckx/duckx.hpp>
-#include <fmt/format.h>
 #include <usearch/index.hpp>
 #include <usearch/index_plugins.hpp>
 
@@ -42,6 +41,8 @@
 #   include <fpdf_text.h>
 #endif
 
+import fmt;
+
 using namespace Qt::Literals::StringLiterals;
 namespace ranges = std::ranges;
 namespace us = unum::usearch;
diff --git a/gpt4all-chat/src/jinja_helpers.cpp b/gpt4all-chat/src/jinja_helpers.cpp
index c3033d78..1a91014a 100644
--- a/gpt4all-chat/src/jinja_helpers.cpp
+++ b/gpt4all-chat/src/jinja_helpers.cpp
@@ -7,6 +7,8 @@
 #include <string>
 #include <utility>
 
+import fmt;
+
 namespace views  = std::views;
 using json = nlohmann::ordered_json;
 
diff --git a/gpt4all-chat/src/server.cpp b/gpt4all-chat/src/server.cpp
index 5f04b6f7..74015e06 100644
--- a/gpt4all-chat/src/server.cpp
+++ b/gpt4all-chat/src/server.cpp
@@ -6,7 +6,6 @@
 #include "mysettings.h"
 #include "utils.h" // IWYU pragma: keep
 
-#include <fmt/format.h>
 #include <gpt4all-backend/llmodel.h>
 
 #include <QByteArray>
@@ -49,6 +48,8 @@
 #include <variant>
 #include <vector>
 
+import fmt;
+
 using namespace std::string_literals;
 using namespace Qt::Literals::StringLiterals;
 
diff --git a/gpt4all-chat/src/utils.h b/gpt4all-chat/src/utils.h
index 4d2b8ecd..72d1e253 100644
--- a/gpt4all-chat/src/utils.h
+++ b/gpt4all-chat/src/utils.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <fmt/base.h>
-#include <fmt/format.h>
-
 #include <QByteArray>
 #include <QJsonValue>
 #include <QLatin1StringView> // IWYU pragma: keep
@@ -15,6 +12,8 @@
 #include <string_view>
 #include <utility> // IWYU pragma: keep
 
+import fmt;
+
 // IWYU pragma: no_forward_declare QJsonValue
 class QJsonObject;