[system/kconfigeditor] /: Check full file
Nicolas Fella <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit c8f96c930b763f516a37c60a5f6f23944df63d00 by Nicolas Fella.
Committed on 04/08/2026 at 15:54.
Pushed by nicolasfella into branch 'master'.
Check full file
M +1 -0 Cargo.lock
M +1 -0 Cargo.toml
A +373 -0 LICENSES/MPL-2.0.txt
M +5 -1 build.rs
A +18 -0 src/kconfig.cpp *
A +17 -0 src/kconfig.h *
A +177 -0 src/kconfig.rs
A +25 -0 src/kconfiggroup.cpp *
A +24 -0 src/kconfiggroup.h *
A +134 -0 src/kconfiggroup.rs
M +133 -26 src/main.rs
M +7 -2 src/util.rs
The files marked with a * at the end have a non valid license. Please read: https://community.kde.org/Policies/Licensing_Policy and use the headers which are listed at that page.
https://invent.kde.org/system/kconfigeditor/-/commit/c8f96c930b763f516a37c60a5f6f23944df63d00
diff --git a/Cargo.lock b/Cargo.lock
index 71b8c63..fcabad6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -132,6 +132,7 @@ dependencies = [
name = "configeditor"
version = "0.1.0"
dependencies = [
+ "bitflags",
"cmake-package",
"cxx",
"cxx-qt",
diff --git a/Cargo.toml b/Cargo.toml
index 5e36296..0335185 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,6 +7,7 @@ version = "0.1.0"
edition = "2021"
[dependencies]
+bitflags = "2.13.1"
cxx = "1.0.192"
cxx-qt = "0.9.1"
cxx-qt-lib = { version = "0.9.1", features = ["qt_full"]}
diff --git a/LICENSES/MPL-2.0.txt b/LICENSES/MPL-2.0.txt
new file mode 100644
index 0000000..ee6256c
--- /dev/null
+++ b/LICENSES/MPL-2.0.txt
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+ means each individual or legal entity that creates, contributes to
+ the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+ means the combination of the Contributions of others (if any) used
+ by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+ means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+ means Source Code Form to which the initial Contributor has attached
+ the notice in Exhibit A, the Executable Form of such Source Code
+ Form, and Modifications of such Source Code Form, in each case
+ including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+ means
+
+ (a) that the initial Contributor has attached the notice described
+ in Exhibit B to the Covered Software; or
+
+ (b) that the Covered Software was made available under the terms of
+ version 1.1 or earlier of the License, but not also under the
+ terms of a Secondary License.
+
+1.6. "Executable Form"
+ means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+ means a work that combines Covered Software with other material, in
+ a separate file or files, that is not Covered Software.
+
+1.8. "License"
+ means this document.
+
+1.9. "Licensable"
+ means having the right to grant, to the maximum extent possible,
+ whether at the time of the initial grant or subsequently, any and
+ all of the rights conveyed by this License.
+
+1.10. "Modifications"
+ means any of the following:
+
+ (a) any file in Source Code Form that results from an addition to,
+ deletion from, or modification of the contents of Covered
+ Software; or
+
+ (b) any new file in Source Code Form that contains any Covered
+ Software.
+
+1.11. "Patent Claims" of a Contributor
+ means any patent claim(s), including without limitation, method,
+ process, and apparatus claims, in any patent Licensable by such
+ Contributor that would be infringed, but for the grant of the
+ License, by the making, using, selling, offering for sale, having
+ made, import, or transfer of either its Contributions or its
+ Contributor Version.
+
+1.12. "Secondary License"
+ means either the GNU General Public License, Version 2.0, the GNU
+ Lesser General Public License, Version 2.1, the GNU Affero General
+ Public License, Version 3.0, or any later versions of those
+ licenses.
+
+1.13. "Source Code Form"
+ means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+ means an individual or a legal entity exercising rights under this
+ License. For legal entities, "You" includes any entity that
+ controls, is controlled by, or is under common control with You. For
+ purposes of this definition, "control" means (a) the power, direct
+ or indirect, to cause the direction or management of such entity,
+ whether by contract or otherwise, or (b) ownership of more than
+ fifty percent (50%) of the outstanding shares or beneficial
+ ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+ Licensable by such Contributor to use, reproduce, make available,
+ modify, display, perform, distribute, and otherwise exploit its
+ Contributions, either on an unmodified basis, with Modifications, or
+ as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+ for sale, have made, import, and otherwise transfer either its
+ Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+ or
+
+(b) for infringements caused by: (i) Your and any other third party's
+ modifications of Covered Software, or (ii) the combination of its
+ Contributions with other software (except as part of its Contributor
+ Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+ its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+ Form, as described in Section 3.1, and You must inform recipients of
+ the Executable Form how they can obtain a copy of such Source Code
+ Form by reasonable means in a timely manner, at a charge no more
+ than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+ License, or sublicense it under different terms, provided that the
+ license for the Executable Form does not attempt to limit or alter
+ the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+* *
+* 6. Disclaimer of Warranty *
+* ------------------------- *
+* *
+* Covered Software is provided under this License on an "as is" *
+* basis, without warranty of any kind, either expressed, implied, or *
+* statutory, including, without limitation, warranties that the *
+* Covered Software is free of defects, merchantable, fit for a *
+* particular purpose or non-infringing. The entire risk as to the *
+* quality and performance of the Covered Software is with You. *
+* Should any Covered Software prove defective in any respect, You *
+* (not any Contributor) assume the cost of any necessary servicing, *
+* repair, or correction. This disclaimer of warranty constitutes an *
+* essential part of this License. No use of any Covered Software is *
+* authorized under this License except under this disclaimer. *
+* *
+************************************************************************
+
+************************************************************************
+* *
+* 7. Limitation of Liability *
+* -------------------------- *
+* *
+* Under no circumstances and under no legal theory, whether tort *
+* (including negligence), contract, or otherwise, shall any *
+* Contributor, or anyone who distributes Covered Software as *
+* permitted above, be liable to You for any direct, indirect, *
+* special, incidental, or consequential damages of any character *
+* including, without limitation, damages for lost profits, loss of *
+* goodwill, work stoppage, computer failure or malfunction, or any *
+* and all other commercial damages or losses, even if such party *
+* shall have been informed of the possibility of such damages. This *
+* limitation of liability shall not apply to liability for death or *
+* personal injury resulting from such party's negligence to the *
+* extent applicable law prohibits such limitation. Some *
+* jurisdictions do not allow the exclusion or limitation of *
+* incidental or consequential damages, so this exclusion and *
+* limitation may not apply to You. *
+* *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+ This Source Code Form is "Incompatible With Secondary Licenses", as
+ defined by the Mozilla Public License, v. 2.0.
diff --git a/build.rs b/build.rs
index b5e5df8..566dd3d 100644
--- a/build.rs
+++ b/build.rs
@@ -26,9 +26,13 @@ fn main() {
"src/entrymodel.rs",
"src/qstandardpaths.rs",
"src/util.rs",
+ "src/kconfig.rs",
+ "src/kconfiggroup.rs",
])
.cpp_file("src/helper.cpp")
- .cpp_file("src/qstandardpaths.cpp");
+ .cpp_file("src/qstandardpaths.cpp")
+ .cpp_file("src/kconfig.cpp")
+ .cpp_file("src/kconfiggroup.cpp");
builder = link_libraries(builder);
diff --git a/src/kconfig.cpp b/src/kconfig.cpp
new file mode 100644
index 0000000..5befa04
--- /dev/null
+++ b/src/kconfig.cpp
@@ -0,0 +1,18 @@
+// SPDX-FileCopyrightText: 2026 Nicolas Fella <[email protected]>
+// SPDX-License-Identifier: MPL-2.0
+
+#include "kconfig.h"
+#include <KConfigGroup>
+
+namespace rust::kf6::kconfig
+{
+std::unique_ptr<KConfig> from(const QString &file, KConfig::OpenFlags mode)
+{
+ return std::make_unique<KConfig>(file, mode);
+}
+
+KConfigGroup group(const KConfig &self, const QString &name)
+{
+ return self.group(name);
+}
+}
diff --git a/src/kconfig.h b/src/kconfig.h
new file mode 100644
index 0000000..4ac7650
--- /dev/null
+++ b/src/kconfig.h
@@ -0,0 +1,17 @@
+// SPDX-FileCopyrightText: 2026 Nicolas Fella <[email protected]>
+// SPDX-License-Identifier: MPL-2.0
+
+#pragma once
+
+#include <KConfig>
+
+namespace rust::kf6::kconfig
+{
+std::unique_ptr<KConfig> from(const QString &file, KConfig::OpenFlags mode);
+
+KConfigGroup group(const KConfig &self, const QString &name);
+
+using KConfigAccessMode = KConfigBase::AccessMode;
+using OpenFlag = KConfig::OpenFlag;
+using OpenFlags = KConfig::OpenFlags;
+}
diff --git a/src/kconfig.rs b/src/kconfig.rs
new file mode 100644
index 0000000..bcb6eee
--- /dev/null
+++ b/src/kconfig.rs
@@ -0,0 +1,177 @@
+// SPDX-FileCopyrightText: 2026 Nicolas Fella <[email protected]>
+// SPDX-License-Identifier: MPL-2.0
+
+use bitflags::bitflags;
+use cxx::UniquePtr;
+use cxx::{type_id, ExternType};
+use cxx_qt_lib::QString;
+
+use crate::kconfiggroup;
+use crate::kconfiggroup::KConfigGroup;
+
+#[cxx_qt::bridge()]
+mod ffi {
+
+ #[namespace = "rust::kf6::kconfig"]
+ #[derive(Debug)]
+ #[repr(i32)]
+ pub enum KConfigAccessMode {
+ NoAccess = 0,
+ ReadOnly = 1,
+ ReadWrite = 2,
+ }
+
+ #[namespace = "rust::kf6::kconfig"]
+ #[derive(Debug)]
+ #[repr(u32)]
+ enum OpenFlag {
+ IncludeGlobals = 1,
+ CascadeConfig = 2,
+
+ SimpleConfig = 0,
+ NoCascade = 1,
+ NoGlobals = 2,
+ FullConfig = 3,
+ }
+ #[namespace = "rust::kf6::kconfig"]
+ unsafe extern "C++" {
+ fn from(file: &QString, mode: OpenFlags) -> UniquePtr<KConfig>;
+
+ fn group(config: &KConfig, group: &QString) -> KConfigGroup;
+
+ type KConfigAccessMode;
+ type OpenFlag;
+ type OpenFlags = super::OpenFlags;
+ }
+
+ unsafe extern "C++" {
+ include!("cxx-qt-lib/qstring.h");
+ type QString = cxx_qt_lib::QString;
+ include!("cxx-qt-lib/qstringlist.h");
+ type QStringList = cxx_qt_lib::QStringList;
+
+ include!("kconfig.h");
+ type KConfig;
+
+ include!("kconfiggroup.h");
+ type KConfigGroup = crate::kconfiggroup::KConfigGroup;
+ type WriteConfigFlags = crate::kconfiggroup::WriteConfigFlags;
+
+ #[rust_name = "group_list"]
+ fn groupList(self: &KConfig) -> QStringList;
+
+ fn hasGroup(self: &KConfig, group: &QString) -> bool;
+
+ // fn group(self: Pin<&mut KConfig>, group: &QString) -> KConfigGroup;
+ // #[namespace="rust::kf6::kconfig"]
+ // fn group(self: &KConfig, group: &QString) -> KConfigGroup;
+
+ fn deleteGroup(self: Pin<&mut KConfig>, group: &QString, flags: WriteConfigFlags);
+
+ fn sync(self: Pin<&mut KConfig>) -> bool;
+
+ fn markAsClean(self: Pin<&mut KConfig>);
+
+ fn accessMode(self: &KConfig) -> KConfigAccessMode;
+
+ fn isImmutable(self: &KConfig) -> bool;
+
+ fn isGroupImmutable(self: &KConfig, group: &QString) -> bool;
+
+ pub fn name(self: &KConfig) -> QString;
+
+ fn isConfigWritable(self: Pin<&mut KConfig>, warnUser: bool) -> bool;
+
+ fn copyFrom(self: &KConfig, config: &KConfig);
+
+ fn checkUpdate(self: Pin<&mut KConfig>, id: &QString, updateFile: &QString);
+
+ fn reparseConfiguration(self: Pin<&mut KConfig>);
+
+ fn addConfigSources(self: Pin<&mut KConfig>, sources: &QStringList);
+
+ fn additionalConfigSources(self: &KConfig) -> QStringList;
+
+ // QStandardPaths::StandardLocation locationType() const;
+
+ fn openFlags(self: &KConfig) -> OpenFlags;
+
+ fn isDirty(self: &KConfig) -> bool;
+
+ fn locale(self: &KConfig) -> QString;
+
+ fn setLocale(self: Pin<&mut KConfig>, locale: &QString) -> bool;
+
+ fn setReadDefaults(self: Pin<&mut KConfig>, readDefaults: bool);
+
+ fn readDefaults(self: &KConfig) -> bool;
+
+ // QMap<QString, QString> entryMap(const QString &aGroup = QString()) const;
+
+ // fn setMainConfigName(name: &QString);
+
+ // fn mainConfigName() -> QString;
+ }
+
+ #[namespace = "rust::kf6"]
+ unsafe extern "C++" {}
+
+ #[namespace = "rust::cxxqtlib1"]
+ unsafe extern "C++" {
+ include!("cxx-qt-lib/common.h");
+ }
+}
+
+bitflags! {
+ #[repr(C)]
+ pub struct OpenFlags: u32 {
+ const IncludeGlobals = 1;
+ const CascadeConfig = 2;
+ const SimpleConfig = 0;
+ const NoCascade = 1;
+ const NoGlobals = 2;
+ const FullConfig = 3;
+ }
+}
+
+pub use ffi::KConfig;
+pub use ffi::KConfigAccessMode;
+
+impl KConfig {
+ pub fn from(file: &QString, mode: OpenFlags) -> UniquePtr<KConfig> {
+ ffi::from(file, mode)
+ }
+
+ pub fn group(self: &KConfig, name: &QString) -> KConfigGroup {
+ ffi::group(self, name)
+ }
+}
+
+unsafe impl ExternType for OpenFlags {
+ type Id = type_id!("rust::kf6::kconfig::OpenFlags");
+ type Kind = cxx::kind::Trivial;
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ use cxx_qt_lib::QString;
+
+ #[test]
+ fn test_add() {
+ let mut config = KConfig::from(QString::from("kdeglobals"), OpenFlags::FullConfig);
+
+ let mut group = config.as_mut().unwrap().group(&QString::from("General"));
+
+ let _s = group.readEntry(&QString::from("ColorSchemeHash"), &QString::from("12345"));
+
+ group.exists();
+
+ group.writeEntry(
+ &QString::from("ColorSchemeHash"),
+ &QString::from("5"),
+ WriteConfigFlags::Normal,
+ );
+ }
+}
diff --git a/src/kconfiggroup.cpp b/src/kconfiggroup.cpp
new file mode 100644
index 0000000..310eed5
--- /dev/null
+++ b/src/kconfiggroup.cpp
@@ -0,0 +1,25 @@
+// SPDX-FileCopyrightText: 2026 Nicolas Fella <[email protected]>
+// SPDX-License-Identifier: MPL-2.0
+
+#include "kconfiggroup.h"
+#include <cxx-qt-lib/assertion_utils.h>
+
+assert_alignment_and_size(KConfigGroup, {
+ ::std::size_t a0;
+ ::std::size_t a1;
+});
+
+static_assert(!::std::is_trivially_copy_assignable<KConfigGroup>::value);
+static_assert(!::std::is_trivially_copy_constructible<KConfigGroup>::value);
+
+static_assert(!::std::is_trivially_destructible<KConfigGroup>::value);
+
+// static_assert(QTypeInfo<KConfigGroup::isRelocatable);
+
+namespace rust::kf6
+{
+KConfig *config_mut(KConfigGroup &self)
+{
+ return self.config();
+}
+}
diff --git a/src/kconfiggroup.h b/src/kconfiggroup.h
new file mode 100644
index 0000000..97c732a
--- /dev/null
+++ b/src/kconfiggroup.h
@@ -0,0 +1,24 @@
+// SPDX-FileCopyrightText: 2026 Nicolas Fella <[email protected]>
+// SPDX-License-Identifier: MPL-2.0
+
+#pragma once
+
+#include "rust/cxx.h"
+#include <KConfigGroup>
+
+namespace rust
+{
+
+template<>
+struct IsRelocatable<KConfigGroup> : ::std::true_type {
+};
+
+namespace kf6
+{
+KConfig *config_mut(KConfigGroup &self);
+}
+
+}
+
+using WriteConfigFlag = KConfigBase::WriteConfigFlag;
+using WriteConfigFlags = KConfigBase::WriteConfigFlags;
diff --git a/src/kconfiggroup.rs b/src/kconfiggroup.rs
new file mode 100644
index 0000000..6a405f4
--- /dev/null
+++ b/src/kconfiggroup.rs
@@ -0,0 +1,134 @@
+// SPDX-FileCopyrightText: 2026 Nicolas Fella <[email protected]>
+// SPDX-License-Identifier: MPL-2.0
+
+use crate::kconfig::KConfig;
+use bitflags::bitflags;
+
+#[cxx_qt::bridge]
+mod ffi {
+ unsafe extern "C++" {
+
+ include!("cxx-qt-lib/qstring.h");
+ type QString = cxx_qt_lib::QString;
+
+ include!("cxx-qt-lib/qstringlist.h");
+ type QStringList = cxx_qt_lib::QStringList;
+
+ include!("kconfig.h");
+ type KConfig = crate::kconfig::KConfig;
+
+ include!("kconfiggroup.h");
+ type KConfigGroup = super::KConfigGroup;
+ type WriteConfigFlag;
+ type WriteConfigFlags = super::WriteConfigFlags;
+
+ fn readEntry(self: &KConfigGroup, key: &QString, aDefault: &QString) -> QString;
+
+ fn writeEntry(
+ self: &mut KConfigGroup,
+ key: &QString,
+ value: &QString,
+ flags: WriteConfigFlags,
+ );
+
+ fn exists(self: &KConfigGroup) -> bool;
+
+ fn isValid(self: &KConfigGroup) -> bool;
+
+ fn name(self: &KConfigGroup) -> QString;
+
+ fn config(self: &KConfigGroup) -> *const KConfig;
+
+ // void copyTo(KConfigBase *other, WriteConfigFlags pFlags = Normal) const;
+
+ fn moveValuesTo(self: &mut KConfigGroup, other: &mut KConfigGroup, flags: WriteConfigFlags);
+
+ fn parent(self: &KConfigGroup) -> KConfigGroup;
+
+ #[rust_name = "key_list"]
+ fn keyList(self: &KConfigGroup) -> QStringList;
+
+ fn deleteGroup(self: &mut KConfigGroup, group: &QString, flags: WriteConfigFlags);
+
+ fn hasDefault(self: &KConfigGroup, key: &QString) -> bool;
+
+ fn revertToDefault(self: &mut KConfigGroup, key: &QString, flags: WriteConfigFlags);
+
+ fn isEntryImmutable(self: &KConfigGroup, key: &QString) -> bool;
+
+ }
+
+ #[namespace = "rust::kf6"]
+ unsafe extern "C++" {
+ fn config_mut(self_: &mut KConfigGroup) -> *mut KConfig;
+ }
+
+ #[derive(Debug)]
+ #[repr(u32)]
+ enum WriteConfigFlag {
+ Persistent = 1,
+ Global = 2,
+ Localized = 4,
+ Notify = 9,
+ Normal = 1,
+ }
+
+ #[namespace = "rust::cxxqtlib1"]
+ unsafe extern "C++" {
+ include!("cxx-qt-lib/common.h");
+
+ #[doc(hidden)]
+ #[rust_name = "kconfiggroup_init_default"]
+ fn construct() -> KConfigGroup;
+
+ #[doc(hidden)]
+ #[rust_name = "kconfiggroup_drop"]
+ fn drop(format: &mut KConfigGroup);
+ }
+}
+
+bitflags! {
+ #[repr(C)]
+ pub struct WriteConfigFlags: u32 {
+ const Persistent = 1;
+ const Global = 2;
+ const Localized = 4;
+ const Notify = 9;
+ const Normal = 1;
+ }
+}
+
+use cxx::{type_id, ExternType};
+use std::mem::MaybeUninit;
+
+pub use ffi::WriteConfigFlag;
+
+pub struct KConfigGroup {
+ _cspec: MaybeUninit<usize>,
+ _cspec2: MaybeUninit<usize>,
+}
+
+impl Drop for KConfigGroup {
+ fn drop(&mut self) {
+ ffi::kconfiggroup_drop(self);
+ }
+}
+
+impl KConfigGroup {
+ pub fn config_mut(self: &mut KConfigGroup) -> *mut KConfig {
+ ffi::config_mut(self)
+ }
+}
+
+// Safety:
+
+// Static checks on the C++ side ensure that KConfigGroup is trivial.
+unsafe impl ExternType for KConfigGroup {
+ type Id = type_id!("KConfigGroup");
+ type Kind = cxx::kind::Trivial;
+}
+
+unsafe impl ExternType for WriteConfigFlags {
+ type Id = type_id!("WriteConfigFlags");
+ type Kind = cxx::kind::Trivial;
+}
diff --git a/src/main.rs b/src/main.rs
index b8a1bb4..24c6645 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,14 +6,141 @@ mod config;
mod entrymodel;
mod filesmodel;
mod groupsmodel;
+mod kconfig;
+mod kconfiggroup;
mod qstandardpaths;
mod util;
use std::fs;
-use cxx_qt_lib::{QGuiApplication, QQmlApplicationEngine, QString, QStringList, QUrl};
+use cxx_qt_lib::{
+ CaseSensitivity, QGuiApplication, QQmlApplicationEngine, QString, QStringList, QUrl,
+};
use cxx_qt_lib_extras::{QCommandLineOption, QCommandLineParser};
+use crate::config::Group;
+use crate::config::Kcfg;
+use crate::kconfig::KConfig;
+use crate::kconfig::OpenFlags;
+use crate::kconfiggroup::KConfigGroup;
+
+fn groups_for_file(schemas: &Vec<Kcfg>, file_name: &str) -> Vec<Group> {
+ schemas
+ .iter()
+ .filter(|&config| config.kcfgfile.is_some())
+ .filter(|&config| {
+ config
+ .kcfgfile
+ .as_ref()
+ .unwrap()
+ .name
+ .clone()
+ .unwrap_or_default()
+ == file_name
+ })
+ .map(|config| config.group.clone())
+ .flatten()
+ .collect()
+}
+
+fn file_names_from_schemas(schemas: &Vec<Kcfg>) -> Vec<String> {
+ schemas
+ .iter()
+ .flat_map(|config| config.kcfgfile.clone())
+ .flat_map(|cfg| cfg.name)
+ .collect()
+}
+
+fn print_missing_files(schemas: &Vec<Kcfg>) {
+ let config_files = fs::read_dir(std::env::var("HOME").unwrap() + "/.config/").unwrap();
+
+ for config_file in config_files {
+ if config_file.as_ref().unwrap().file_type().unwrap().is_dir() {
+ continue;
+ }
+
+ if !file_names_from_schemas(schemas).contains(
+ &config_file
+ .as_ref()
+ .unwrap()
+ .file_name()
+ .into_string()
+ .unwrap(),
+ ) {
+ println!(
+ "{}",
+ &config_file.unwrap().file_name().into_string().unwrap()
+ );
+ }
+ }
+}
+
+fn missing_keys_in_group(schemas: &Vec<Kcfg>, group: &KConfigGroup) -> Vec<String> {
+ let keys = group.key_list();
+
+ let group_schemas = unsafe {
+ groups_for_file(
+ schemas,
+ &group.config().as_ref_unchecked().name().to_string(),
+ )
+ };
+
+ let group_contains_entry = |group: &Group, key: &QString| {
+ if group.entry.is_none() {
+ return false;
+ }
+ return group
+ .entry
+ .clone()
+ .unwrap()
+ .iter()
+ .find(|entry| {
+ &key.to_string() == &entry.name.clone().unwrap_or_default()
+ || &key.to_string() == &entry.key.clone().unwrap_or_default()
+ })
+ .is_some();
+ };
+
+ keys.iter()
+ .filter(|key| {
+ group_schemas
+ .iter()
+ .find(|group| group_contains_entry(group, key))
+ .is_none()
+ })
+ .map(|qs| qs.to_string())
+ .collect()
+}
+
+fn print_missing_keys(schemas: &Vec<Kcfg>) {
+ let config_files = fs::read_dir(std::env::var("HOME").unwrap() + "/.config/").unwrap();
+
+ for config_file in config_files {
+ if config_file.as_ref().unwrap().file_type().unwrap().is_dir() {
+ continue;
+ }
+
+ let file_name = config_file.unwrap().file_name().into_string().unwrap();
+
+ if file_names_from_schemas(schemas).contains(&file_name) {
+ println!("{:?}:", file_name);
+
+ let config = KConfig::from(&QString::from(file_name), OpenFlags::NoGlobals);
+
+ for group_name in config.group_list().iter() {
+ let group = config.group(&group_name);
+ let missing = missing_keys_in_group(schemas, &group);
+
+ for key in missing {
+ println!("{}: {}", group_name, key);
+ }
+ }
+
+ println!();
+ }
+ }
+}
+
fn main() {
let mut parser = QCommandLineParser::default();
let check_files_option = QCommandLineOption::from(&QString::from("check-files"));
@@ -37,35 +164,15 @@ fn main() {
.flat_map(|file| config::parse(&file.to_string()))
.collect();
- let file_names_from_schemas: Vec<_> = config_schemas
- .iter()
- .flat_map(|config| config.kcfgfile.clone())
- .flat_map(|cfg| cfg.name)
- .collect();
+ println!("The following files have no associated kcfg file:");
- let config_files = fs::read_dir(std::env::var("HOME").unwrap() + "/.config/").unwrap();
+ print_missing_files(&config_schemas);
- println!("The following files have no associated kcfg file:");
+ println!();
- for config_file in config_files {
- if config_file.as_ref().unwrap().file_type().unwrap().is_dir() {
- continue;
- }
+ println!("The following keys are unaccounted for:");
- if !file_names_from_schemas.contains(
- &config_file
- .as_ref()
- .unwrap()
- .file_name()
- .into_string()
- .unwrap(),
- ) {
- println!(
- "{}",
- &config_file.unwrap().file_name().into_string().unwrap()
- );
- }
- }
+ print_missing_keys(&config_schemas);
} else {
let mut engine = QQmlApplicationEngine::new();
diff --git a/src/util.rs b/src/util.rs
index e2ebccc..a8f238b 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -3,13 +3,15 @@
use std::path::PathBuf;
+use crate::KConfig;
use cxx_qt::casting::Upcast;
use cxx_qt_lib::{QList, QString, QStringList};
use std::fs;
-use crate::qstandardpaths::{
- QStandardPaths, QStandardPathsLocateOption, QStandardPathsStandardLocation,
+use crate::{
+ kconfig::OpenFlags,
+ qstandardpaths::{QStandardPaths, QStandardPathsLocateOption, QStandardPathsStandardLocation},
};
#[cxx_qt::bridge()]
@@ -23,6 +25,9 @@ mod ffi {
#[namespace = "KFileUtils"]
#[rust_name = "find_all_unique_files"]
pub fn findAllUniqueFiles(dirs: &QStringList, nameFilters: &QStringList) -> QStringList;
+
+ include!("cxx-qt-lib/qstring.h");
+ type QString = cxx_qt_lib::QString;
}
}