mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2025-12-31 20:58:07 -06:00
Rename literal operator
Qt 6.4 introduced `QString operator""_s()` and the previous `""_qs` is deprecated since Qt 6.8.
This commit is contained in:
@@ -69,14 +69,14 @@ namespace
|
||||
switch (st)
|
||||
{
|
||||
case SearchJobWidget::Status::Ongoing:
|
||||
return u"queued"_qs;
|
||||
return u"queued"_s;
|
||||
case SearchJobWidget::Status::Finished:
|
||||
return u"task-complete"_qs;
|
||||
return u"task-complete"_s;
|
||||
case SearchJobWidget::Status::Aborted:
|
||||
return u"task-reject"_qs;
|
||||
return u"task-reject"_s;
|
||||
case SearchJobWidget::Status::Error:
|
||||
case SearchJobWidget::Status::NoResults:
|
||||
return u"dialog-warning"_qs;
|
||||
return u"dialog-warning"_s;
|
||||
default:
|
||||
return {};
|
||||
}
|
||||
@@ -110,8 +110,8 @@ SearchWidget::SearchWidget(IGUIApplication *app, MainWindow *mainWindow)
|
||||
|
||||
#ifndef Q_OS_MACOS
|
||||
// Icons
|
||||
m_ui->searchButton->setIcon(UIThemeManager::instance()->getIcon(u"edit-find"_qs));
|
||||
m_ui->pluginsButton->setIcon(UIThemeManager::instance()->getIcon(u"plugins"_qs, u"preferences-system-network"_qs));
|
||||
m_ui->searchButton->setIcon(UIThemeManager::instance()->getIcon(u"edit-find"_s));
|
||||
m_ui->pluginsButton->setIcon(UIThemeManager::instance()->getIcon(u"plugins"_s, u"preferences-system-network"_s));
|
||||
#else
|
||||
// On macOS the icons overlap the text otherwise
|
||||
QSize iconSize = m_ui->tabWidget->iconSize();
|
||||
@@ -179,7 +179,7 @@ bool SearchWidget::eventFilter(QObject *object, QEvent *event)
|
||||
void SearchWidget::fillCatCombobox()
|
||||
{
|
||||
m_ui->comboCategory->clear();
|
||||
m_ui->comboCategory->addItem(SearchPluginManager::categoryFullName(u"all"_qs), u"all"_qs);
|
||||
m_ui->comboCategory->addItem(SearchPluginManager::categoryFullName(u"all"_s), u"all"_s);
|
||||
|
||||
using QStrPair = std::pair<QString, QString>;
|
||||
QVector<QStrPair> tmpList;
|
||||
@@ -200,9 +200,9 @@ void SearchWidget::fillCatCombobox()
|
||||
void SearchWidget::fillPluginComboBox()
|
||||
{
|
||||
m_ui->selectPlugin->clear();
|
||||
m_ui->selectPlugin->addItem(tr("Only enabled"), u"enabled"_qs);
|
||||
m_ui->selectPlugin->addItem(tr("All plugins"), u"all"_qs);
|
||||
m_ui->selectPlugin->addItem(tr("Select..."), u"multi"_qs);
|
||||
m_ui->selectPlugin->addItem(tr("Only enabled"), u"enabled"_s);
|
||||
m_ui->selectPlugin->addItem(tr("All plugins"), u"all"_s);
|
||||
m_ui->selectPlugin->addItem(tr("Select..."), u"multi"_s);
|
||||
|
||||
using QStrPair = std::pair<QString, QString>;
|
||||
QVector<QStrPair> tmpList;
|
||||
@@ -349,7 +349,7 @@ void SearchWidget::on_searchButton_clicked()
|
||||
m_allTabs.append(newTab);
|
||||
|
||||
QString tabName = pattern;
|
||||
tabName.replace(QRegularExpression(u"&{1}"_qs), u"&&"_qs);
|
||||
tabName.replace(QRegularExpression(u"&{1}"_s), u"&&"_s);
|
||||
m_ui->tabWidget->addTab(newTab, tabName);
|
||||
m_ui->tabWidget->setCurrentWidget(newTab);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user