From 365cd77c2679d1f672dfd2f8403af9fe410a162f Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 7 May 2012 10:21:47 +0200 Subject: Windows: Fix helper routine for formatting errors. Some return values were empty, or missing. Use QByteArrayLiteral. Change-Id: Ib9f124dea1245c000c53098164bf29e78eaa13d2 Reviewed-by: Friedemann Kleint --- src/plugins/platforms/windows/qwindowscontext.cpp | 36 ++++++++++++----------- 1 file changed, 19 insertions(+), 17 deletions(-) (limited to 'src/plugins/platforms/windows/qwindowscontext.cpp') diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp index 6913bc8dd4..4d284e0591 100644 --- a/src/plugins/platforms/windows/qwindowscontext.cpp +++ b/src/plugins/platforms/windows/qwindowscontext.cpp @@ -595,37 +595,39 @@ QByteArray QWindowsContext::comErrorString(HRESULT hr) { switch (hr) { case S_OK: - return QByteArray("S_OK"); + return QByteArrayLiteral("S_OK"); case S_FALSE: - return QByteArray("S_FALSE"); + return QByteArrayLiteral("S_FALSE"); case E_UNEXPECTED: - return QByteArray("E_UNEXPECTED"); + return QByteArrayLiteral("E_UNEXPECTED"); case CO_E_ALREADYINITIALIZED: - return QByteArray("CO_E_ALREADYINITIALIZED"); + return QByteArrayLiteral("CO_E_ALREADYINITIALIZED"); case CO_E_NOTINITIALIZED: - return QByteArray("CO_E_NOTINITIALIZED"); + return QByteArrayLiteral("CO_E_NOTINITIALIZED"); case RPC_E_CHANGED_MODE: - return QByteArray("RPC_E_CHANGED_MODE"); + return QByteArrayLiteral("RPC_E_CHANGED_MODE"); case OLE_E_WRONGCOMPOBJ: - return QByteArray("OLE_E_WRONGCOMPOBJ"); + return QByteArrayLiteral("OLE_E_WRONGCOMPOBJ"); case CO_E_NOT_SUPPORTED: - return QByteArray("CO_E_NOT_SUPPORTED"); + return QByteArrayLiteral("CO_E_NOT_SUPPORTED"); case E_NOTIMPL: - return QByteArray("E_NOTIMPL"); + return QByteArrayLiteral("E_NOTIMPL"); case E_INVALIDARG: - return QByteArray(""); + return QByteArrayLiteral("E_INVALIDARG"); case E_NOINTERFACE: - return QByteArray(""); + return QByteArrayLiteral("E_NOINTERFACE"); case E_POINTER: - return QByteArray(""); + return QByteArrayLiteral("E_POINTER"); case E_HANDLE: - return QByteArray(""); + return QByteArrayLiteral("E_HANDLE"); case E_ABORT: - return QByteArray(""); + return QByteArrayLiteral("E_ABORT"); case E_FAIL: - return QByteArray(""); - case E_ACCESSDENIED: - return QByteArray(""); + return QByteArrayLiteral("E_FAIL"); + case RPC_E_WRONG_THREAD: + return QByteArrayLiteral("RPC_E_WRONG_THREAD"); + case RPC_E_THREAD_NOT_INIT: + return QByteArrayLiteral("RPC_E_THREAD_NOT_INIT"); default: break; } -- cgit v1.2.3