mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 18:56:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Make use of QStringLiteral

Browse source 
Only changed instances that are initialized at program start.
This commit is contained in:
Chocobo1 2018-05-17 09:50:58 +08:00
parent fcbcf4039b
commit ceaf755ac6
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
9 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/app/application.cpp
View file

@ -93,7 +93,7 @@ namespace
#define SETTINGS_KEY(name) "Application/" name
// FileLogger properties keys
#define FILELOGGER_SETTINGS_KEY(name) SETTINGS_KEY("FileLogger/") name
#define FILELOGGER_SETTINGS_KEY(name) QStringLiteral(SETTINGS_KEY("FileLogger/") name)
const QString KEY_FILELOGGER_ENABLED = FILELOGGER_SETTINGS_KEY("Enabled");
const QString KEY_FILELOGGER_PATH = FILELOGGER_SETTINGS_KEY("Path");
const QString KEY_FILELOGGER_BACKUP = FILELOGGER_SETTINGS_KEY("Backup");

2
src/base/bittorrent/torrenthandle.cpp
View file

@ -65,7 +65,7 @@
#include "session.h"
#include "trackerentry.h"
const QString QB_EXT {".!qB"};
const QString QB_EXT {QStringLiteral(".!qB")};
namespace libt = libtorrent;
using namespace BitTorrent;

2
src/base/net/portforwarder.cpp
View file

@ -36,7 +36,7 @@
#include "base/logger.h"
#include "base/settingsstorage.h"
static const QString KEY_ENABLED = QLatin1String("Network/PortForwardingEnabled");
static const QString KEY_ENABLED = QStringLiteral("Network/PortForwardingEnabled");
namespace libt = libtorrent;
using namespace Net;

2
src/base/net/proxyconfigurationmanager.cpp
View file

@ -30,7 +30,7 @@
#include "base/settingsstorage.h"
#define SETTINGS_KEY(name) "Network/Proxy/" name
#define SETTINGS_KEY(name) QStringLiteral("Network/Proxy/" name)
const QString KEY_ONLY_FOR_TORRENTS = SETTINGS_KEY("OnlyForTorrents");
const QString KEY_TYPE = SETTINGS_KEY("Type");
const QString KEY_IP = SETTINGS_KEY("IP");

6
src/gui/addnewtorrentdialog.cpp
View file

@ -61,7 +61,7 @@
namespace
{
#define SETTINGS_KEY(name) "AddNewTorrentDialog/" name
#define SETTINGS_KEY(name) QStringLiteral("AddNewTorrentDialog/" name)
const QString KEY_ENABLED = SETTINGS_KEY("Enabled");
const QString KEY_DEFAULTCATEGORY = SETTINGS_KEY("DefaultCategory");
const QString KEY_TREEHEADERSTATE = SETTINGS_KEY("TreeHeaderState");
@ -69,7 +69,7 @@ namespace
const QString KEY_EXPANDED = SETTINGS_KEY("Expanded");
const QString KEY_TOPLEVEL = SETTINGS_KEY("TopLevel");
const QString KEY_SAVEPATHHISTORY = SETTINGS_KEY("SavePathHistory");
const char KEY_SAVEPATHHISTORYLENGTH[] = SETTINGS_KEY("SavePathHistoryLength");
const QString KEY_SAVEPATHHISTORYLENGTH = SETTINGS_KEY("SavePathHistoryLength");
const QString KEY_REMEMBERLASTSAVEPATH = SETTINGS_KEY("RememberLastSavePath");
// just a shortcut
@ -204,7 +204,7 @@ void AddNewTorrentDialog::setSavePathHistoryLength(int value)
CachedSettingValue<int> &AddNewTorrentDialog::savePathHistoryLengthSetting()
{
const int defaultHistoryLength = 8;
static CachedSettingValue<int> setting(KEY_SAVEPATHHISTORYLENGTH, defaultHistoryLength,
static CachedSettingValue<int> setting(KEY_SAVEPATHHISTORYLENGTH.toUtf8().constData(), defaultHistoryLength,
[](int v)
{
return std::max(minPathHistoryLength, std::min(maxPathHistoryLength, v));

2
src/gui/cookiesdialog.cpp
View file

@ -37,7 +37,7 @@
#include "ui_cookiesdialog.h"
#include "utils.h"
#define SETTINGS_KEY(name) "CookiesDialog/" name
#define SETTINGS_KEY(name) QStringLiteral("CookiesDialog/" name)
const QString KEY_SIZE = SETTINGS_KEY("Size");
const QString KEY_COOKIESVIEWSTATE = SETTINGS_KEY("CookiesViewState");

4
src/gui/mainwindow.cpp
View file

@ -121,12 +121,12 @@ namespace
#define SETTINGS_KEY(name) "GUI/" name
// ExecutionLog properties keys
#define EXECUTIONLOG_SETTINGS_KEY(name) SETTINGS_KEY("Log/") name
#define EXECUTIONLOG_SETTINGS_KEY(name) QStringLiteral(SETTINGS_KEY("Log/") name)
const QString KEY_EXECUTIONLOG_ENABLED = EXECUTIONLOG_SETTINGS_KEY("Enabled");
const QString KEY_EXECUTIONLOG_TYPES = EXECUTIONLOG_SETTINGS_KEY("Types");
// Notifications properties keys
#define NOTIFICATIONS_SETTINGS_KEY(name) SETTINGS_KEY("Notifications/") name
#define NOTIFICATIONS_SETTINGS_KEY(name) QStringLiteral(SETTINGS_KEY("Notifications/") name)
const QString KEY_NOTIFICATIONS_ENABLED = NOTIFICATIONS_SETTINGS_KEY("Enabled");
const QString KEY_NOTIFICATIONS_TORRENTADDED = NOTIFICATIONS_SETTINGS_KEY("TorrentAdded");

8
src/gui/programupdater.cpp
View file

@ -41,14 +41,14 @@
namespace
{
const QString RSS_URL("https://www.fosshub.com/software/feedqBittorent");
const QString RSS_URL {QStringLiteral("https://www.fosshub.com/software/feedqBittorent")};
#ifdef Q_OS_MAC
const QString OS_TYPE("Mac OS X");
const QString OS_TYPE {QStringLiteral("Mac OS X")};
#elif defined(Q_OS_WIN) && (defined(__x86_64__) || defined(_M_X64))
const QString OS_TYPE("Windows x64");
const QString OS_TYPE {QStringLiteral("Windows x64")};
#else
const QString OS_TYPE("Windows");
const QString OS_TYPE {QStringLiteral("Windows")};
#endif
QString getStringValue(QXmlStreamReader &xml);

12
src/webui/webapplication.cpp
View file

@ -68,12 +68,12 @@
constexpr int MAX_ALLOWED_FILESIZE = 10 * 1024 * 1024;
const QString PATH_PREFIX_IMAGES {"/images/"};
const QString PATH_PREFIX_THEME {"/theme/"};
const QString WWW_FOLDER {":/www"};
const QString PUBLIC_FOLDER {"/public"};
const QString PRIVATE_FOLDER {"/private"};
const QString MAX_AGE_MONTH {"public, max-age=2592000"};
const QString PATH_PREFIX_IMAGES {QStringLiteral("/images/")};
const QString PATH_PREFIX_THEME {QStringLiteral("/theme/")};
const QString WWW_FOLDER {QStringLiteral(":/www")};
const QString PUBLIC_FOLDER {QStringLiteral("/public")};
const QString PRIVATE_FOLDER {QStringLiteral("/private")};
const QString MAX_AGE_MONTH {QStringLiteral("public, max-age=2592000")};
namespace
{