From b8a390950552ba55b2d930636ee4ba11388d46f6 Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Mon, 5 Jul 2010 15:19:23 +1000 Subject: Fix build failure with cs2009q3 toolchain. Use Qt typedef for unsigned 32-bit integers. --- src/plugins/bearer/icd/qicdengine.cpp | 10 +++++----- src/plugins/bearer/icd/qicdengine.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/bearer/icd/qicdengine.cpp b/src/plugins/bearer/icd/qicdengine.cpp index 3033140..0083380 100644 --- a/src/plugins/bearer/icd/qicdengine.cpp +++ b/src/plugins/bearer/icd/qicdengine.cpp @@ -327,10 +327,10 @@ void QIcdEngine::deleteConfiguration(const QString &iap_id) } -static uint32_t getNetworkAttrs(bool is_iap_id, - const QString &iap_id, - const QString &iap_type, - QString security_method) +static quint32 getNetworkAttrs(bool is_iap_id, + const QString &iap_id, + const QString &iap_type, + QString security_method) { guint network_attr = 0; dbus_uint32_t cap = 0; @@ -368,7 +368,7 @@ static uint32_t getNetworkAttrs(bool is_iap_id, if (is_iap_id) network_attr |= ICD_NW_ATTR_IAPNAME; - return (uint32_t)network_attr; + return quint32(network_attr); } diff --git a/src/plugins/bearer/icd/qicdengine.h b/src/plugins/bearer/icd/qicdengine.h index 2f9f8ed..1b291eb 100644 --- a/src/plugins/bearer/icd/qicdengine.h +++ b/src/plugins/bearer/icd/qicdengine.h @@ -69,11 +69,11 @@ public: QString service_type; QString service_id; - uint32_t service_attrs; + quint32 service_attrs; // Network attributes for this IAP, this is the value returned by icd and // passed to it when connecting. - uint32_t network_attrs; + quint32 network_attrs; }; inline IcdNetworkConfigurationPrivate *toIcdConfig(QNetworkConfigurationPrivatePointer ptr) -- cgit v0.12