From b1b97173045b12ac2434897e63b8060197661891 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 20 Feb 2024 11:57:07 +0100 Subject: [PATCH] [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.6 6.5 Change-Id: Ibb204429521910582bd8ee03ff54f72d7e15ce84 Reviewed-by: Thiago Macieira Reviewed-by: Leena Miettinen (cherry picked from commit 63b52ba994ca9d9a0ceaeab465f64465b1fa137a) Reviewed-by: Qt Cherry-pick Bot --- src/dbus/qdbusutil.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/dbus/qdbusutil.cpp b/src/dbus/qdbusutil.cpp index 6eee371305c..6a0d546ee42 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)