summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@collabora.com>2012-01-21 16:09:51 +0200
committerQt by Nokia <qt-info@nokia.com>2012-01-23 12:49:55 +0100
commitcdb61839f4a1c139a736032b7a08fcd504234095 (patch)
treee67fa9f8e31e12f5046c9e4d537094177d2edbf7 /src/corelib
parent1db32565c61e33a7fdd016ff05e2017a5fd11ad1 (diff)
Remove uses of qMalloc/qFree from out of line code.
There is no need to use these, and we are trying to deprecate them. Change-Id: I70e6f27aca322fe74c31d8ad8496f230cd29e503 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/io/qfilesystemengine_win.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp
index cbf8996091..a9faa9f234 100644
--- a/src/corelib/io/qfilesystemengine_win.cpp
+++ b/src/corelib/io/qfilesystemengine_win.cpp
@@ -180,7 +180,7 @@ public:
SidCleanup::~SidCleanup()
{
- qFree(currentUserSID);
+ free(currentUserSID);
currentUserSID = 0;
// worldSID was allocated with AllocateAndInitializeSid so it needs to be freed with FreeSid
@@ -232,15 +232,15 @@ static void resolveLibs()
// doing a dummy GetTokenInformation call.
::GetTokenInformation(token, TokenUser, 0, 0, &retsize);
if (retsize) {
- void *tokenBuffer = qMalloc(retsize);
+ void *tokenBuffer = malloc(retsize);
if (::GetTokenInformation(token, TokenUser, tokenBuffer, retsize, &retsize)) {
PSID tokenSid = reinterpret_cast<PTOKEN_USER>(tokenBuffer)->User.Sid;
DWORD sidLen = ::GetLengthSid(tokenSid);
- currentUserSID = reinterpret_cast<PSID>(qMalloc(sidLen));
+ currentUserSID = reinterpret_cast<PSID>(malloc(sidLen));
if (::CopySid(sidLen, currentUserSID, tokenSid))
ptrBuildTrusteeWithSidW(&currentUserTrusteeW, currentUserSID);
}
- qFree(tokenBuffer);
+ free(tokenBuffer);
}
::CloseHandle(token);
}