diff options
author | Robin Burchell <robin.burchell@collabora.com> | 2011-12-20 21:39:12 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-06 14:11:14 +0100 |
commit | b08daaedd45457b775cb90d2c2650510daff1c8d (patch) | |
tree | d68ea8016a15ee851813133a51897a7a81aedc16 /src/network/kernel/qhostinfo_unix.cpp | |
parent | 514ef34d1f838be119961003c0411a88352ba535 (diff) |
Remove all non-inline of qMalloc/qFree/qRealloc.
We're trying to deprecate these, so don't use them anymore.
The inline uses of these have been left intact, for the moment. Inline code will
need to create their own non-inline allocation methods (for future-proofing to
allow alterations in how e.g. individual containers allocate)
Change-Id: I1071a487c25e95b7bb81a3327b20c5481fb5ed22
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/network/kernel/qhostinfo_unix.cpp')
-rw-r--r-- | src/network/kernel/qhostinfo_unix.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp index 85df770654..73882dd54f 100644 --- a/src/network/kernel/qhostinfo_unix.cpp +++ b/src/network/kernel/qhostinfo_unix.cpp @@ -329,7 +329,7 @@ QString QHostInfo::localDomainName() resolveLibrary(); if (local_res_ninit) { // using thread-safe version - res_state_ptr state = res_state_ptr(qMalloc(sizeof(*state))); + res_state_ptr state = res_state_ptr(malloc(sizeof(*state))); Q_CHECK_PTR(state); memset(state, 0, sizeof(*state)); local_res_ninit(state); @@ -337,7 +337,7 @@ QString QHostInfo::localDomainName() if (domainName.isEmpty()) domainName = QUrl::fromAce(state->dnsrch[0]); local_res_nclose(state); - qFree(state); + free(state); return domainName; } |