From 51267a67baa4be723dc8ebaded6914433dafe3a6 Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Thu, 15 Oct 2015 15:48:44 -0400 Subject: [PATCH] Use QStringLiteral and QLatin1String --- src/Filter.cpp | 10 ++-- src/IncrementalSearchBar.cpp | 4 +- src/KeyboardTranslator.cpp | 78 +++++++++++++++---------------- src/KeyboardTranslatorManager.cpp | 4 +- 4 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/Filter.cpp b/src/Filter.cpp index eff72a388..789c4cdc5 100644 --- a/src/Filter.cpp +++ b/src/Filter.cpp @@ -403,20 +403,20 @@ void UrlFilter::HotSpot::activate(QObject* object) const QString& actionName = object ? object->objectName() : QString(); - if (actionName == "copy-action") { + if (actionName == QLatin1String("copy-action")) { QApplication::clipboard()->setText(url); return; } - if (!object || actionName == "open-action") { + if (!object || actionName == QLatin1String("open-action")) { if (kind == StandardUrl) { // if the URL path does not include the protocol ( eg. "www.kde.org" ) then // prepend http:// ( eg. "www.kde.org" --> "http://www.kde.org" ) - if (!url.contains("://")) { - url.prepend("http://"); + if (!url.contains(QLatin1String("://"))) { + url.prepend(QLatin1String("http://")); } } else if (kind == Email) { - url.prepend("mailto:"); + url.prepend(QLatin1String("mailto:")); } new KRun(QUrl(url), QApplication::activeWindow()); diff --git a/src/IncrementalSearchBar.cpp b/src/IncrementalSearchBar.cpp index 8af58e984..17a14ca6d 100644 --- a/src/IncrementalSearchBar.cpp +++ b/src/IncrementalSearchBar.cpp @@ -238,7 +238,7 @@ void IncrementalSearchBar::setFoundMatch(bool match) if (!match && !_searchEdit->text().isEmpty()) { KStatefulBrush backgroundBrush(KColorScheme::View, KColorScheme::NegativeBackground); - QString matchStyleSheet = QString("QLineEdit{ background-color:%1 }") + QString matchStyleSheet = QStringLiteral("QLineEdit{ background-color:%1 }") .arg(backgroundBrush.brush(_searchEdit).color().name()); _searchEdit->setStyleSheet(matchStyleSheet); @@ -247,7 +247,7 @@ void IncrementalSearchBar::setFoundMatch(bool match) } else { KStatefulBrush backgroundBrush(KColorScheme::View, KColorScheme::PositiveBackground); - QString matchStyleSheet = QString("QLineEdit{ background-color:%1 }") + QString matchStyleSheet = QStringLiteral("QLineEdit{ background-color:%1 }") .arg(backgroundBrush.brush(_searchEdit).color().name()); _searchEdit->setStyleSheet(matchStyleSheet); diff --git a/src/KeyboardTranslator.cpp b/src/KeyboardTranslator.cpp index e9e36fe58..4b155945e 100644 --- a/src/KeyboardTranslator.cpp +++ b/src/KeyboardTranslator.cpp @@ -152,19 +152,19 @@ void KeyboardTranslatorReader::readNext() bool KeyboardTranslatorReader::parseAsCommand(const QString& text, KeyboardTranslator::Command& command) { - if (text.compare("erase", Qt::CaseInsensitive) == 0) + if (text.compare(QLatin1String("erase"), Qt::CaseInsensitive) == 0) command = KeyboardTranslator::EraseCommand; - else if (text.compare("scrollpageup", Qt::CaseInsensitive) == 0) + else if (text.compare(QLatin1String("scrollpageup"), Qt::CaseInsensitive) == 0) command = KeyboardTranslator::ScrollPageUpCommand; - else if (text.compare("scrollpagedown", Qt::CaseInsensitive) == 0) + else if (text.compare(QLatin1String("scrollpagedown"), Qt::CaseInsensitive) == 0) command = KeyboardTranslator::ScrollPageDownCommand; - else if (text.compare("scrolllineup", Qt::CaseInsensitive) == 0) + else if (text.compare(QLatin1String("scrolllineup"), Qt::CaseInsensitive) == 0) command = KeyboardTranslator::ScrollLineUpCommand; - else if (text.compare("scrolllinedown", Qt::CaseInsensitive) == 0) + else if (text.compare(QLatin1String("scrolllinedown"), Qt::CaseInsensitive) == 0) command = KeyboardTranslator::ScrollLineDownCommand; - else if (text.compare("scrolluptotop", Qt::CaseInsensitive) == 0) + else if (text.compare(QLatin1String("scrolluptotop"), Qt::CaseInsensitive) == 0) command = KeyboardTranslator::ScrollUpToTopCommand; - else if (text.compare("scrolldowntobottom", Qt::CaseInsensitive) == 0) + else if (text.compare(QLatin1String("scrolldowntobottom"), Qt::CaseInsensitive) == 0) command = KeyboardTranslator::ScrollDownToBottomCommand; else return false; @@ -241,15 +241,15 @@ bool KeyboardTranslatorReader::decodeSequence(const QString& text, bool KeyboardTranslatorReader::parseAsModifier(const QString& item , Qt::KeyboardModifier& modifier) { - if (item == "shift") + if (item == QLatin1String("shift")) modifier = Qt::ShiftModifier; - else if (item == "ctrl" || item == "control") + else if (item == QLatin1String("ctrl") || item == QLatin1String("control")) modifier = Qt::ControlModifier; - else if (item == "alt") + else if (item == QLatin1String("alt")) modifier = Qt::AltModifier; - else if (item == "meta") + else if (item == QLatin1String("meta")) modifier = Qt::MetaModifier; - else if (item == "keypad") + else if (item == QLatin1String("keypad")) modifier = Qt::KeypadModifier; else return false; @@ -258,17 +258,17 @@ bool KeyboardTranslatorReader::parseAsModifier(const QString& item , Qt::Keyboar } bool KeyboardTranslatorReader::parseAsStateFlag(const QString& item , KeyboardTranslator::State& flag) { - if (item == "appcukeys" || item == "appcursorkeys") + if (item == QLatin1String("appcukeys") || item == QLatin1String("appcursorkeys")) flag = KeyboardTranslator::CursorKeysState; - else if (item == "ansi") + else if (item == QLatin1String("ansi")) flag = KeyboardTranslator::AnsiState; - else if (item == "newline") + else if (item == QLatin1String("newline")) flag = KeyboardTranslator::NewLineState; - else if (item == "appscreen") + else if (item == QLatin1String("appscreen")) flag = KeyboardTranslator::AlternateScreenState; - else if (item == "anymod" || item == "anymodifier") + else if (item == QLatin1String("anymod") || item == QLatin1String("anymodifier")) flag = KeyboardTranslator::AnyModifierState; - else if (item == "appkeypad") + else if (item == QLatin1String("appkeypad")) flag = KeyboardTranslator::ApplicationKeypadState; else return false; @@ -302,7 +302,7 @@ bool KeyboardTranslatorReader::hasNextEntry() KeyboardTranslator::Entry KeyboardTranslatorReader::createEntry(const QString& condition , const QString& result) { - QString entryString("keyboard \"temporary\"\nkey "); + QString entryString(QStringLiteral("keyboard \"temporary\"\nkey ")); entryString.append(condition); entryString.append(" : "); @@ -538,15 +538,15 @@ void KeyboardTranslator::Entry::insertModifier(QString& item , int modifier) con item += '-'; if (modifier == Qt::ShiftModifier) - item += "Shift"; + item += QLatin1String("Shift"); else if (modifier == Qt::ControlModifier) - item += "Ctrl"; + item += QLatin1String("Ctrl"); else if (modifier == Qt::AltModifier) - item += "Alt"; + item += QLatin1String("Alt"); else if (modifier == Qt::MetaModifier) - item += "Meta"; + item += QLatin1String("Meta"); else if (modifier == Qt::KeypadModifier) - item += "KeyPad"; + item += QLatin1String("KeyPad"); } void KeyboardTranslator::Entry::insertState(QString& item, int aState) const { @@ -559,17 +559,17 @@ void KeyboardTranslator::Entry::insertState(QString& item, int aState) const item += '-'; if (aState == KeyboardTranslator::AlternateScreenState) - item += "AppScreen"; + item += QLatin1String("AppScreen"); else if (aState == KeyboardTranslator::NewLineState) - item += "NewLine"; + item += QLatin1String("NewLine"); else if (aState == KeyboardTranslator::AnsiState) - item += "Ansi"; + item += QLatin1String("Ansi"); else if (aState == KeyboardTranslator::CursorKeysState) - item += "AppCursorKeys"; + item += QLatin1String("AppCursorKeys"); else if (aState == KeyboardTranslator::AnyModifierState) - item += "AnyModifier"; + item += QLatin1String("AnyModifier"); else if (aState == KeyboardTranslator::ApplicationKeypadState) - item += "AppKeypad"; + item += QLatin1String("AppKeypad"); } QString KeyboardTranslator::Entry::resultToString(bool expandWildCards, Qt::KeyboardModifiers keyboardModifiers) const @@ -577,19 +577,19 @@ QString KeyboardTranslator::Entry::resultToString(bool expandWildCards, if (!_text.isEmpty()) return escapedText(expandWildCards, keyboardModifiers); else if (_command == EraseCommand) - return "Erase"; + return QStringLiteral("Erase"); else if (_command == ScrollPageUpCommand) - return "ScrollPageUp"; + return QStringLiteral("ScrollPageUp"); else if (_command == ScrollPageDownCommand) - return "ScrollPageDown"; + return QStringLiteral("ScrollPageDown"); else if (_command == ScrollLineUpCommand) - return "ScrollLineUp"; + return QStringLiteral("ScrollLineUp"); else if (_command == ScrollLineDownCommand) - return "ScrollLineDown"; + return QStringLiteral("ScrollLineDown"); else if (_command == ScrollUpToTopCommand) - return "ScrollUpToTop"; + return QStringLiteral("ScrollUpToTop"); else if (_command == ScrollDownToBottomCommand) - return "ScrollDownToBottom"; + return QStringLiteral("ScrollDownToBottom"); return QString(); } @@ -619,9 +619,9 @@ KeyboardTranslator::KeyboardTranslator(const QString& aName) } FallbackKeyboardTranslator::FallbackKeyboardTranslator() - : KeyboardTranslator("fallback") + : KeyboardTranslator(QStringLiteral("fallback")) { - setDescription("Fallback Keyboard Translator"); + setDescription(QStringLiteral("Fallback Keyboard Translator")); // Key "TAB" should send out '\t' KeyboardTranslator::Entry entry; diff --git a/src/KeyboardTranslatorManager.cpp b/src/KeyboardTranslatorManager.cpp index c783fd290..79bc84cc2 100644 --- a/src/KeyboardTranslatorManager.cpp +++ b/src/KeyboardTranslatorManager.cpp @@ -85,7 +85,7 @@ void KeyboardTranslatorManager::findTranslators() { QStringList list; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "konsole", QStandardPaths::LocateDirectory); + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("konsole"), QStandardPaths::LocateDirectory); list.reserve(dirs.size()); Q_FOREACH (const QString& dir, dirs) { @@ -188,7 +188,7 @@ const KeyboardTranslator* KeyboardTranslatorManager::defaultTranslator() { // Try to find the default.keytab file if it exists, otherwise // fall back to the internal hard-coded fallback translator - const KeyboardTranslator* translator = findTranslator("default"); + const KeyboardTranslator* translator = findTranslator(QStringLiteral("default")); if (!translator) { translator = _fallbackTranslator; }