diff options
| author | George Kiagiadakis <george.kiagiadakis@collabora.com> | 2012-05-02 17:34:47 +0300 |
|---|---|---|
| committer | George Kiagiadakis <george.kiagiadakis@collabora.com> | 2012-05-02 17:46:02 +0300 |
| commit | b2632998374b45af488b6c3a5a6fe330d23bb799 (patch) | |
| tree | 14a0e7ed40cd7716446846d6170292bbbb3b0173 | |
| parent | 861eb5f86a44c00e79de8c721110680e594c2eef (diff) | |
This fixes FTBFS with gcc-4.7, which requires <stdint.h> to be
included for intptr_t to be available. However, since stdint.h
is not part of the C++03 standard, it is better to use Qt's types.
Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
| -rw-r--r-- | TelepathyQt/base-connection.cpp | 2 | ||||
| -rw-r--r-- | TelepathyQt/client-registrar.cpp | 2 | ||||
| -rw-r--r-- | TelepathyQt/stream-tube-client.cpp | 2 | ||||
| -rw-r--r-- | TelepathyQt/stream-tube-server.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/TelepathyQt/base-connection.cpp b/TelepathyQt/base-connection.cpp index 45389c58..3897f079 100644 --- a/TelepathyQt/base-connection.cpp +++ b/TelepathyQt/base-connection.cpp @@ -154,7 +154,7 @@ QVariantMap BaseConnection::immutableProperties() const */ QString BaseConnection::uniqueName() const { - return QString(QLatin1String("_%1")).arg((intptr_t) this, 0, 16); + return QString(QLatin1String("_%1")).arg((quintptr) this, 0, 16); } /** diff --git a/TelepathyQt/client-registrar.cpp b/TelepathyQt/client-registrar.cpp index 1b6c1e4c..6ed99328 100644 --- a/TelepathyQt/client-registrar.cpp +++ b/TelepathyQt/client-registrar.cpp @@ -888,7 +888,7 @@ bool ClientRegistrar::registerClient(const AbstractClientPtr &client, .arg(mPriv->bus.baseService() .replace(QLatin1String(":"), QLatin1String("_")) .replace(QLatin1String("."), QLatin1String("_"))) - .arg((intptr_t) client.data(), 0, 16)); + .arg((quintptr) client.data(), 0, 16)); } if (mPriv->services.contains(busName) || diff --git a/TelepathyQt/stream-tube-client.cpp b/TelepathyQt/stream-tube-client.cpp index f22384c5..9716a346 100644 --- a/TelepathyQt/stream-tube-client.cpp +++ b/TelepathyQt/stream-tube-client.cpp @@ -211,7 +211,7 @@ struct TP_QT_NO_EXPORT StreamTubeClient::Private .arg(registrar->dbusConnection().baseService() .replace(QLatin1Char(':'), QLatin1Char('_')) .replace(QLatin1Char('.'), QLatin1Char('_'))) - .arg((intptr_t) this, 0, 16); + .arg((quintptr) this, 0, 16); } } diff --git a/TelepathyQt/stream-tube-server.cpp b/TelepathyQt/stream-tube-server.cpp index e1791dfd..8aaaff4b 100644 --- a/TelepathyQt/stream-tube-server.cpp +++ b/TelepathyQt/stream-tube-server.cpp @@ -307,7 +307,7 @@ struct StreamTubeServer::Private .arg(registrar->dbusConnection().baseService() .replace(QLatin1Char(':'), QLatin1Char('_')) .replace(QLatin1Char('.'), QLatin1Char('_'))) - .arg((intptr_t) this, 0, 16); + .arg((quintptr) this, 0, 16); } } |