Fixed clazy warnings: empty QStringLiteral.

This commit is contained in:
Mat Sutcliffe
2018-12-17 16:40:59 +00:00
parent 268d858e2d
commit 333ea1b8df
37 changed files with 81 additions and 83 deletions

View File

@@ -324,9 +324,9 @@ namespace BlackGui
QString CCopyConfigurationComponent::getOtherVersionsSelectedDirectory() const
{
if (ui->cb_OtherVersions->count() < 1) { return QStringLiteral(""); }
if (ui->cb_OtherVersions->count() < 1) { return {}; }
const QFileInfoList dirs(CDirectoryUtils::applicationDataDirectories());
if (dirs.isEmpty()) { return QStringLiteral(""); }
if (dirs.isEmpty()) { return {}; }
const QString otherVersionDir = m_otherVersionDirs.at(ui->cb_OtherVersions->currentIndex());
QString dir;
for (const QFileInfo &info : dirs)
@@ -337,7 +337,7 @@ namespace BlackGui
break;
}
}
if (dir.isEmpty()) { return QStringLiteral(""); }
if (dir.isEmpty()) { return {}; }
dir = CFileUtils::appendFilePaths(dir, ui->rb_Cache->isChecked() ?
CDataCache::relativeFilePath() :
CSettingsCache::relativeFilePath());

View File

@@ -701,7 +701,7 @@ namespace BlackGui
{
if (ui->cb_Heavy->isChecked()) { return QStringLiteral("H"); }
else if (ui->cb_Tcas->isChecked()) { return QStringLiteral("T"); }
return QStringLiteral("");
return {};
}
CAircraftIcaoCode CFlightPlanComponent::getAircraftIcaoCode() const

View File

@@ -586,8 +586,8 @@ namespace BlackGui
{
const QString ac(
ownAircraft.getAircraftIcaoCodeDesignator() %
(ownAircraft.hasAirlineDesignator() ? (QLatin1Char(' ') % ownAircraft.getAirlineIcaoCodeDesignator()) : QStringLiteral("")) %
(ownAircraft.hasModelString() ? (QLatin1Char(' ') % ownAircraft.getModelString()) : QStringLiteral(""))
(ownAircraft.hasAirlineDesignator() ? (QLatin1Char(' ') % ownAircraft.getAirlineIcaoCodeDesignator()) : QString()) %
(ownAircraft.hasModelString() ? (QLatin1Char(' ') % ownAircraft.getModelString()) : QString())
);
ui->le_LoginSince->setText(QDateTime::currentDateTimeUtc().toString());
ui->le_LoginAsAircaft->setText(ac);

View File

@@ -539,7 +539,7 @@ namespace BlackGui
if (index < 0 || index == ui->tw_TextMessages->indexOf(ui->tb_TextMessagesAll))
{
CLogMessage(this).validationError("Incorrect message channel");
return QStringLiteral("");
return {};
}
else
{

View File

@@ -575,7 +575,7 @@ namespace BlackGui
void CDockWidget::forceStyleSheetUpdate()
{
const QString qss = this->styleSheet();
this->setStyleSheet(qss.isEmpty() ? QStringLiteral(" ") : QStringLiteral(""));
this->setStyleSheet(qss.isEmpty() ? QStringLiteral(" ") : QString());
this->setStyleSheet(qss);
}

View File

@@ -61,7 +61,7 @@ namespace BlackGui
const CUser user(
ui->le_NetworkId->text().trimmed(),
ui->le_RealName->text().trimmed().simplified(),
QStringLiteral(""),
QString(),
ui->le_Password->text().trimmed()
);
const CFsdSetup fsdSetup(ui->form_ServerFsd->getValue());

View File

@@ -617,7 +617,7 @@ namespace BlackGui
QString CGuiUtility::asSimpleHtmlImageWidth(const CIcon &icon, int width)
{
if (!icon.hasFileResourcePath()) return QStringLiteral("");
if (!icon.hasFileResourcePath()) return {};
const QString p = icon.getFileResourcePath();
static const QString htmlNoWidth("<img src=\"%1\">");
@@ -630,7 +630,7 @@ namespace BlackGui
QString CGuiUtility::asSimpleHtmlImageHeight(const CIcon &icon, int height)
{
if (height < 0) { return CGuiUtility::asSimpleHtmlImageWidth(icon); }
if (!icon.hasFileResourcePath()) return QStringLiteral("");
if (!icon.hasFileResourcePath()) return {};
const QString p = icon.getFileResourcePath();
static const QString htmlHeight("<img src=\"%1\" height=%2>");

View File

@@ -89,7 +89,7 @@ namespace BlackGui
if (column.getFormatter()->supportsRole(Qt::DecorationRole))
{
const QIcon icon = column.getFormatter()->decorationRole(v).toPixmap();
si = new QStandardItem(icon, QStringLiteral(""));
si = new QStandardItem(icon, QString());
}
else if (column.getFormatter()->supportsRole(Qt::DisplayRole))
{

View File

@@ -144,7 +144,7 @@ namespace BlackGui
const CVariant &CDefaultFormatter::emptyStringVariant()
{
static const CVariant e = CVariant::from(QStringLiteral(""));
static const CVariant e = CVariant::from(QString());
return e;
}