diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-08-03 10:53:57 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-08-03 10:53:57 (GMT) |
| commit | d5491ecdde14659a913c9f476f18c45f1d9489bb (patch) | |
| tree | 06cc52249feda9bd9e50ca47abb8ebd676c8a309 /src/dbus/qdbusutil_p.h | |
| parent | 42cdfaf86d34afeb6448723839fef70fe477deed (diff) | |
| parent | a41128af5373a0225c3548abd3eb82cd7e8f7a0e (diff) | |
| download | Qt-d5491ecdde14659a913c9f476f18c45f1d9489bb.zip Qt-d5491ecdde14659a913c9f476f18c45f1d9489bb.tar.gz Qt-d5491ecdde14659a913c9f476f18c45f1d9489bb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouse
Conflicts:
configure
Diffstat (limited to 'src/dbus/qdbusutil_p.h')
| -rw-r--r-- | src/dbus/qdbusutil_p.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/dbus/qdbusutil_p.h b/src/dbus/qdbusutil_p.h index 8a1846a..2b53c6b 100644 --- a/src/dbus/qdbusutil_p.h +++ b/src/dbus/qdbusutil_p.h @@ -67,25 +67,25 @@ QT_BEGIN_NAMESPACE namespace QDBusUtil { - QDBUS_EXPORT bool isValidInterfaceName(const QString &ifaceName); + Q_DBUS_EXPORT bool isValidInterfaceName(const QString &ifaceName); - QDBUS_EXPORT bool isValidUniqueConnectionName(const QString &busName); + Q_DBUS_EXPORT bool isValidUniqueConnectionName(const QString &busName); - QDBUS_EXPORT bool isValidBusName(const QString &busName); + Q_DBUS_EXPORT bool isValidBusName(const QString &busName); - QDBUS_EXPORT bool isValidMemberName(const QString &memberName); + Q_DBUS_EXPORT bool isValidMemberName(const QString &memberName); - QDBUS_EXPORT bool isValidErrorName(const QString &errorName); + Q_DBUS_EXPORT bool isValidErrorName(const QString &errorName); - QDBUS_EXPORT bool isValidPartOfObjectPath(const QString &path); + Q_DBUS_EXPORT bool isValidPartOfObjectPath(const QString &path); - QDBUS_EXPORT bool isValidObjectPath(const QString &path); + Q_DBUS_EXPORT bool isValidObjectPath(const QString &path); - QDBUS_EXPORT bool isValidSignature(const QString &signature); + Q_DBUS_EXPORT bool isValidSignature(const QString &signature); - QDBUS_EXPORT bool isValidSingleSignature(const QString &signature); + Q_DBUS_EXPORT bool isValidSingleSignature(const QString &signature); - QDBUS_EXPORT QString argumentToString(const QVariant &variant); + Q_DBUS_EXPORT QString argumentToString(const QVariant &variant); enum AllowEmptyFlag { EmptyAllowed, |