diff options
| author | Artur Puzio <[email protected]> | 2016-03-16 22:17:37 +0100 |
|---|---|---|
| committer | Emmanuel Pescosta <[email protected]> | 2016-03-16 22:17:37 +0100 |
| commit | 5593c252e8d9638c86dcc2bb9edd394ea14f8ba1 (patch) | |
| tree | 486e7f04fa43758ab3011d75227e2d9791db4014 /src/search | |
| parent | 59811f849ed47982f5cf73e052640bc9f250ad97 (diff) | |
[CLAZY] Fixed all level 1 and level 2 warnings with small exceptions
REVIEW: 126771
Diffstat (limited to 'src/search')
| -rw-r--r-- | src/search/dolphinfacetswidget.cpp | 20 | ||||
| -rw-r--r-- | src/search/dolphinsearchbox.cpp | 34 |
2 files changed, 27 insertions, 27 deletions
diff --git a/src/search/dolphinfacetswidget.cpp b/src/search/dolphinfacetswidget.cpp index 2425e0b35..023b30c68 100644 --- a/src/search/dolphinfacetswidget.cpp +++ b/src/search/dolphinfacetswidget.cpp @@ -129,7 +129,7 @@ QString DolphinFacetsWidget::ratingTerm() const } const int rating = stars * 2; - terms << QString::fromLatin1("rating>=%1").arg(rating); + terms << QStringLiteral("rating>=%1").arg(rating); } if (!m_anytime->isChecked()) { @@ -144,7 +144,7 @@ QString DolphinFacetsWidget::ratingTerm() const date = date.addDays(1 - date.dayOfYear()); } - terms << QString::fromLatin1("modified>=%1").arg(date.toString(Qt::ISODate)); + terms << QStringLiteral("modified>=%1").arg(date.toString(Qt::ISODate)); } return terms.join(QStringLiteral(" AND ")); @@ -153,13 +153,13 @@ QString DolphinFacetsWidget::ratingTerm() const QString DolphinFacetsWidget::facetType() const { if (m_documents->isChecked()) { - return QLatin1String("Document"); + return QStringLiteral("Document"); } else if (m_images->isChecked()) { - return QLatin1String("Image"); + return QStringLiteral("Image"); } else if (m_audio->isChecked()) { - return QLatin1String("Audio"); + return QStringLiteral("Audio"); } else if (m_videos->isChecked()) { - return QLatin1String("Video"); + return QStringLiteral("Video"); } return QString(); @@ -174,9 +174,9 @@ bool DolphinFacetsWidget::isRatingTerm(const QString& term) const bool containsModified = false; foreach (const QString& subTerm, subTerms) { - if (subTerm.startsWith("rating>=")) { + if (subTerm.startsWith(QLatin1String("rating>="))) { containsRating = true; - } else if (subTerm.startsWith("modified>=")) { + } else if (subTerm.startsWith(QLatin1String("modified>="))) { containsModified = true; } } @@ -192,11 +192,11 @@ void DolphinFacetsWidget::setRatingTerm(const QString& term) QStringList subTerms = term.split(' ', QString::SkipEmptyParts); foreach (const QString& subTerm, subTerms) { - if (subTerm.startsWith("modified>=")) { + if (subTerm.startsWith(QLatin1String("modified>="))) { const QString value = subTerm.mid(10); const QDate date = QDate::fromString(value, Qt::ISODate); setTimespan(date); - } else if (subTerm.startsWith("rating>=")) { + } else if (subTerm.startsWith(QLatin1String("rating>="))) { const QString value = subTerm.mid(8); const int stars = value.toInt() / 2; setRating(stars); diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp index a925a97c9..26ddd27f8 100644 --- a/src/search/dolphinsearchbox.cpp +++ b/src/search/dolphinsearchbox.cpp @@ -91,7 +91,7 @@ void DolphinSearchBox::setSearchPath(const QUrl& url) QString location = url.fileName(); if (location.isEmpty()) { if (url.isLocalFile()) { - location = QLatin1String("/"); + location = QStringLiteral("/"); } else { location = url.scheme() + QLatin1String(" - ") + url.host(); } @@ -129,12 +129,12 @@ QUrl DolphinSearchBox::urlForSearching() const if (useBalooSearch) { url = balooUrlForSearching(); } else { - url.setScheme("filenamesearch"); + url.setScheme(QStringLiteral("filenamesearch")); QUrlQuery query; - query.addQueryItem("search", m_searchInput->text()); + query.addQueryItem(QStringLiteral("search"), m_searchInput->text()); if (m_contentButton->isChecked()) { - query.addQueryItem("checkContent", "yes"); + query.addQueryItem(QStringLiteral("checkContent"), QStringLiteral("yes")); } QString encodedUrl; @@ -146,7 +146,7 @@ QUrl DolphinSearchBox::urlForSearching() const } else { encodedUrl = m_searchPath.url(); } - query.addQueryItem("url", encodedUrl); + query.addQueryItem(QStringLiteral("url"), encodedUrl); url.setQuery(query); } @@ -156,13 +156,13 @@ QUrl DolphinSearchBox::urlForSearching() const void DolphinSearchBox::fromSearchUrl(const QUrl& url) { - if (url.scheme() == "baloosearch") { + if (url.scheme() == QLatin1String("baloosearch")) { fromBalooSearchUrl(url); - } else if (url.scheme() == "filenamesearch") { + } else if (url.scheme() == QLatin1String("filenamesearch")) { const QUrlQuery query(url); - setText(query.queryItemValue("search")); - setSearchPath(QUrl::fromUserInput(query.queryItemValue("url"), QString(), QUrl::AssumeLocalFile)); - m_contentButton->setChecked(query.queryItemValue("checkContent") == "yes"); + setText(query.queryItemValue(QStringLiteral("search"))); + setSearchPath(QUrl::fromUserInput(query.queryItemValue(QStringLiteral("url")), QString(), QUrl::AssumeLocalFile)); + m_contentButton->setChecked(query.queryItemValue(QStringLiteral("checkContent")) == QLatin1String("yes")); } else { setText(QString()); setSearchPath(url); @@ -314,8 +314,8 @@ void DolphinSearchBox::loadSettings() void DolphinSearchBox::saveSettings() { - SearchSettings::setLocation(m_fromHereButton->isChecked() ? "FromHere" : "Everywhere"); - SearchSettings::setWhat(m_fileNameButton->isChecked() ? "FileName" : "Content"); + SearchSettings::setLocation(m_fromHereButton->isChecked() ? QStringLiteral("FromHere") : QStringLiteral("Everywhere")); + SearchSettings::setWhat(m_fileNameButton->isChecked() ? QStringLiteral("FileName") : QStringLiteral("Content")); SearchSettings::setShowFacetsWidget(m_facetsToggleButton->isChecked()); SearchSettings::self()->save(); } @@ -325,7 +325,7 @@ void DolphinSearchBox::init() // Create close button QToolButton* closeButton = new QToolButton(this); closeButton->setAutoRaise(true); - closeButton->setIcon(QIcon::fromTheme("dialog-close")); + closeButton->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close"))); closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching")); connect(closeButton, &QToolButton::clicked, this, &DolphinSearchBox::emitCloseRequest); @@ -449,14 +449,14 @@ QUrl DolphinSearchBox::balooUrlForSearching() const if (m_contentButton->isChecked()) { queryStrings << text; } else if (!text.isEmpty()) { - queryStrings << QString::fromLatin1("filename:\"%1\"").arg(text); + queryStrings << QStringLiteral("filename:\"%1\"").arg(text); } if (m_fromHereButton->isChecked()) { query.setIncludeFolder(m_searchPath.toLocalFile()); } - query.setSearchString(queryStrings.join(" ")); + query.setSearchString(queryStrings.join(QStringLiteral(" "))); return query.toSearchUrl(i18nc("@title UDS_DISPLAY_NAME for a KIO directory listing. %1 is the query the user entered.", "Query Results from '%1'", text)); @@ -490,7 +490,7 @@ void DolphinSearchBox::fromBalooSearchUrl(const QUrl& url) const QStringList subTerms = query.searchString().split(' ', QString::SkipEmptyParts); foreach (const QString& subTerm, subTerms) { - if (subTerm.startsWith("filename:")) { + if (subTerm.startsWith(QLatin1String("filename:"))) { const QString value = subTerm.mid(9); setText(value); } else if (m_facetsWidget->isRatingTerm(subTerm)) { @@ -509,7 +509,7 @@ void DolphinSearchBox::updateFacetsToggleButton() { const bool facetsIsVisible = SearchSettings::showFacetsWidget(); m_facetsToggleButton->setChecked(facetsIsVisible ? true : false); - m_facetsToggleButton->setIcon(QIcon::fromTheme(facetsIsVisible ? "arrow-up-double" : "arrow-down-double")); + m_facetsToggleButton->setIcon(QIcon::fromTheme(facetsIsVisible ? QStringLiteral("arrow-up-double") : QStringLiteral("arrow-down-double"))); m_facetsToggleButton->setText(facetsIsVisible ? i18nc("action:button", "Fewer Options") : i18nc("action:button", "More Options")); } |
