diff options
author | Topi Reinio <topi.reinio@qt.io> | 2023-03-02 20:08:26 +0000 |
---|---|---|
committer | Topi Reinio <topi.reinio@qt.io> | 2023-03-14 10:07:20 +0000 |
commit | 71a826b126b74795f2f0fd2f3bdca3c4abddc835 (patch) | |
tree | 322f70986da382bd319a65efed64a1e2cdfe9b58 /tests | |
parent | ea641ace22e8c2eca957470206cd20b54f7bd9a0 (diff) | |
download | qttools-71a826b126b74795f2f0fd2f3bdca3c4abddc835.tar.gz |
qdoc: Remove unnecessary Config access functions
Config class now provides Config::get(), returning a
ConfigVar reference which can be further converted
to string, list, set, int, or bool. Use get()
throughout the codebase and remove the old access
functions.
In addition, make Config::get() return a const
reference, and prevent an unnecessary contains()
check by using an iterator.
Do some drive-by cleaning of related code.
Change-Id: I2ff2203824cd4ae80c4615080948565219ad20b2
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Luca Di Sera <luca.disera@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qdoc/config/tst_config.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/tests/auto/qdoc/config/tst_config.cpp b/tests/auto/qdoc/config/tst_config.cpp index 522e02526..ac69f3b51 100644 --- a/tests/auto/qdoc/config/tst_config.cpp +++ b/tests/auto/qdoc/config/tst_config.cpp @@ -84,16 +84,16 @@ void tst_Config::variables() auto &config = initConfig("/testdata/configs/vars.qdocconf"); const QStringList list = { "testing", "line", "by\n", "line" }; - QCOMPARE(config.getStringList("list"), list); - QCOMPARE(config.getString("list"), "testing line by\nline"); - QCOMPARE(config.getBool("true"), true); - QCOMPARE(config.getBool("untrue"), false); - QCOMPARE(config.getInt("int"), 2); - QCOMPARE(config.getString("void"), QString()); - QVERIFY(!config.getString("void").isNull()); - QCOMPARE(config.getString("void", "undefined"), QString()); - QCOMPARE(config.getString("undefined", "undefined"), "undefined"); - QVERIFY(config.getString("undefined").isNull()); + QCOMPARE(config.get("list").asStringList(), list); + QCOMPARE(config.get("list").asString(), "testing line by\nline"); + QCOMPARE(config.get("true").asBool(), true); + QCOMPARE(config.get("untrue").asBool(), false); + QCOMPARE(config.get("int").asInt(), 2); + QCOMPARE(config.get("void").asString(), QString()); + QVERIFY(!config.get("void").asString().isNull()); + QCOMPARE(config.get("void").asString("undefined"), QString()); + QCOMPARE(config.get("undefined").asString("undefined"), "undefined"); + QVERIFY(config.get("undefined").asString().isNull()); QSet<QString> subVars = { "thing", "where", "time" }; QCOMPARE(config.subVars("some"), subVars); @@ -168,11 +168,11 @@ void::tst_Config::expandVars() qputenv("QDOC_TSTCONFIG_LIST", QByteArray("a b c")); auto &config = initConfig("/testdata/configs/expandvars.qdocconf"); - QCOMPARE(config.getString("expanded1"), "foo"); - QCOMPARE(config.getString("expanded2"), "foo,bar"); - QCOMPARE(config.getString("expanded3"), "foobar foobar baz"); - QCOMPARE(config.getString("literally"), "$data ${data}"); - QCOMPARE(config.getString("csvlist"), "a,b,c"); + QCOMPARE(config.get("expanded1").asString(), "foo"); + QCOMPARE(config.get("expanded2").asString(), "foo,bar"); + QCOMPARE(config.get("expanded3").asString(), "foobar foobar baz"); + QCOMPARE(config.get("literally").asString(), "$data ${data}"); + QCOMPARE(config.get("csvlist").asString(), "a,b,c"); } QTEST_APPLESS_MAIN(tst_Config) |