diff options
author | Ritt Konstantin <ritt.ks@gmail.com> | 2011-06-06 14:56:45 +0200 |
---|---|---|
committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-06-06 14:56:45 +0200 |
commit | 8eaf39f705295f3072e9243f55063e92af40489c (patch) | |
tree | 89c4b637555128f79958e924652339d3cb2f99b2 /src/corelib/kernel/qsharedmemory_win.cpp | |
parent | 11bacd30967435a54eb74e9e2e36a97b12629a8c (diff) |
simplify QSharedMemoryPrivate::cleanHandle()
by making it return nothing as it's result should be ignored anyways
(initKey() and detach() could return false because of it - which is wrong)
Merge-request: 1248
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qsharedmemory_win.cpp')
-rw-r--r-- | src/corelib/kernel/qsharedmemory_win.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/corelib/kernel/qsharedmemory_win.cpp b/src/corelib/kernel/qsharedmemory_win.cpp index d4da30dbc9..3b8876f7d8 100644 --- a/src/corelib/kernel/qsharedmemory_win.cpp +++ b/src/corelib/kernel/qsharedmemory_win.cpp @@ -125,15 +125,11 @@ HANDLE QSharedMemoryPrivate::handle() return hand; } -bool QSharedMemoryPrivate::cleanHandle() +void QSharedMemoryPrivate::cleanHandle() { - if (hand != 0 && !CloseHandle(hand)) { - hand = 0; + if (hand != 0 && !CloseHandle(hand)) setErrorString(QLatin1String("QSharedMemory::cleanHandle")); - return false; - } hand = 0; - return true; } bool QSharedMemoryPrivate::create(int size) @@ -192,7 +188,9 @@ bool QSharedMemoryPrivate::detach() size = 0; // close handle - return cleanHandle(); + cleanHandle(); + + return true; } QT_END_NAMESPACE |