cxx-qt-build: move opts to it's own file

Author: ahayzen-kdab

crates/cxx-qt-build/src/lib.rs

@@ -14,6 +14,9 @@
 mod diagnostics;
 use diagnostics::{Diagnostic, GeneratedError};
 
+mod opts;
+pub use opts::CxxQtBuildersOpts;
+
 mod qml_modules;
 use qml_modules::OwningQmlModule;
 pub use qml_modules::QmlModule;
@@ -308,17 +311,6 @@ pub struct CxxQtBuilder {
     extra_defines: HashSet<String>,
 }
 
-/// Options for external crates to use
-#[derive(Default)]
-pub struct CxxQtBuildersOpts {
-    /// Any extra definitions
-    pub defines: HashSet<String>,
-    /// Contents, directory, file name
-    pub headers: Vec<(String, String, String)>,
-    /// Qt modules that are required
-    pub qt_modules: HashSet<String>,
-}
-
 impl CxxQtBuilder {
     /// Create a new builder
     pub fn new() -> Self {

crates/cxx-qt-build/src/opts.rs

@@ -0,0 +1,44 @@
+// SPDX-FileCopyrightText: 2024 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
+// SPDX-FileContributor: Andrew Hayzen <[email protected]>
+//
+// SPDX-License-Identifier: MIT OR Apache-2.0
+
+use std::collections::HashSet;
+
+/// Options for external crates to use
+#[derive(Default)]
+pub struct CxxQtBuildersOpts {
+    /// Any extra definitions
+    pub(crate) defines: HashSet<String>,
+    /// Contents, directory, file name
+    pub(crate) headers: Vec<(String, String, String)>,
+    /// Qt modules that are required
+    pub(crate) qt_modules: HashSet<String>,
+}
+
+impl CxxQtBuildersOpts {
+    /// Any additional defines that are required from this opt
+    pub fn define(mut self, define: &str) -> Self {
+        self.defines.insert(define.to_owned());
+        self
+    }
+
+    /// Any additional headers that are required from this opt
+    ///
+    /// These are placed in the given sub directory with the given file name
+    pub fn header(mut self, contents: &str, directory: &str, file_name: &str) -> Self {
+        self.headers.push((
+            contents.to_owned(),
+            directory.to_owned(),
+            file_name.to_owned(),
+        ));
+        self
+    }
+
+    /// Link additional [Qt modules](https://doc.qt.io/qt-6/qtmodules.html) for this opt.
+    /// Specify their names without the `Qt` prefix, for example `"Widgets"`.
+    pub fn qt_module(mut self, module: &str) -> Self {
+        self.qt_modules.insert(module.to_owned());
+        self
+    }
+}

crates/cxx-qt-lib-headers/src/lib.rs

@@ -100,23 +100,17 @@ pub fn build_opts() -> cxx_qt_build::CxxQtBuildersOpts {
         (include_str!("../include/qml/qqmlengine.h"), "qqmlengine.h"),
         (include_str!("../include/common.h"), "common.h"),
     ] {
-        opts.headers.push((
-            file_contents.to_owned(),
-            "cxx-qt-lib".to_owned(),
-            file_name.to_owned(),
-        ));
+        opts = opts.header(file_contents, "cxx-qt-lib", file_name);
     }
 
     #[cfg(feature = "qt_gui")]
     {
-        opts.defines.insert("CXX_QT_GUI_FEATURE".to_owned());
-        opts.qt_modules.insert("Gui".to_owned());
+        opts = opts.define("CXX_QT_GUI_FEATURE").qt_module("Gui");
     }
 
     #[cfg(feature = "qt_qml")]
     {
-        opts.defines.insert("CXX_QT_QML_FEATURE".to_owned());
-        opts.qt_modules.insert("Qml".to_owned());
+        opts = opts.define("CXX_QT_QML_FEATURE").qt_module("Qml");
     }
 
     opts