diff options
author | Christophe Giboudeaux <christophe@krop.fr> | 2021-07-13 23:20:57 +0200 |
---|---|---|
committer | Christophe Giboudeaux <christophe@krop.fr> | 2021-07-13 23:20:57 +0200 |
commit | 3471f19fc56e41b2ee6236ea3016dfa30a76c0ff (patch) | |
tree | 2615e5a9349c20f95be9d9abbccde367b2eb6eeb | |
parent | 530f9490749505221d137343f1bd556821b820da (diff) | |
download | kconfig-3471f19fc56e41b2ee6236ea3016dfa30a76c0ff.tar.gz kconfig-3471f19fc56e41b2ee6236ea3016dfa30a76c0ff.tar.bz2 |
Fix typos found by codespell
GIT_SILENT
-rw-r--r-- | DESIGN | 8 | ||||
-rw-r--r-- | TODO | 8 | ||||
-rw-r--r-- | autotests/kconfigtest.cpp | 4 | ||||
-rw-r--r-- | docs/DESIGN.kconfig | 8 | ||||
-rw-r--r-- | docs/options.md | 4 | ||||
-rw-r--r-- | src/core/kconfiggroup.h | 2 | ||||
-rw-r--r-- | src/kconfig_compiler/KConfigCodeGeneratorBase.cpp | 2 | ||||
-rw-r--r-- | src/kconfig_compiler/KConfigCodeGeneratorBase.h | 2 | ||||
-rw-r--r-- | src/kconfig_compiler/kcfg.xsd | 2 | ||||
-rw-r--r-- | src/kconfig_compiler/kconfig_compiler.cpp | 2 |
10 files changed, 21 insertions, 21 deletions
@@ -33,8 +33,8 @@ current config object's entry map and then written back. Note that there is a subtle difference between revertToDefault() and deleteEntry(). revertToDefault() will change the entry to the default value set by the system administrator (Via e.g. $KDEDIR/share/config) or, if no such default was set, -non-existant. -deleteEntry() will make the entry non-existant. If if the system administrator +non-existent. +deleteEntry() will make the entry non-existent. If if the system administrator has specified a default value, the local entry is marked with [$d]. Entries are marked "immutable" if the key is followed by [$i]. This means @@ -47,7 +47,7 @@ KConfig XT ========== My buzzword picker offered KConfig XT ("eXtended Technology") and KConfig NG -("Next Generation"). Since the planned changes are ment to be evolutionary +("Next Generation"). Since the planned changes are meant to be evolutionary rather than revolutionary, KConfig NG was dropped. Goals @@ -96,7 +96,7 @@ myconfig.kcfgc: Implementation specific code generation instructions choses the actual name. KConfigDialogManager: Class that links widgets in a dialog up with their - corresponding confguration options in a configuration + corresponding configuration options in a configuration object derived from KConfigSkeleton. MyConfigWidget: Dialog generated from a .ui description file. Widget names @@ -14,7 +14,7 @@ wishes ====== - use lazy loading - - load as soon as the first KConfigGroup is instanciated + - load as soon as the first KConfigGroup is instantiated - lazy parsing of values is interesting, too - see kconfig_take2 branch - add $\\VAR and $\\(cmd) escapes to list-quote expanded string - possibly: @@ -75,18 +75,18 @@ create a submap). however, keeping that consistent with deletions would be a nightmare, and with the rescan changing the groups underneath impossible without each map having a list of referring configgroups. therefore it might make more sense to always create a corresponding tree -of empty maps when a configroup for a non-existing group is instanciated +of empty maps when a configroup for a non-existing group is instantiated - these groups won't be written out (they have no entries and cannot be immutable) and access to non-existing groups (esp. without an subsequent write that would actually create it) is rare, so the performance and memory overhead of this "eager" approach is likely to be negligible. as a middle way one could use a pointer and lazily populate it on first -access whithout putting semantics into the pointer being already set, +access without putting semantics into the pointer being already set, but i don't think the added complexity will pay off. 4) > > > > hmm, wait. maybe it would be better if the map did not do actual -> > > > permission checking. the frontent is peppered with asserts already +> > > > permission checking. the frontend is peppered with asserts already > > > > > > that's the group doing permission checking, if this group is immutable > > > then the entry can't be changed. plus, now that KEntryKey doesn't know diff --git a/autotests/kconfigtest.cpp b/autotests/kconfigtest.cpp index d8cc417d..49f22d1b 100644 --- a/autotests/kconfigtest.cpp +++ b/autotests/kconfigtest.cpp @@ -822,7 +822,7 @@ void KConfigTest::testDelete() QVERIFY(sc.entryMap(QStringLiteral("Complex Types")).isEmpty()); QVERIFY(sc.entryMap(QStringLiteral("AAA")).isEmpty()); QVERIFY(!sc.entryMap(QStringLiteral("Hello")).isEmpty()); // not deleted group - QVERIFY(sc.entryMap(QStringLiteral("FooBar")).isEmpty()); // inexistant group + QVERIFY(sc.entryMap(QStringLiteral("FooBar")).isEmpty()); // inexistent group QVERIFY(cg.sync()); // Check what happens on disk @@ -999,7 +999,7 @@ void KConfigTest::testCascadingWithLocale() QCOMPARE(group.readEntry("FromGlobal"), QStringLiteral("vrai")); QCOMPARE(group.readEntry("FromLocal"), QStringLiteral("vrai")); QCOMPARE(group.readEntry("Name"), QStringLiteral("FR")); - QCOMPARE(group.readEntry("Other"), QStringLiteral("English Only")); // Global_FR is locally overriden + QCOMPARE(group.readEntry("Other"), QStringLiteral("English Only")); // Global_FR is locally overridden qputenv("XDG_CONFIG_DIRS", oldConfigDirs); #endif } diff --git a/docs/DESIGN.kconfig b/docs/DESIGN.kconfig index 68994aed..d2f2056a 100644 --- a/docs/DESIGN.kconfig +++ b/docs/DESIGN.kconfig @@ -53,8 +53,8 @@ void deleteEntry(key); // Remove entry Note that there is a subtle difference between revertToDefault() and deleteEntry(). revertToDefault() will change the entry to the default value set by the system administrator (Via e.g. $KDEDIR/share/config) or, if no such default was set, -non-existant. -deleteEntry() will make the entry non-existant. +non-existent. +deleteEntry() will make the entry non-existent. Entries are marked "immutable" if the key is followed by [$i]. This means that a user can not override these entries. @@ -103,7 +103,7 @@ KConfig XT ========== My buzzword picker offered KConfig XT ("eXtended Technology") and KConfig NG -("Next Generation"). Since the planned changes are ment to be evolutionary +("Next Generation"). Since the planned changes are meant to be evolutionary rather than revolutionary, KConfig NG was dropped. Goals @@ -216,7 +216,7 @@ myconfig.kcfg-codegen: Implementation specific code generation instructions choses the actual name. KConfigDialogManager: Class that links widgets in a dialog up with their - corresponding confguration options in a configuration + corresponding configuration options in a configuration object derived from KConfigSkeleton. MyConfigWidget: Dialog generated from a .ui description file. Widget names diff --git a/docs/options.md b/docs/options.md index 4a6e9bc1..b57713de 100644 --- a/docs/options.md +++ b/docs/options.md @@ -48,11 +48,11 @@ Once this is done, the immutable entries or groups cannot be overridden by later files of the same name (and, if the file is immutable, later files will be ignored entirely). -Note that a similar effect to file immutability can be acheived by using file +Note that a similar effect to file immutability can be achieved by using file system permissions to prevent the user from writing to their local versions of the configuration file, although (since this is normally a setup error), the user will be warned that the configuration file is not writable. This warning -can be supressed by adding the following setting to either the relevant +can be suppressed by adding the following setting to either the relevant configuration file or the `kdeglobals` file: [General] diff --git a/src/core/kconfiggroup.h b/src/core/kconfiggroup.h index 5c125dd2..2584cb85 100644 --- a/src/core/kconfiggroup.h +++ b/src/core/kconfiggroup.h @@ -113,7 +113,7 @@ public: QString name() const; /** - * Check whether the containing KConfig object acutally contains a + * Check whether the containing KConfig object actually contains a * group with this name. */ bool exists() const; diff --git a/src/kconfig_compiler/KConfigCodeGeneratorBase.cpp b/src/kconfig_compiler/KConfigCodeGeneratorBase.cpp index f1ff06b3..0effd7e5 100644 --- a/src/kconfig_compiler/KConfigCodeGeneratorBase.cpp +++ b/src/kconfig_compiler/KConfigCodeGeneratorBase.cpp @@ -149,7 +149,7 @@ void KConfigCodeGeneratorBase::endNamespaces() } } -// returns the member accesor implementation +// returns the member accessor implementation // which should go in the h file if inline // or the cpp file if not inline QString KConfigCodeGeneratorBase::memberAccessorBody(const CfgEntry *e, bool globalEnums) const diff --git a/src/kconfig_compiler/KConfigCodeGeneratorBase.h b/src/kconfig_compiler/KConfigCodeGeneratorBase.h index 4a100518..7a8c8502 100644 --- a/src/kconfig_compiler/KConfigCodeGeneratorBase.h +++ b/src/kconfig_compiler/KConfigCodeGeneratorBase.h @@ -121,7 +121,7 @@ protected: return m_stream; } - // HACK: This needs to be accesible because the HeaderGenerator actually modifies + // HACK: This needs to be accessible because the HeaderGenerator actually modifies // it while running. Considering that this is a the result of the xml Parse, and not // the result of generating code, I consider this to be quite wrong - but moving the // changes away from the header generator only created more problems and I have to diff --git a/src/kconfig_compiler/kcfg.xsd b/src/kconfig_compiler/kcfg.xsd index 1ec1dc81..f9175a1d 100644 --- a/src/kconfig_compiler/kcfg.xsd +++ b/src/kconfig_compiler/kcfg.xsd @@ -65,7 +65,7 @@ <xsd:complexType> <xsd:sequence> <xsd:element name="parameter" type="kcfg:parameter" minOccurs="0" maxOccurs="unbounded" /> - <!-- FIXME: Are really unbounded occurances of parameter allowed? --> + <!-- FIXME: Are really unbounded occurrences of parameter allowed? --> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="optional"/> <xsd:attribute name="arg" type="xsd:boolean" use="optional"/> diff --git a/src/kconfig_compiler/kconfig_compiler.cpp b/src/kconfig_compiler/kconfig_compiler.cpp index e997eac9..28b10e4f 100644 --- a/src/kconfig_compiler/kconfig_compiler.cpp +++ b/src/kconfig_compiler/kconfig_compiler.cpp @@ -619,7 +619,7 @@ QString memberGetDefaultBody(const CfgEntry *e) return result; } -// returns the item accesor implementation +// returns the item accessor implementation // which should go in the h file if inline // or the cpp file if not inline QString itemAccessorBody(const CfgEntry *e, const KConfigParameters &cfg) |