mirror of
https://github.com/qbittorrent/qBittorrent
synced 2025-07-16 02:03:07 -07:00
Use QString literals
It covers src/webui and enables `QT_NO_CAST_FROM_ASCII`.
This commit is contained in:
Chocobo1
parent
f888fb4ac7
commit
efc04645b7
25 changed files with 836 additions and 824 deletions
|
|
@ -72,8 +72,8 @@ namespace
|
|||
{
|
||||
QJsonArray categoriesInfo
|
||||
{QJsonObject {
|
||||
{QLatin1String("id"), "all"},
|
||||
{QLatin1String("name"), SearchPluginManager::categoryFullName("all")}
|
||||
{QLatin1String("id"), u"all"_qs},
|
||||
{QLatin1String("name"), SearchPluginManager::categoryFullName(u"all"_qs)}
|
||||
}};
|
||||
|
||||
categories.sort(Qt::CaseInsensitive);
|
||||
|
|
@ -92,22 +92,22 @@ namespace
|
|||
|
||||
void SearchController::startAction()
|
||||
{
|
||||
requireParams({"pattern", "category", "plugins"});
|
||||
requireParams({u"pattern"_qs, u"category"_qs, u"plugins"_qs});
|
||||
|
||||
if (!Utils::ForeignApps::pythonInfo().isValid())
|
||||
throw APIError(APIErrorType::Conflict, tr("Python must be installed to use the Search Engine."));
|
||||
|
||||
const QString pattern = params()["pattern"].trimmed();
|
||||
const QString category = params()["category"].trimmed();
|
||||
const QStringList plugins = params()["plugins"].split('|');
|
||||
const QString pattern = params()[u"pattern"_qs].trimmed();
|
||||
const QString category = params()[u"category"_qs].trimmed();
|
||||
const QStringList plugins = params()[u"plugins"_qs].split(u'|');
|
||||
|
||||
QStringList pluginsToUse;
|
||||
if (plugins.size() == 1)
|
||||
{
|
||||
const QString pluginsLower = plugins[0].toLower();
|
||||
if (pluginsLower == "all")
|
||||
if (pluginsLower == u"all")
|
||||
pluginsToUse = SearchPluginManager::instance()->allPlugins();
|
||||
else if ((pluginsLower == "enabled") || (pluginsLower == "multi"))
|
||||
else if ((pluginsLower == u"enabled") || (pluginsLower == u"multi"))
|
||||
pluginsToUse = SearchPluginManager::instance()->enabledPlugins();
|
||||
else
|
||||
pluginsToUse << plugins;
|
||||
|
|
@ -134,15 +134,15 @@ void SearchController::startAction()
|
|||
activeSearches.insert(id);
|
||||
session->setData(ACTIVE_SEARCHES, QVariant::fromValue(activeSearches));
|
||||
|
||||
const QJsonObject result = {{"id", id}};
|
||||
const QJsonObject result = {{u"id"_qs, id}};
|
||||
setResult(result);
|
||||
}
|
||||
|
||||
void SearchController::stopAction()
|
||||
{
|
||||
requireParams({"id"});
|
||||
requireParams({u"id"_qs});
|
||||
|
||||
const int id = params()["id"].toInt();
|
||||
const int id = params()[u"id"_qs].toInt();
|
||||
ISession *const session = sessionManager()->session();
|
||||
|
||||
const auto searchHandlers = session->getData<SearchHandlerDict>(SEARCH_HANDLERS);
|
||||
|
|
@ -160,7 +160,7 @@ void SearchController::stopAction()
|
|||
|
||||
void SearchController::statusAction()
|
||||
{
|
||||
const int id = params()["id"].toInt();
|
||||
const int id = params()[u"id"_qs].toInt();
|
||||
|
||||
const auto searchHandlers = sessionManager()->session()->getData<SearchHandlerDict>(SEARCH_HANDLERS);
|
||||
if ((id != 0) && !searchHandlers.contains(id))
|
||||
|
|
@ -174,9 +174,9 @@ void SearchController::statusAction()
|
|||
const SearchHandlerPtr searchHandler = searchHandlers[searchId];
|
||||
statusArray << QJsonObject
|
||||
{
|
||||
{"id", searchId},
|
||||
{"status", searchHandler->isActive() ? "Running" : "Stopped"},
|
||||
{"total", searchHandler->results().size()}
|
||||
{u"id"_qs, searchId},
|
||||
{u"status"_qs, searchHandler->isActive() ? u"Running"_qs : u"Stopped"_qs},
|
||||
{u"total"_qs, searchHandler->results().size()}
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -185,11 +185,11 @@ void SearchController::statusAction()
|
|||
|
||||
void SearchController::resultsAction()
|
||||
{
|
||||
requireParams({"id"});
|
||||
requireParams({u"id"_qs});
|
||||
|
||||
const int id = params()["id"].toInt();
|
||||
int limit = params()["limit"].toInt();
|
||||
int offset = params()["offset"].toInt();
|
||||
const int id = params()[u"id"_qs].toInt();
|
||||
int limit = params()[u"limit"_qs].toInt();
|
||||
int offset = params()[u"offset"_qs].toInt();
|
||||
|
||||
const auto searchHandlers = sessionManager()->session()->getData<SearchHandlerDict>(SEARCH_HANDLERS);
|
||||
if (!searchHandlers.contains(id))
|
||||
|
|
@ -218,9 +218,9 @@ void SearchController::resultsAction()
|
|||
|
||||
void SearchController::deleteAction()
|
||||
{
|
||||
requireParams({"id"});
|
||||
requireParams({u"id"_qs});
|
||||
|
||||
const int id = params()["id"].toInt();
|
||||
const int id = params()[u"id"_qs].toInt();
|
||||
ISession *const session = sessionManager()->session();
|
||||
|
||||
auto searchHandlers = session->getData<SearchHandlerDict>(SEARCH_HANDLERS);
|
||||
|
|
@ -243,28 +243,28 @@ void SearchController::pluginsAction()
|
|||
|
||||
void SearchController::installPluginAction()
|
||||
{
|
||||
requireParams({"sources"});
|
||||
requireParams({u"sources"_qs});
|
||||
|
||||
const QStringList sources = params()["sources"].split('|');
|
||||
const QStringList sources = params()[u"sources"_qs].split(u'|');
|
||||
for (const QString &source : sources)
|
||||
SearchPluginManager::instance()->installPlugin(source);
|
||||
}
|
||||
|
||||
void SearchController::uninstallPluginAction()
|
||||
{
|
||||
requireParams({"names"});
|
||||
requireParams({u"names"_qs});
|
||||
|
||||
const QStringList names = params()["names"].split('|');
|
||||
const QStringList names = params()[u"names"_qs].split(u'|');
|
||||
for (const QString &name : names)
|
||||
SearchPluginManager::instance()->uninstallPlugin(name.trimmed());
|
||||
}
|
||||
|
||||
void SearchController::enablePluginAction()
|
||||
{
|
||||
requireParams({"names", "enable"});
|
||||
requireParams({u"names"_qs, u"enable"_qs});
|
||||
|
||||
const QStringList names = params()["names"].split('|');
|
||||
const bool enable = Utils::String::parseBool(params()["enable"].trimmed()).value_or(false);
|
||||
const QStringList names = params()[u"names"_qs].split(u'|');
|
||||
const bool enable = Utils::String::parseBool(params()[u"enable"_qs].trimmed()).value_or(false);
|
||||
|
||||
for (const QString &name : names)
|
||||
SearchPluginManager::instance()->enablePlugin(name.trimmed(), enable);
|
||||
|
|
@ -344,21 +344,21 @@ QJsonObject SearchController::getResults(const QList<SearchResult> &searchResult
|
|||
{
|
||||
searchResultsArray << QJsonObject
|
||||
{
|
||||
{"fileName", searchResult.fileName},
|
||||
{"fileUrl", searchResult.fileUrl},
|
||||
{"fileSize", searchResult.fileSize},
|
||||
{"nbSeeders", searchResult.nbSeeders},
|
||||
{"nbLeechers", searchResult.nbLeechers},
|
||||
{"siteUrl", searchResult.siteUrl},
|
||||
{"descrLink", searchResult.descrLink}
|
||||
{u"fileName"_qs, searchResult.fileName},
|
||||
{u"fileUrl"_qs, searchResult.fileUrl},
|
||||
{u"fileSize"_qs, searchResult.fileSize},
|
||||
{u"nbSeeders"_qs, searchResult.nbSeeders},
|
||||
{u"nbLeechers"_qs, searchResult.nbLeechers},
|
||||
{u"siteUrl"_qs, searchResult.siteUrl},
|
||||
{u"descrLink"_qs, searchResult.descrLink}
|
||||
};
|
||||
}
|
||||
|
||||
const QJsonObject result =
|
||||
{
|
||||
{"status", isSearchActive ? "Running" : "Stopped"},
|
||||
{"results", searchResultsArray},
|
||||
{"total", totalResults}
|
||||
{u"status"_qs, isSearchActive ? u"Running"_qs : u"Stopped"_qs},
|
||||
{u"results"_qs, searchResultsArray},
|
||||
{u"total"_qs, totalResults}
|
||||
};
|
||||
|
||||
return result;
|
||||
|
|
@ -387,12 +387,12 @@ QJsonArray SearchController::getPluginsInfo(const QStringList &plugins) const
|
|||
|
||||
pluginsArray << QJsonObject
|
||||
{
|
||||
{"name", pluginInfo->name},
|
||||
{"version", QString(pluginInfo->version)},
|
||||
{"fullName", pluginInfo->fullName},
|
||||
{"url", pluginInfo->url},
|
||||
{"supportedCategories", getPluginCategories(pluginInfo->supportedCategories)},
|
||||
{"enabled", pluginInfo->enabled}
|
||||
{u"name"_qs, pluginInfo->name},
|
||||
{u"version"_qs, QString(pluginInfo->version)},
|
||||
{u"fullName"_qs, pluginInfo->fullName},
|
||||
{u"url"_qs, pluginInfo->url},
|
||||
{u"supportedCategories"_qs, getPluginCategories(pluginInfo->supportedCategories)},
|
||||
{u"enabled"_qs, pluginInfo->enabled}
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue