summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2024-02-20 11:57:07 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2024-03-04 08:18:21 +0000
commitec184a8368ff57d7078f0d38240f42c0744f3a0a (patch)
tree1f832a8eb8b7f7495aad308a8118cd0f3f5a4844
parent3423be391c20d92f74e8871268315f18935d1374 (diff)
[docs] QDBusUtil::isValidObjectPath(): simplify description
The "does not contain two slashes in sequence" condition reads a bit unmotivated. It's easier written as "each part is not empty", so do that. Pick-to: 6.5 Change-Id: Ibb204429521910582bd8ee03ff54f72d7e15ce84 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 63b52ba994ca9d9a0ceaeab465f64465b1fa137a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit b1b97173045b12ac2434897e63b8060197661891)
-rw-r--r--src/dbus/qdbusutil.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/dbus/qdbusutil.cpp b/src/dbus/qdbusutil.cpp
index 6eee371305..6a0d546ee4 100644
--- a/src/dbus/qdbusutil.cpp
+++ b/src/dbus/qdbusutil.cpp
@@ -445,9 +445,8 @@ namespace QDBusUtil
\list
\li start with the slash character ("/")
\li do not end in a slash, unless the path is just the initial slash
- \li do not contain any two slashes in sequence
- \li contain slash-separated parts, each of which is composed of ASCII letters, digits and
- underscores ("_")
+ \li contain slash-separated parts, each of which is not empty, and composed
+ only of ASCII letters, digits and underscores ("_").
\endlist
*/
bool isValidObjectPath(const QString &path)