diff options
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusmessage.cpp | 8 | ||||
| -rw-r--r-- | src/dbus/qdbuspendingreply.cpp | 4 | ||||
| -rw-r--r-- | src/dbus/qdbusservicewatcher.cpp | 6 | ||||
| -rw-r--r-- | src/dbus/qdbusutil.cpp | 24 |
4 files changed, 21 insertions, 21 deletions
diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp index d6bdc19d51..8863766f40 100644 --- a/src/dbus/qdbusmessage.cpp +++ b/src/dbus/qdbusmessage.cpp @@ -331,10 +331,10 @@ QDBusMessage QDBusMessagePrivate::makeLocalReply(const QDBusConnectionPrivate &c messages (MessageType) that can occur on the bus: \list - \o Method calls - \o Method return values - \o Signal emissions - \o Error codes + \li Method calls + \li Method return values + \li Signal emissions + \li Error codes \endlist Objects of this type are created with the static createError(), diff --git a/src/dbus/qdbuspendingreply.cpp b/src/dbus/qdbuspendingreply.cpp index 78b64c4772..b9694ca205 100644 --- a/src/dbus/qdbuspendingreply.cpp +++ b/src/dbus/qdbuspendingreply.cpp @@ -60,9 +60,9 @@ important differences: \list - \o QDBusReply accepts exactly one return type, whereas + \li QDBusReply accepts exactly one return type, whereas QDBusPendingReply can have from 1 to 8 types - \o QDBusReply only works on already completed replies, whereas + \li QDBusReply only works on already completed replies, whereas QDBusPendingReply allows one to wait for replies from pending calls \endlist diff --git a/src/dbus/qdbusservicewatcher.cpp b/src/dbus/qdbusservicewatcher.cpp index 749d68fad5..d45fa8b8ca 100644 --- a/src/dbus/qdbusservicewatcher.cpp +++ b/src/dbus/qdbusservicewatcher.cpp @@ -153,9 +153,9 @@ void QDBusServiceWatcherPrivate::removeService(const QString &service) modes: \list - \o Watching for service registration only. - \o Watching for service unregistration only. - \o Watching for any kind of service ownership change (the default mode). + \li Watching for service registration only. + \li Watching for service unregistration only. + \li Watching for any kind of service ownership change (the default mode). \endlist Besides being created or deleted, services may change owners without a diff --git a/src/dbus/qdbusutil.cpp b/src/dbus/qdbusutil.cpp index 71edee1b2b..bed07692b8 100644 --- a/src/dbus/qdbusutil.cpp +++ b/src/dbus/qdbusutil.cpp @@ -348,11 +348,11 @@ namespace QDBusUtil Valid interface names must: \list - \o not be empty - \o not exceed 255 characters in length - \o be composed of dot-separated string components that contain only ASCII letters, digits + \li not be empty + \li not exceed 255 characters in length + \li be composed of dot-separated string components that contain only ASCII letters, digits and the underscore ("_") character - \o contain at least two such components + \li contain at least two such components \endlist */ bool isValidInterfaceName(const QString& ifaceName) @@ -408,11 +408,11 @@ namespace QDBusUtil A valid bus name is either a valid unique connection name or follows the rules: \list - \o is not empty - \o does not exceed 255 characters in length - \o be composed of dot-separated string components that contain only ASCII letters, digits, + \li is not empty + \li does not exceed 255 characters in length + \li be composed of dot-separated string components that contain only ASCII letters, digits, hyphens or underscores ("_"), but don't start with a digit - \o contains at least two such elements + \li contains at least two such elements \endlist \sa isValidUniqueConnectionName() @@ -481,10 +481,10 @@ namespace QDBusUtil Valid object paths follow the rules: \list - \o start with the slash character ("/") - \o do not end in a slash, unless the path is just the initial slash - \o do not contain any two slashes in sequence - \o contain slash-separated parts, each of which is composed of ASCII letters, digits and + \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 ("_") \endlist */ |