diff --git a/src/app/cmdoptions.cpp b/src/app/cmdoptions.cpp index c855f6e53..0024b95d6 100644 --- a/src/app/cmdoptions.cpp +++ b/src/app/cmdoptions.cpp @@ -83,7 +83,7 @@ namespace QString envVarName() const { return QLatin1String("QBT_") - + QString(QLatin1String(m_name)).toUpper().replace(QLatin1Char('-'), QLatin1Char('_')); + + QString::fromLatin1(m_name).toUpper().replace(QLatin1Char('-'), QLatin1Char('_')); } public: diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp index c3f4015c9..d850ea397 100644 --- a/src/base/utils/misc.cpp +++ b/src/base/utils/misc.cpp @@ -43,8 +43,9 @@ #endif #include -#include #include +#include +#include #include #include @@ -445,29 +446,37 @@ QString Utils::Misc::boostVersionString() { // static initialization for usage in signal handler static const QString ver = QString("%1.%2.%3") - .arg(BOOST_VERSION / 100000) - .arg((BOOST_VERSION / 100) % 1000) - .arg(BOOST_VERSION % 100); + .arg(QString::number(BOOST_VERSION / 100000) + , QString::number((BOOST_VERSION / 100) % 1000) + , QString::number(BOOST_VERSION % 100)); return ver; } QString Utils::Misc::libtorrentVersionString() { // static initialization for usage in signal handler - static const QString ver = LIBTORRENT_VERSION; - return ver; +#if (LIBTORRENT_VERSION_NUM < 10200) + static const auto version {QString::fromLatin1(libtorrent::version())}; +#else + static const auto version {QString::fromLatin1(lt::version())}; +#endif + return version; } QString Utils::Misc::opensslVersionString() { - const QString version {OPENSSL_VERSION_TEXT}; +#if (OPENSSL_VERSION_NUMBER >= 0x1010000f) + static const auto version {QString::fromLatin1(OpenSSL_version(OPENSSL_VERSION))}; +#else + static const auto version {QString::fromLatin1(SSLeay_version(SSLEAY_VERSION))}; +#endif return version.splitRef(' ', QString::SkipEmptyParts)[1].toString(); } QString Utils::Misc::zlibVersionString() { // static initialization for usage in signal handler - static const QString version {ZLIB_VERSION}; + static const auto version {QString::fromLatin1(zlibVersion())}; return version; } diff --git a/src/gui/executionlogwidget.cpp b/src/gui/executionlogwidget.cpp index 12a0d5a65..64f893859 100644 --- a/src/gui/executionlogwidget.cpp +++ b/src/gui/executionlogwidget.cpp @@ -88,7 +88,7 @@ void ExecutionLogWidget::addLogMessage(const Log::Msg &msg) } const QDateTime time = QDateTime::fromMSecsSinceEpoch(msg.timestamp); - const QString text = QString(QLatin1String("%1 - %3")) + const QString text = QString::fromLatin1("%1 - %3") .arg(time.toString(Qt::SystemLocaleShortDate), colorName, msg.message); m_msgList->appendLine(text, msg.type); } @@ -96,7 +96,7 @@ void ExecutionLogWidget::addLogMessage(const Log::Msg &msg) void ExecutionLogWidget::addPeerMessage(const Log::Peer &peer) { const QDateTime time = QDateTime::fromMSecsSinceEpoch(peer.timestamp); - const QString msg = QString(QLatin1String("%1 - %2")) + const QString msg = QString::fromLatin1("%1 - %2") .arg(time.toString(Qt::SystemLocaleShortDate), peer.ip); const QString text = peer.blocked diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index ddb3e6829..ecf940034 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -1525,7 +1525,7 @@ void MainWindow::reloadSessionStats() #else if (m_systrayIcon) { #ifdef Q_OS_UNIX - const QString toolTip = QString(QLatin1String( + const QString toolTip = QString::fromLatin1( "
" "qBittorrent" "
" @@ -1534,7 +1534,7 @@ void MainWindow::reloadSessionStats() "" "
" " %2" - "
")) + "") .arg(tr("DL speed: %1", "e.g: Download speed: 10 KiB/s").arg(Utils::Misc::friendlyUnit(status.payloadDownloadRate, true)) , tr("UP speed: %1", "e.g: Upload speed: 10 KiB/s").arg(Utils::Misc::friendlyUnit(status.payloadUploadRate, true))); #else diff --git a/src/gui/statusbar.cpp b/src/gui/statusbar.cpp index d2b9c82eb..3f5ec8800 100644 --- a/src/gui/statusbar.cpp +++ b/src/gui/statusbar.cpp @@ -64,7 +64,7 @@ StatusBar::StatusBar(QWidget *parent) m_connecStatusLblIcon->setCursor(Qt::PointingHandCursor); m_connecStatusLblIcon->setIcon(QIcon(":/icons/skin/firewalled.svg")); m_connecStatusLblIcon->setToolTip( - QString(QLatin1String("%1
%2")).arg(tr("Connection status:") + QString::fromLatin1("%1
%2").arg(tr("Connection status:") , tr("No direct connections. This may indicate network configuration problems."))); connect(m_connecStatusLblIcon, &QAbstractButton::clicked, this, &StatusBar::connectionButtonClicked); diff --git a/src/gui/tagfiltermodel.cpp b/src/gui/tagfiltermodel.cpp index 08f20a9c7..f82e8d3ae 100644 --- a/src/gui/tagfiltermodel.cpp +++ b/src/gui/tagfiltermodel.cpp @@ -124,7 +124,7 @@ QVariant TagFilterModel::data(const QModelIndex &index, int role) const case Qt::DecorationRole: return UIThemeManager::instance()->getIcon("inode-directory"); case Qt::DisplayRole: - return QString(QLatin1String("%1 (%2)")) + return QString::fromLatin1("%1 (%2)") .arg(tagDisplayName(item.tag())).arg(item.torrentsCount()); case Qt::UserRole: return item.torrentsCount(); diff --git a/src/gui/transferlistmodel.cpp b/src/gui/transferlistmodel.cpp index b2a13668a..20fa61dd6 100644 --- a/src/gui/transferlistmodel.cpp +++ b/src/gui/transferlistmodel.cpp @@ -292,7 +292,7 @@ QString TransferListModel::displayValue(const BitTorrent::TorrentHandle *torrent { progress *= 100; return (static_cast(progress) == 100) - ? QString {QLatin1String {"100%"}} + ? QString::fromLatin1("100%") : Utils::String::fromDouble(progress, 1) + '%'; }; diff --git a/src/webui/webapplication.h b/src/webui/webapplication.h index 7bdf14f47..054c6efe6 100644 --- a/src/webui/webapplication.h +++ b/src/webui/webapplication.h @@ -126,7 +126,7 @@ private: QHash m_params; const QString m_cacheID; - const QRegularExpression m_apiPathPattern {(QLatin1String("^/api/v2/(?[A-Za-z_][A-Za-z_0-9]*)/(?[A-Za-z_][A-Za-z_0-9]*)$"))}; + const QRegularExpression m_apiPathPattern {QLatin1String("^/api/v2/(?[A-Za-z_][A-Za-z_0-9]*)/(?[A-Za-z_][A-Za-z_0-9]*)$")}; QHash m_apiControllers; QSet m_publicAPIs;