diff options
Diffstat (limited to 'src/corelib/kernel/qcoreapplication_win.cpp')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication_win.cpp | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp index 87d8af90bb..03559d90ae 100644 --- a/src/corelib/kernel/qcoreapplication_win.cpp +++ b/src/corelib/kernel/qcoreapplication_win.cpp @@ -55,6 +55,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + Q_CORE_EXPORT QString qAppFileName() // get application file name { /* @@ -172,7 +174,7 @@ static QString flagsValue(const QWinMessageMapping<IntType> *haystack, for (auto p = haystack, end = haystack + haystackSize; p < end; ++p) { if ((p->value & value) == p->value) { if (!result.isEmpty()) - result += QLatin1String(" | "); + result += " | "_L1; result += QLatin1String(p->name); } } @@ -664,8 +666,8 @@ QString decodeMSG(const MSG& msg) // decoded message, since some of the common messages are quite long, and // we don't want the decoded information to vary in output position if (message.size() < 20) - message.prepend(QString(20 - message.size(), QLatin1Char(' '))); - message += QLatin1String(": "); + message.prepend(QString(20 - message.size(), u' ')); + message += ": "_L1; const QString hwndS = QString::asprintf("(%p)", reinterpret_cast<void *>(msg.hwnd)); const QString wParamS = QString::asprintf("(%p)", reinterpret_cast<void *>(wParam)); @@ -676,10 +678,10 @@ QString decodeMSG(const MSG& msg) case WM_ACTIVATE: if (const char *a = activateParameter(uint(wParam))) parameters += QLatin1String(a); - parameters += QLatin1String(" Hwnd ") + hwndS; + parameters += " Hwnd "_L1 + hwndS; break; case WM_CAPTURECHANGED: - parameters = QLatin1String("Hwnd gaining capture ") + hwndS; + parameters = "Hwnd gaining capture "_L1 + hwndS; break; case WM_CREATE: { @@ -704,7 +706,7 @@ QString decodeMSG(const MSG& msg) } break; case WM_DESTROY: - parameters = QLatin1String("Destroy hwnd ") + hwndS; + parameters = "Destroy hwnd "_L1 + hwndS; break; case 0x02E0u: { // WM_DPICHANGED auto rect = reinterpret_cast<const RECT *>(lParam); @@ -715,20 +717,20 @@ QString decodeMSG(const MSG& msg) break; case WM_IME_NOTIFY: { - parameters = QLatin1String("Command("); + parameters = "Command("_L1; if (const char *c = imeCommand(uint(wParam))) parameters += QLatin1String(c); - parameters += QLatin1String(" : ") + lParamS; + parameters += " : "_L1 + lParamS; } break; case WM_IME_SETCONTEXT: - parameters = QLatin1String("Input context(") - + QLatin1String(wParam == TRUE ? "Active" : "Inactive") - + QLatin1String(") Show flags(") - + imeShowFlags(DWORD(lParam)) + QLatin1Char(')'); + parameters = "Input context("_L1 + + (wParam ? "Active"_L1 : "Inactive"_L1) + + ") Show flags("_L1 + + imeShowFlags(DWORD(lParam)) + u')'; break; case WM_KILLFOCUS: - parameters = QLatin1String("Hwnd gaining keyboard focus ") + wParamS; + parameters = "Hwnd gaining keyboard focus "_L1 + wParamS; break; case WM_CHAR: case WM_IME_CHAR: @@ -751,7 +753,7 @@ QString decodeMSG(const MSG& msg) parameters = QStringLiteral("Keyboard layout changed"); break; case WM_NCACTIVATE: - parameters = (msg.wParam? QLatin1String("Active Titlebar") : QLatin1String("Inactive Titlebar")); + parameters = (msg.wParam? "Active Titlebar"_L1 : "Inactive Titlebar"_L1); break; case WM_MOUSEACTIVATE: { @@ -778,14 +780,14 @@ QString decodeMSG(const MSG& msg) case WM_MOUSEMOVE: parameters = QString::asprintf("x,y(%4d,%4d) Virtual Keys(", GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)) - + virtualKeys(uint(wParam)) + QLatin1Char(')'); + + virtualKeys(uint(wParam)) + u')'; break; case WM_MOVE: parameters = QString::asprintf("x,y(%4d,%4d)", LOWORD(lParam), HIWORD(lParam)); break; case WM_ERASEBKGND: case WM_PAINT: - parameters = QLatin1String("hdc") + wParamS; + parameters = "hdc"_L1 + wParamS; break; case WM_QUERYNEWPALETTE: break; // lParam & wParam are unused @@ -793,22 +795,22 @@ QString decodeMSG(const MSG& msg) parameters = QString::asprintf("HitTestCode(0x%x) MouseMsg(", LOWORD(lParam)); if (const char *mouseMsg = findWMstr(HIWORD(lParam))) parameters += QLatin1String(mouseMsg); - parameters += QLatin1Char(')'); + parameters += u')'; break; case WM_SETFOCUS: - parameters = QLatin1String("Lost Focus ") + wParamS; + parameters = "Lost Focus "_L1 + wParamS; break; case WM_SETTEXT: - parameters = QLatin1String("Set Text (") + parameters = "Set Text ("_L1 + QString::fromWCharArray(reinterpret_cast<const wchar_t *>(lParam)) - + QLatin1Char(')'); + + u')'; break; case WM_SIZE: parameters = QString::asprintf("w,h(%4d,%4d) showmode(", LOWORD(lParam), HIWORD(lParam)); if (const char *showMode = wmSizeParam(uint(wParam))) parameters += QLatin1String(showMode); - parameters += QLatin1Char(')'); + parameters += u')'; break; case WM_WINDOWPOSCHANGED: { @@ -823,20 +825,20 @@ QString decodeMSG(const MSG& msg) parameters += QLatin1String(h); else parameters += QString::number(insertAfter, 16); - parameters += QLatin1Char(')'); + parameters += u')'; } break; case WM_QUERYENDSESSION: - parameters = QLatin1String("End session: "); + parameters = "End session: "_L1; if (const char *logoffOption = sessionMgrLogOffOption(uint(wParam))) parameters += QLatin1String(logoffOption); break; default: - parameters = QLatin1String("wParam") + wParamS + QLatin1String(" lParam") + lParamS; + parameters = "wParam"_L1 + wParamS + " lParam"_L1 + lParamS; break; } - return message + QLatin1String("hwnd") + hwndS + QLatin1Char(' ') + parameters; + return message + "hwnd"_L1 + hwndS + u' ' + parameters; } QDebug operator<<(QDebug dbg, const MSG &msg) |