diff options
author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-07-05 05:19:23 (GMT) |
---|---|---|
committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-07-05 05:19:23 (GMT) |
commit | b8a390950552ba55b2d930636ee4ba11388d46f6 (patch) | |
tree | ce515e7dfbc59fdbb8c705d33d7a68d657f5245d /src | |
parent | 4cdd831191a22604486fa895c57532f319a56b96 (diff) | |
download | Qt-b8a390950552ba55b2d930636ee4ba11388d46f6.zip Qt-b8a390950552ba55b2d930636ee4ba11388d46f6.tar.gz Qt-b8a390950552ba55b2d930636ee4ba11388d46f6.tar.bz2 |
Fix build failure with cs2009q3 toolchain.
Use Qt typedef for unsigned 32-bit integers.
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/bearer/icd/qicdengine.cpp | 10 | ||||
-rw-r--r-- | 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) |