Skip to content

Commit

Permalink
Replace fromLatin1() with QStringLiteral, where applicable (part 2)
Browse files Browse the repository at this point in the history
  • Loading branch information
@till213
till213 committed May 6, 2024
1 parent 025e963 commit 8bf4720
Show file tree
Hide file tree
Showing 11 changed files with 52 additions and 57 deletions.
9 changes: 4 additions & 5 deletions src/PluginManager/src/ModuleManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,13 +233,12 @@ void ModuleManager::initModule(const QString &fileName, std::unordered_map<QUuid
d->pluginLoader->setFileName(pluginPath);
const QJsonObject metaData = d->pluginLoader->metaData();
if (!metaData.isEmpty()) {
const QJsonObject pluginMetadata{metaData.value(QStringLiteral("MetaData")).toObject()};
const QUuid uuid{pluginMetadata.value(QString::fromLatin1(::PluginUuidKey)).toString()};
const QString name{pluginMetadata.value(QString::fromLatin1(::PluginNameKey)).toString()};
const QJsonObject pluginMetadata {metaData.value(QStringLiteral("MetaData")).toObject()};
const QUuid uuid {pluginMetadata.value(QString::fromLatin1(::PluginUuidKey)).toString()};
const QString name {pluginMetadata.value(QString::fromLatin1(::PluginNameKey)).toString()};
moduleInfos[uuid] = std::make_pair(name, pluginPath);

const QJsonArray afterArray = pluginMetadata.value(QString::fromLatin1(::PluginAfter))
.toArray();
const QJsonArray afterArray = pluginMetadata.value(QString::fromLatin1(::PluginAfter)).toArray();
std::shared_ptr<Vertex> vertex ;
const auto it = graph.find(uuid);
// Vertex already in graph?
Expand Down
9 changes: 3 additions & 6 deletions src/PluginManager/src/PluginManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,9 @@ std::vector<PluginManager::Handle> PluginManager::enumeratePlugins(const QString

const QJsonObject metaData = loader.metaData();
if (!metaData.isEmpty()) {
const QJsonObject pluginMetadata{
metaData.value(QString::fromLatin1("MetaData")).toObject()};
const QUuid uuid{
pluginMetadata.value(QString::fromLatin1(::PluginUuidKey)).toString()};
const QString pluginName{
pluginMetadata.value(QString::fromLatin1(::PluginNameKey)).toString()};
const QJsonObject pluginMetadata {metaData.value (QStringLiteral("MetaData")).toObject()};
const QUuid uuid {pluginMetadata.value(QString::fromLatin1(::PluginUuidKey)).toString()};
const QString pluginName {pluginMetadata.value(QString::fromLatin1(::PluginNameKey)).toString()};
const Handle handle {uuid, pluginName};
pluginHandles.push_back(handle);
pluginRegistry[uuid] = pluginPath;
Expand Down
8 changes: 4 additions & 4 deletions src/PluginManager/src/SkyConnectManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,10 +510,10 @@ void SkyConnectManager::initialisePluginRegistry(const QString &pluginDirectoryN

const QJsonObject metaData = loader.metaData();
if (!metaData.isEmpty()) {
const QJsonObject pluginMetadata{metaData.value(QStringLiteral("MetaData")).toObject()};
const QUuid uuid{pluginMetadata.value(QString::fromLatin1(PluginUuidKey)).toString()};
const QString pluginName{pluginMetadata.value(QString::fromLatin1(PluginNameKey)).toString()};
const QString flightSimulatorName{pluginMetadata.value(QString::fromLatin1(PluginFlightSimulatorNameKey)).toString()};
const QJsonObject pluginMetadata {metaData.value(QStringLiteral("MetaData")).toObject()};
const QUuid uuid {pluginMetadata.value(QString::fromLatin1(PluginUuidKey)).toString()};
const QString pluginName {pluginMetadata.value(QString::fromLatin1(PluginNameKey)).toString()};
const QString flightSimulatorName {pluginMetadata.value(QString::fromLatin1(PluginFlightSimulatorNameKey)).toString()};
const FlightSimulator::Id flightSimulatorId {FlightSimulator::nameToId(flightSimulatorName)};
SkyConnectPlugin plugin {pluginName, flightSimulatorId};
const Handle handle {uuid, plugin};
Expand Down
25 changes: 13 additions & 12 deletions src/Plugins/Connect/PathCreator/src/PathCreatorPlugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <QtGlobal>
#include <QRandomGenerator>
#include <QStringList>
#include <QStringLiteral>
#ifdef DEBUG
#include <QDebug>
#include <Kernel/Enum.h>
Expand Down Expand Up @@ -517,41 +518,41 @@ void PathCreatorPlugin::recordAircraftInfo() noexcept

switch (d->randomGenerator->bounded(5)) {
case 0:
info.aircraftType.type = QString::fromLatin1("Boeing 787");
info.aircraftType.type = QStringLiteral("Boeing 787");
break;
case 1:
info.aircraftType.type = QString::fromLatin1("Cirrus SR22");
info.aircraftType.type = QStringLiteral("Cirrus SR22");
break;
case 2:
info.aircraftType.type = QString::fromLatin1("Douglas DC-3");
info.aircraftType.type = QStringLiteral("Douglas DC-3");
break;
case 3:
info.aircraftType.type = QString::fromLatin1("Cessna 172");
info.aircraftType.type = QStringLiteral("Cessna 172");
break;
case 4:
info.aircraftType.type = QString::fromLatin1("Airbus A320");
info.aircraftType.type = QStringLiteral("Airbus A320");
break;
default:
info.aircraftType.type = QString::fromLatin1("Unknown");
info.aircraftType.type = QStringLiteral("Unknown");
}
switch (d->randomGenerator->bounded(5)) {
case 0:
info.aircraftType.category = QString::fromLatin1("Piston");
info.aircraftType.category = QStringLiteral("Piston");
break;
case 1:
info.aircraftType.category = QString::fromLatin1("Glider");
info.aircraftType.category = QStringLiteral("Glider");
break;
case 2:
info.aircraftType.category = QString::fromLatin1("Rocket");
info.aircraftType.category = QStringLiteral("Rocket");
break;
case 3:
info.aircraftType.category = QString::fromLatin1("Jet");
info.aircraftType.category = QStringLiteral("Jet");
break;
case 4:
info.aircraftType.category = QString::fromLatin1("Turbo");
info.aircraftType.category = QStringLiteral("Turbo");
break;
default:
info.aircraftType.category = QString::fromLatin1("Unknown");
info.aircraftType.category = QStringLiteral("Unknown");
}
info.aircraftType.wingSpan = d->randomGenerator->bounded(200);
info.aircraftType.engineType = static_cast<SimType::EngineType>(d->randomGenerator->bounded(7));
Expand Down
4 changes: 2 additions & 2 deletions src/Plugins/Flight/Export/GpxExport/src/GpxExportPlugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ bool GpxExportPlugin::exportSingleAircraft(const Aircraft &aircraft, QIODevice &
}
}
if (ok) {
const QString placemarkEnd = QString::fromLatin1(" </trkseg>\n"
const QString placemarkEnd = QStringLiteral(" </trkseg>\n"
" </trk>\n");
ok = io.write(placemarkEnd.toUtf8());
}
Expand All @@ -228,7 +228,7 @@ bool GpxExportPlugin::exportWaypoints(const FlightData &flightData, QIODevice &i

bool GpxExportPlugin::exportFooter(QIODevice &io) const noexcept
{
const QString footer = QString::fromLatin1("</gpx>\n");
const QString footer = QStringLiteral("</gpx>\n");
return io.write(footer.toUtf8());
}

Expand Down
6 changes: 3 additions & 3 deletions src/Plugins/Flight/Export/IgcExport/src/IgcExportPlugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
* DEALINGS IN THE SOFTWARE.
*/
#include <algorithm>
#include <cstdint>
#include <cmath>
#include <vector>

Expand All @@ -32,6 +31,7 @@
// Implements the % operator for string concatenation
#include <QStringBuilder>
#include <QString>
#include <QStringLiteral>
#include <QByteArray>
#include <QSysInfo>
#include <QDesktopServices>
Expand Down Expand Up @@ -354,7 +354,7 @@ inline QByteArray IgcExportPlugin::IgcExportPlugin::formatLatitude(double latitu

GeographicLib::DMS::Encode(latitude, degrees, minutes);
const int decimals = static_cast<int>((minutes - static_cast<int>(minutes)) * 1000);
return QString::fromLatin1("%1%2%3%4")
return QStringLiteral("%1%2%3%4")
.arg(static_cast<int>(degrees), 2, 10, QChar('0'))
.arg(static_cast<int>(minutes), 2, 10, QChar('0'))
.arg(decimals, 3, 10, QChar('0'))
Expand All @@ -369,7 +369,7 @@ inline QByteArray IgcExportPlugin::IgcExportPlugin::formatLongitude(double longi

GeographicLib::DMS::Encode(longitude, degrees, minutes);
const int decimals = static_cast<int>((minutes - static_cast<int>(minutes)) * 1000);
return QString::fromLatin1("%1%2%3%4")
return QStringLiteral("%1%2%3%4")
.arg(static_cast<int>(degrees), 3, 10, QChar('0'))
.arg(static_cast<int>(minutes), 2, 10, QChar('0'))
.arg(decimals, 3, 10, QChar('0'))
Expand Down
9 changes: 5 additions & 4 deletions src/Plugins/Location/Export/CsvLocationExport/src/SkyDollyCsvLocationWriter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <QIODevice>
#include <QChar>
#include <QString>
#include <QStringLiteral>
#include <QStringBuilder>

#include <Kernel/Enum.h>
Expand Down Expand Up @@ -111,15 +112,15 @@ bool SkyDollyCsvLocationWriter::write(const std::vector<Location> &locations, QI
const QString locationCategorySymId = locationCategoryEnumeration.getItemById(location.categoryId).symId;
const QString countrySymId = countryEnumeration.getItemById(location.countryId).symId;
const QString engineEventSymId = engineEventEnumeration.getItemById(location.engineEventId).symId;
const QString csv = QString::fromLatin1("\"") %
title.replace(QString::fromLatin1("\""), QString::fromLatin1("\"\"")) % "\"" %
const QString csv = QStringLiteral("\"") %
title.replace(QStringLiteral("\""), QStringLiteral("\"\"")) % "\"" %
Csv::CommaSep % "\"" %
description.replace(QString::fromLatin1("\""), QString::fromLatin1("\"\"")) % "\"" % Csv::CommaSep %
description.replace(QStringLiteral("\""), QStringLiteral("\"\"")) % "\"" % Csv::CommaSep %
locationTypeSymId % Csv::CommaSep %
locationCategorySymId % Csv::CommaSep %
countrySymId % Csv::CommaSep %
QString::number(location.attributes) % Csv::CommaSep %
"\"" % identifier.replace(QString::fromLatin1("\""), QString::fromLatin1("\"\"")) % "\"" % Csv::CommaSep %
"\"" % identifier.replace(QStringLiteral("\""), QStringLiteral("\"\"")) % "\"" % Csv::CommaSep %
Export::formatCoordinate(location.latitude) % Csv::CommaSep %
Export::formatCoordinate(location.longitude) % Csv::CommaSep %
Export::formatNumber(location.altitude) % Csv::CommaSep %
Expand Down
2 changes: 1 addition & 1 deletion src/Plugins/Module/Formation/src/FormationPlugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ FormationPlugin::~FormationPlugin()

QUuid FormationPlugin::getUuid() const noexcept
{
static QUuid uuid {Const::FormationModuleUuid};
static const QUuid uuid {Const::FormationModuleUuid};
return uuid;
}

Expand Down
11 changes: 5 additions & 6 deletions src/Plugins/Module/Logbook/src/LogbookWidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include <QTableWidgetItem>
#include <QTreeWidgetItem>
#include <QStringList>
#include <QStringLiteral>
#include <QItemSelectionModel>
#include <QModelIndex>
#include <QDateTime>
Expand Down Expand Up @@ -373,10 +374,8 @@ inline void LogbookWidget::updateRow(const FlightSummary &summary, int row) noex
// ID
QTableWidgetItem *item = ui->logTableWidget->item(row, LogbookWidgetPrivate::flightIdColumn);
QVariant flightId = QVariant::fromValue(summary.flightId);
if (summary.flightId == d->flightInMemoryId) {
item->setIcon(QIcon(QString::fromLatin1(":/img/icons/aircraft-normal.png")));
} else if (summary.flightId == Const::RecordingId) {
item->setIcon(QIcon(QString::fromLatin1(":/img/icons/aircraft-record-normal.png")));
if (summary.flightId == d->flightInMemoryId) {item->setIcon(QIcon(QStringLiteral(":/img/icons/aircraft-normal.png")));
} else if (summary.flightId == Const::RecordingId) {item->setIcon(QIcon(QStringLiteral(":/img/icons/aircraft-record-normal.png")));
// Note: alphabetical characters (a-zA-Z) will be > numerical characters (0-9),
// so the flight being recorded will be properly sorted in the table
flightId = QVariant::fromValue(tr("REC"));
Expand Down Expand Up @@ -720,9 +719,9 @@ void LogbookWidget::updateAircraftIcons() noexcept
for (int row = 0; row < ui->logTableWidget->rowCount(); ++row) {
QTableWidgetItem *item = ui->logTableWidget->item(row, LogbookWidgetPrivate::flightIdColumn);
if (item->data(Qt::DisplayRole).toLongLong() == flightInMemoryId) {
item->setIcon(QIcon(QString::fromLatin1(":/img/icons/aircraft-normal.png")));
item->setIcon(QIcon(QStringLiteral(":/img/icons/aircraft-normal.png")));
} else if (item->data(Qt::UserRole).toLongLong() == Const::RecordingId) {
item->setIcon(QIcon(QString::fromLatin1(":/img/icons/aircraft-record-normal.png")));
item->setIcon(QIcon(QStringLiteral(":/img/icons/aircraft-record-normal.png")));
} else {
item->setIcon(QIcon());
}
Expand Down
25 changes: 12 additions & 13 deletions src/UserInterface/src/MainWindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ void MainWindow::frenchConnection() noexcept
void MainWindow::initUi() noexcept
{
auto &settings = Settings::getInstance();
setWindowIcon(QIcon(QString::fromLatin1(":/img/icons/application-icon.png")));
setWindowIcon(QIcon(QStringLiteral(":/img/icons/application-icon.png")));

// File menu
d->recentFileMenu = new RecentFileMenu(this);
Expand Down Expand Up @@ -497,7 +497,7 @@ void MainWindow::initUi() noexcept
--currentPreviewInfoCount;
QMessageBox::information(
this,
QString::fromLatin1("Preview"),
QStringLiteral("Preview"),
QString::fromLatin1(
"%1 is in a preview release phase: while it should be stable to use it is not "
"considered feature-complete.\n\n"
Expand Down Expand Up @@ -685,17 +685,16 @@ void MainWindow::initControlUi() noexcept
ui->replayGroupBox->setStyleSheet(Platform::getFlatButtonCss());

// Specific CSS: completely flat button (no border) - on all platforms
ui->loopReplayButton->setStyleSheet(QString::fromLatin1(
"QPushButton {border-style: outset; border-width: 0px; padding: 6px 12px;}"));
ui->loopReplayButton->setStyleSheet(QStringLiteral("QPushButton {border-style: outset; border-width: 0px; padding: 6px 12px;}"));
}

void MainWindow::initReplaySpeedUi() noexcept
{
// Actions
QList<QAction *> slowActions{new QAction(QString::fromLatin1("10 %"), this),
new QAction(QString::fromLatin1("25 %"), this),
new QAction(QString::fromLatin1("50 %"), this),
new QAction(QString::fromLatin1("75 %"), this)};
QList<QAction *> slowActions{new QAction(QStringLiteral("10 %"), this),
new QAction(QStringLiteral("25 %"), this),
new QAction(QStringLiteral("50 %"), this),
new QAction(QStringLiteral("75 %"), this)};
slowActions.at(0)->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_1));
slowActions.at(0)->setProperty(ReplaySpeedProperty, Enum::underly(ReplaySpeed::Slow10));
slowActions.at(1)->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_2));
Expand All @@ -709,10 +708,10 @@ void MainWindow::initReplaySpeedUi() noexcept
ui->normalSpeedAction->setShortcut(QKeySequence(Qt::SHIFT | Qt::Key_1));
ui->normalSpeedAction->setProperty(ReplaySpeedProperty, Enum::underly(ReplaySpeed::Normal));

QList<QAction *> fastActions{new QAction(QString::fromLatin1("2x"), this),
new QAction(QString::fromLatin1("4x"), this),
new QAction(QString::fromLatin1("8x"), this),
new QAction(QString::fromLatin1("16x"), this)};
QList<QAction *> fastActions{new QAction(QStringLiteral("2x"), this),
new QAction(QStringLiteral("4x"), this),
new QAction(QStringLiteral("8x"), this),
new QAction(QStringLiteral("16x"), this)};
fastActions.at(0)->setShortcut(QKeySequence(Qt::SHIFT | Qt::Key_2));
fastActions.at(0)->setProperty(ReplaySpeedProperty, Enum::underly(ReplaySpeed::Fast2x));
fastActions.at(1)->setShortcut(QKeySequence(Qt::SHIFT | Qt::Key_3));
Expand Down Expand Up @@ -842,7 +841,7 @@ void MainWindow::createTrayIcon() noexcept
d->trayIcon = new QSystemTrayIcon(this);
d->trayIcon->setContextMenu(d->trayIconMenu);

d->trayIcon->setIcon(QIcon(QString::fromLatin1(":/img/icons/application-icon.png")));
d->trayIcon->setIcon(QIcon(QStringLiteral(":/img/icons/application-icon.png")));
}

void MainWindow::initSkyConnectPlugin() noexcept
Expand Down
1 change: 0 additions & 1 deletion src/Widget/src/Platform_Windows.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include <QStringLiteral>

#include "Platform.h"
#include "QtCore/qstringliteral.h"

namespace {
constexpr const char *FlatButtonCss {""};
Expand Down

0 comments on commit 8bf4720

Please sign in to comment.