diff --git a/src/lib/preferences/acceptlanguage.cpp b/src/lib/preferences/acceptlanguage.cpp index 7b4fdc813..10db76579 100644 --- a/src/lib/preferences/acceptlanguage.cpp +++ b/src/lib/preferences/acceptlanguage.cpp @@ -118,15 +118,17 @@ QStringList AcceptLanguage::expand(const QLocale::Language &language) for (int j = 0; j < countries.size(); ++j) { QString languageString; if (countries.count() == 1) { - languageString = QString(QLatin1String("%1 [%2]")) - .arg(QLocale::languageToString(language)) - .arg(QLocale(language).name().split(QLatin1Char('_')).at(0)); + languageString = QString(QLatin1String("%1 [%2]")).arg( + QLocale::languageToString(language), + QLocale(language).name().split(QLatin1Char('_')).at(0) + ); } else { - languageString = QString(QLatin1String("%1/%2 [%3]")) - .arg(QLocale::languageToString(language)) - .arg(QLocale::countryToString(countries.at(j))) - .arg(QLocale(language, countries.at(j)).name().split(QLatin1Char('_')).join(QLatin1Char('-')).toLower()); + languageString = QString(QLatin1String("%1/%2 [%3]")).arg ( + QLocale::languageToString(language), + QLocale::countryToString(countries.at(j)), + QLocale(language, countries.at(j)).name().split(QLatin1Char('_')).join(QLatin1Char('-')).toLower() + ); } if (!allLanguages.contains(languageString)) { diff --git a/src/lib/session/sessionmanager.cpp b/src/lib/session/sessionmanager.cpp index 2cdc3e7c7..476c0cea5 100644 --- a/src/lib/session/sessionmanager.cpp +++ b/src/lib/session/sessionmanager.cpp @@ -131,7 +131,7 @@ void SessionManager::renameSession(QString sessionFilePath, SessionManager::Sess if (!ok) return; - const QString newSessionPath = QString("%1/%2.dat").arg(DataPaths::path(DataPaths::Sessions)).arg(newName); + const QString newSessionPath = QString("%1/%2.dat").arg(DataPaths::path(DataPaths::Sessions), newName); if (QFile::exists(newSessionPath)) { QMessageBox::information(mApp->activeWindow(), tr("Error!"), tr("The session file \"%1\" exists. Please enter another name.").arg(newName)); renameSession(sessionFilePath, flags); @@ -165,7 +165,7 @@ void SessionManager::saveSession() if (!ok) return; - const QString filePath = QString("%1/%2.dat").arg(DataPaths::path(DataPaths::Sessions)).arg(sessionName); + const QString filePath = QString("%1/%2.dat").arg(DataPaths::path(DataPaths::Sessions), sessionName); if (QFile::exists(filePath)) { QMessageBox::information(mApp->activeWindow(), tr("Error!"), tr("The session file \"%1\" exists. Please enter another name.").arg(sessionName)); saveSession(); @@ -213,7 +213,7 @@ void SessionManager::newSession() if (!ok) return; - const QString filePath = QStringLiteral("%1/%2.dat").arg(DataPaths::path(DataPaths::Sessions)).arg(sessionName); + const QString filePath = QStringLiteral("%1/%2.dat").arg(DataPaths::path(DataPaths::Sessions), sessionName); if (QFile::exists(filePath)) { QMessageBox::information(mApp->activeWindow(), tr("Error!"), tr("The session file \"%1\" exists. Please enter another name.").arg(sessionName)); newSession(); diff --git a/src/plugins/FlashCookieManager/fcm_dialog.cpp b/src/plugins/FlashCookieManager/fcm_dialog.cpp index f80367fce..ac6b6d064 100644 --- a/src/plugins/FlashCookieManager/fcm_dialog.cpp +++ b/src/plugins/FlashCookieManager/fcm_dialog.cpp @@ -169,7 +169,7 @@ void FCM_Dialog::currentItemChanged(QTreeWidgetItem* current, QTreeWidgetItem* p ui->size->setText(QString::number(flashCookie.size) + tr(" Byte")); ui->textEdit->setPlainText(flashCookie.contents); ui->server->setText(flashCookie.origin); - ui->path->setText(QString("%2").arg(QUrl::fromLocalFile(flashCookie.path).toString()).arg(QDir::toNativeSeparators(flashCookie.path))); + ui->path->setText(QString("%2").arg(QUrl::fromLocalFile(flashCookie.path).toString(), QDir::toNativeSeparators(flashCookie.path))); ui->lastModified->setText(flashCookie.lastModification.toString()); ui->removeOne->setText(tr("Remove flash cookie")); diff --git a/src/plugins/TabManager/tldextractor/tldextractor.cpp b/src/plugins/TabManager/tldextractor/tldextractor.cpp index 86af2f4cc..6305608ce 100644 --- a/src/plugins/TabManager/tldextractor/tldextractor.cpp +++ b/src/plugins/TabManager/tldextractor/tldextractor.cpp @@ -175,7 +175,7 @@ QString TLDExtractor::registrableDomainHelper(const QString &domainPart, const Q return {}; } else { - return QString("%1.%2").arg(domainPart).arg(tldPart); + return QString("%1.%2").arg(domainPart, tldPart); } } @@ -260,7 +260,7 @@ void TLDExtractor::loadData() QMessageBox::information(0, tr("File not found!"), tr("File \'effective_tld_names.dat\' was not found!\n" "You can download it from \'here\' to one of the following paths:\n%2") - .arg(tldDataFileDownloadLink).arg(m_dataSearchPaths.join("\n"))); + .arg(tldDataFileDownloadLink, m_dataSearchPaths.join("\n"))); return; } @@ -363,7 +363,7 @@ bool TLDExtractor::test() QMessageBox::information(0, tr("File not found!"), tr("File \'test_psl.txt\' was not found!\n" "You can download it from \'here\' to one of the following paths:\n%2") - .arg(testFileDownloadLink).arg(m_dataSearchPaths.join("\n"))); + .arg(testFileDownloadLink, m_dataSearchPaths.join("\n"))); return false; }