d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-03 02:14:16 +00:00
Code Issues Projects Releases Wiki Activity

Remove superfluous QString::fromUtf8()

Browse Source
This commit is contained in:
Chocobo1 2017-11-21 16:07:48 +08:00
parent 4927d26877
commit 27090f0cfb
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/application.cpp
View File

@ -600,15 +600,15 @@ void Application::initializeTranslation()
// Load translation // Load translation
QString localeStr = pref->getLocale(); QString localeStr = pref->getLocale();
if (m_qtTranslator.load(QString::fromUtf8("qtbase_") + localeStr, QLibraryInfo::location(QLibraryInfo::TranslationsPath)) || if (m_qtTranslator.load(QLatin1String("qtbase_") + localeStr, QLibraryInfo::location(QLibraryInfo::TranslationsPath)) ||
m_qtTranslator.load(QString::fromUtf8("qt_") + localeStr, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) m_qtTranslator.load(QLatin1String("qt_") + localeStr, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
qDebug("Qt %s locale recognized, using translation.", qUtf8Printable(localeStr)); qDebug("Qt %s locale recognized, using translation.", qUtf8Printable(localeStr));
else else
qDebug("Qt %s locale unrecognized, using default (en).", qUtf8Printable(localeStr)); qDebug("Qt %s locale unrecognized, using default (en).", qUtf8Printable(localeStr));
installTranslator(&m_qtTranslator); installTranslator(&m_qtTranslator);
if (m_translator.load(QString::fromUtf8(":/lang/qbittorrent_") + localeStr)) if (m_translator.load(QLatin1String(":/lang/qbittorrent_") + localeStr))
qDebug("%s locale recognized, using translation.", qUtf8Printable(localeStr)); qDebug("%s locale recognized, using translation.", qUtf8Printable(localeStr));
else else
qDebug("%s locale unrecognized, using default (en).", qUtf8Printable(localeStr)); qDebug("%s locale unrecognized, using default (en).", qUtf8Printable(localeStr));

4
src/gui/downloadfromurldlg.h
View File

@ -60,7 +60,7 @@ class downloadFromURL : public QDialog, private Ui::downloadFromURL
// Paste clipboard if there is an URL in it // Paste clipboard if there is an URL in it
QString clip_txt = qApp->clipboard()->text(); QString clip_txt = qApp->clipboard()->text();
QStringList clip_txt_list = clip_txt.split(QString::fromUtf8("\n")); QStringList clip_txt_list = clip_txt.split(QLatin1Char('\n'));
clip_txt.clear(); clip_txt.clear();
QStringList clip_txt_list_cleaned; QStringList clip_txt_list_cleaned;
foreach (clip_txt, clip_txt_list) { foreach (clip_txt, clip_txt_list) {
@ -94,7 +94,7 @@ class downloadFromURL : public QDialog, private Ui::downloadFromURL
void downloadButtonClicked() void downloadButtonClicked()
{ {
QString urls = textUrls->toPlainText(); QString urls = textUrls->toPlainText();
QStringList url_list = urls.split(QString::fromUtf8("\n")); QStringList url_list = urls.split(QLatin1Char('\n'));
QString url; QString url;
QStringList url_list_cleaned; QStringList url_list_cleaned;
foreach (url, url_list) { foreach (url, url_list) {

4
src/gui/optionsdlg.cpp
View File

@ -259,7 +259,7 @@ OptionsDialog::OptionsDialog(QWidget *parent)
connect(m_ui->autoRunBox, &QGroupBox::toggled, this, &ThisType::enableApplyButton); connect(m_ui->autoRunBox, &QGroupBox::toggled, this, &ThisType::enableApplyButton);
connect(m_ui->autoRun_txt, &FileSystemPathEdit::selectedPathChanged, this, &ThisType::enableApplyButton); connect(m_ui->autoRun_txt, &FileSystemPathEdit::selectedPathChanged, this, &ThisType::enableApplyButton);
const QString autoRunStr = QString::fromUtf8("%1\n %2\n %3\n %4\n %5\n %6\n %7\n %8\n %9\n %10\n%11") const QString autoRunStr = QString("%1\n %2\n %3\n %4\n %5\n %6\n %7\n %8\n %9\n %10\n%11")
.arg(tr("Supported parameters (case sensitive):")) .arg(tr("Supported parameters (case sensitive):"))
.arg(tr("%N: Torrent name")) .arg(tr("%N: Torrent name"))
.arg(tr("%L: Category")) .arg(tr("%L: Category"))
@ -489,7 +489,7 @@ void OptionsDialog::saveOptions()
QString locale = getLocale(); QString locale = getLocale();
if (pref->getLocale() != locale) { if (pref->getLocale() != locale) {
QTranslator *translator = new QTranslator; QTranslator *translator = new QTranslator;
if (translator->load(QString::fromUtf8(":/lang/qbittorrent_") + locale)) if (translator->load(QLatin1String(":/lang/qbittorrent_") + locale))
qDebug("%s locale recognized, using translation.", qUtf8Printable(locale)); qDebug("%s locale recognized, using translation.", qUtf8Printable(locale));
else else
qDebug("%s locale unrecognized, using default (en).", qUtf8Printable(locale)); qDebug("%s locale unrecognized, using default (en).", qUtf8Printable(locale));

2
src/gui/properties/propertieswidget.cpp
View File

@ -799,7 +799,7 @@ void PropertiesWidget::askWebSeed()
// Ask user for a new url seed // Ask user for a new url seed
const QString url_seed = AutoExpandableDialog::getText(this, tr("New URL seed", "New HTTP source"), const QString url_seed = AutoExpandableDialog::getText(this, tr("New URL seed", "New HTTP source"),
tr("New URL seed:"), QLineEdit::Normal, tr("New URL seed:"), QLineEdit::Normal,
QString::fromUtf8("http://www."), &ok); QLatin1String("http://www."), &ok);
if (!ok) return; if (!ok) return;
qDebug("Adding %s web seed", qUtf8Printable(url_seed)); qDebug("Adding %s web seed", qUtf8Printable(url_seed));
if (!m_ui->listWebSeeds->findItems(url_seed, Qt::MatchFixedString).empty()) { if (!m_ui->listWebSeeds->findItems(url_seed, Qt::MatchFixedString).empty()) {

4
src/gui/speedlimitdlg.cpp
View File

@ -74,7 +74,7 @@ void SpeedLimitDialog::updateSpinValue(int val) const
if (val <= 0) { if (val <= 0) {
m_ui->spinBandwidth->setValue(0); m_ui->spinBandwidth->setValue(0);
m_ui->spinBandwidth->setSpecialValueText(QString::fromUtf8(C_INFINITY)); m_ui->spinBandwidth->setSpecialValueText(QString::fromUtf8(C_INFINITY));
m_ui->spinBandwidth->setSuffix(QString::fromUtf8("")); m_ui->spinBandwidth->setSuffix("");
} }
else { else {
m_ui->spinBandwidth->setValue(val); m_ui->spinBandwidth->setValue(val);
@ -87,7 +87,7 @@ void SpeedLimitDialog::updateSliderValue(int val) const
if (val <= 0) { if (val <= 0) {
m_ui->spinBandwidth->setValue(0); m_ui->spinBandwidth->setValue(0);
m_ui->spinBandwidth->setSpecialValueText(QString::fromUtf8(C_INFINITY)); m_ui->spinBandwidth->setSpecialValueText(QString::fromUtf8(C_INFINITY));
m_ui->spinBandwidth->setSuffix(QString::fromUtf8("")); m_ui->spinBandwidth->setSuffix("");
} }
if (val > m_ui->bandwidthSlider->maximum()) if (val > m_ui->bandwidthSlider->maximum())
m_ui->bandwidthSlider->setMaximum(val); m_ui->bandwidthSlider->setMaximum(val);

2
src/gui/trackerlogin.cpp
View File

@ -43,7 +43,7 @@ trackerLogin::trackerLogin(QWidget *parent, BitTorrent::TorrentHandle *const tor
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Log in")); buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Log in"));
login_logo->setPixmap(QPixmap(QString::fromUtf8(":/icons/qbt-theme/encrypted.png"))); login_logo->setPixmap(QPixmap(QLatin1String(":/icons/qbt-theme/encrypted.png")));
tracker_url->setText(torrent->currentTracker()); tracker_url->setText(torrent->currentTracker());

2
src/gui/transferlistwidget.cpp
View File

@ -844,7 +844,7 @@ void TransferListWidget::displayListMenu(const QPoint&)
connect(&actionDelete, SIGNAL(triggered()), this, SLOT(softDeleteSelectedTorrents())); connect(&actionDelete, SIGNAL(triggered()), this, SLOT(softDeleteSelectedTorrents()));
QAction actionPreview_file(GuiIconProvider::instance()->getIcon("view-preview"), tr("Preview file..."), 0); QAction actionPreview_file(GuiIconProvider::instance()->getIcon("view-preview"), tr("Preview file..."), 0);
connect(&actionPreview_file, SIGNAL(triggered()), this, SLOT(previewSelectedTorrents())); connect(&actionPreview_file, SIGNAL(triggered()), this, SLOT(previewSelectedTorrents()));
QAction actionSet_max_ratio(QIcon(QString::fromUtf8(":/icons/skin/ratio.png")), tr("Limit share ratio..."), 0); QAction actionSet_max_ratio(QIcon(QLatin1String(":/icons/skin/ratio.png")), tr("Limit share ratio..."), 0);
connect(&actionSet_max_ratio, SIGNAL(triggered()), this, SLOT(setMaxRatioSelectedTorrents())); connect(&actionSet_max_ratio, SIGNAL(triggered()), this, SLOT(setMaxRatioSelectedTorrents()));
QAction actionSet_upload_limit(GuiIconProvider::instance()->getIcon("kt-set-max-upload-speed"), tr("Limit upload rate..."), 0); QAction actionSet_upload_limit(GuiIconProvider::instance()->getIcon("kt-set-max-upload-speed"), tr("Limit upload rate..."), 0);
connect(&actionSet_upload_limit, SIGNAL(triggered()), this, SLOT(setUpLimitSelectedTorrents())); connect(&actionSet_upload_limit, SIGNAL(triggered()), this, SLOT(setUpLimitSelectedTorrents()));

2
src/webui/prefjson.cpp
View File

@ -394,7 +394,7 @@ void prefjson::setPreferences(const QString& json)
QString locale = m["locale"].toString(); QString locale = m["locale"].toString();
if (pref->getLocale() != locale) { if (pref->getLocale() != locale) {
QTranslator *translator = new QTranslator; QTranslator *translator = new QTranslator;
if (translator->load(QString::fromUtf8(":/lang/qbittorrent_") + locale)) { if (translator->load(QLatin1String(":/lang/qbittorrent_") + locale)) {
qDebug("%s locale recognized, using translation.", qUtf8Printable(locale)); qDebug("%s locale recognized, using translation.", qUtf8Printable(locale));
}else{ }else{
qDebug("%s locale unrecognized, using default (en).", qUtf8Printable(locale)); qDebug("%s locale unrecognized, using default (en).", qUtf8Printable(locale));