From f2327c083ce2996f1fc714cd8404d43fe26fd6f8 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Mon, 9 Jan 2012 13:04:37 +0100 Subject: 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 --- src/dbus/qdbusextratypes.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/dbus/qdbusextratypes.h') diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index ec37453167..36060ab0a4 100644 --- a/src/dbus/qdbusextratypes.h +++ b/src/dbus/qdbusextratypes.h @@ -75,26 +75,26 @@ public: { return *this; } private: - void check(); + void doCheck(); }; inline QDBusObjectPath::QDBusObjectPath(const char *objectPath) : QString(QString::fromLatin1(objectPath)) -{ check(); } +{ doCheck(); } inline QDBusObjectPath::QDBusObjectPath(const QLatin1String &objectPath) : QString(objectPath) -{ check(); } +{ doCheck(); } inline QDBusObjectPath::QDBusObjectPath(const QString &objectPath) : QString(objectPath) -{ check(); } +{ doCheck(); } inline QDBusObjectPath &QDBusObjectPath::operator=(const QDBusObjectPath &_path) -{ QString::operator=(_path); check(); return *this; } +{ QString::operator=(_path); doCheck(); return *this; } inline void QDBusObjectPath::setPath(const QString &objectPath) -{ QString::operator=(objectPath); check(); } +{ QString::operator=(objectPath); doCheck(); } inline bool operator==(const QDBusObjectPath &lhs, const QDBusObjectPath &rhs) { return lhs.path() == rhs.path(); } @@ -125,26 +125,26 @@ public: { return *this; } private: - void check(); + void doCheck(); }; inline QDBusSignature::QDBusSignature(const char *dBusSignature) : QString(QString::fromAscii(dBusSignature)) -{ check(); } +{ doCheck(); } inline QDBusSignature::QDBusSignature(const QLatin1String &dBusSignature) : QString(dBusSignature) -{ check(); } +{ doCheck(); } inline QDBusSignature::QDBusSignature(const QString &dBusSignature) : QString(dBusSignature) -{ check(); } +{ doCheck(); } inline QDBusSignature &QDBusSignature::operator=(const QDBusSignature &dbusSignature) -{ QString::operator=(dbusSignature); check(); return *this; } +{ QString::operator=(dbusSignature); doCheck(); return *this; } inline void QDBusSignature::setSignature(const QString &dBusSignature) -{ QString::operator=(dBusSignature); check(); } +{ QString::operator=(dBusSignature); doCheck(); } inline bool operator==(const QDBusSignature &lhs, const QDBusSignature &rhs) { return lhs.signature() == rhs.signature(); } -- cgit v1.2.3