From ee35bdce8f6b08922b4c9e0c0c838e5f2c4a79ad Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Mon, 22 Feb 2021 22:38:43 +0200 Subject: Optimise string operations a bit - Use QString::arg(Args...) instead of .arg().arg() - Use QLatin1String for string comparisons, should be faster - Use QLatin1String::arg() for better readability - Add the comment dfaure suggested in the MR, to explain why it's '2%' then '%1' in a QString().arg().arg() NO_CHANGELOG --- src/gui/kwindowconfig.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gui/kwindowconfig.cpp') diff --git a/src/gui/kwindowconfig.cpp b/src/gui/kwindowconfig.cpp index a7697782..019e1aa2 100644 --- a/src/gui/kwindowconfig.cpp +++ b/src/gui/kwindowconfig.cpp @@ -37,7 +37,7 @@ static QString allConnectedScreens() static QString configFileString(const QRect &desk, const QString &key) { // We include resolution data to also save data on a per-resolution basis - const QString returnString = QStringLiteral("%1 %2 %3x%4").arg(allConnectedScreens()).arg(key).arg(desk.width()).arg(desk.height()); + const QString returnString = QStringLiteral("%1 %2 %3x%4").arg(allConnectedScreens(), key, QString::number(desk.width()), QString::number(desk.height())); return returnString; } @@ -136,7 +136,7 @@ void KWindowConfig::saveWindowPosition(const QWindow *window, KConfigGroup &conf { // On Wayland, the compositor is solely responsible for window positioning, // So this needs to be a no-op - if (!window || QGuiApplication::platformName() == QStringLiteral("wayland")) { + if (!window || QGuiApplication::platformName() == QLatin1String{"wayland"}) { return; } @@ -149,7 +149,7 @@ void KWindowConfig::restoreWindowPosition(QWindow *window, const KConfigGroup &c { // On Wayland, the compositor is solely responsible for window positioning, // So this needs to be a no-op - if (!window || QGuiApplication::platformName() == QStringLiteral("wayland")) { + if (!window || QGuiApplication::platformName() == QLatin1String{"wayland"}) { return; } @@ -166,8 +166,8 @@ void KWindowConfig::restoreWindowPosition(QWindow *window, const KConfigGroup &c // per-resolution information is not // TODO: Remove in KF6 or maybe even KF5.85 or something. It really only needs // to be here to transition existing users once they upgrade from 5.78 -> 5.79 - const int fallbackXPosition = config.readEntry(QStringLiteral("%1 XPosition %2").arg(allConnectedScreens()).arg(desk.width()), -1); - const int fallbackYPosition = config.readEntry(QStringLiteral("%1 YPosition %2").arg(allConnectedScreens()).arg(desk.height()), -1); + const int fallbackXPosition = config.readEntry(QStringLiteral("%1 XPosition %2").arg(allConnectedScreens(), QString::number(desk.width())), -1); + const int fallbackYPosition = config.readEntry(QStringLiteral("%1 YPosition %2").arg(allConnectedScreens(), QString::number(desk.height())), -1); const int xPos = config.readEntry(windowXPositionString(desk), fallbackXPosition); const int yPos = config.readEntry(windowYPositionString(desk), fallbackYPosition); -- cgit v1.2.1