diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-01-09 13:04:37 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-09 16:40:36 +0100 |
| commit | f2327c083ce2996f1fc714cd8404d43fe26fd6f8 (patch) | |
| tree | 2ccfaecc979a863e3375faf96b2e1a945ec663a1 /src/dbus/qdbusextratypes.cpp | |
| parent | 30d3c3b49f161d7d52618ae586ea6648b8c18ed4 (diff) | |
Rename private API to avoid conflict with mac OX macros.
Mac OS defines the check macro in /usr/include/AssertMacros.h
http://boost.2283326.n4.nabble.com/Boost-with-Darwin-Mac-gcc-4-0-1-td2580330.html
Change-Id: I99789e4dba25e80afd184c44d0781c4ebde46d74
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusextratypes.cpp')
| -rw-r--r-- | src/dbus/qdbusextratypes.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbusextratypes.cpp b/src/dbus/qdbusextratypes.cpp index 9adceb8871..8d9d2e06fd 100644 --- a/src/dbus/qdbusextratypes.cpp +++ b/src/dbus/qdbusextratypes.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -void QDBusObjectPath::check() +void QDBusObjectPath::doCheck() { if (!QDBusUtil::isValidObjectPath(*this)) { qWarning("QDBusObjectPath: invalid path \"%s\"", qPrintable(*this)); @@ -54,7 +54,7 @@ void QDBusObjectPath::check() } } -void QDBusSignature::check() +void QDBusSignature::doCheck() { if (!QDBusUtil::isValidSignature(*this)) { qWarning("QDBusSignature: invalid signature \"%s\"", qPrintable(*this)); |