flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-13 15:45:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

RW's review fixes Ref T202 Ref T189 Ref T210

Browse Source 
* dmg comment and follow up issue created
* cppcheck-suppress passedByValue in cppcheck.supp
* renamed from Xsb -> XSwiftBus
* reverted wrong "static const QString dataStr"
This commit is contained in:
Klaus Basan
2017-12-21 16:40:28 +01:00
parent 5a24e40312
commit e81211775b
10 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/vatsim/networkvatlib.cpp
View File

@@ -775,8 +775,8 @@ namespace BlackCore
void CNetworkVatlib::broadcastAircraftConfig(const QJsonObject &config)
{
static const QString dataStr = convertToUnicodeEscaped(QJsonDocument(QJsonObject { { "config", config } }).toJson(QJsonDocument::Compact));
static const QByteArray data(toFSD(dataStr));
const QString dataStr = convertToUnicodeEscaped(QJsonDocument(QJsonObject { { "config", config } }).toJson(QJsonDocument::Compact));
const QByteArray data(toFSD(dataStr));
Vat_SendAircraftConfigBroadcast(m_net.data(), data);
}

6
src/blackgui/components/installxswiftbuscomponent.cpp
View File

@@ -170,7 +170,7 @@ namespace BlackGui
{
const QString fileNameAndSize = ui->cb_DownloadFile->currentText();
const CUpdateInfo update = m_updates.get();
const CRemoteFileList remoteFiles = update.getArtifactsXsb().asRemoteFiles();
const CRemoteFileList remoteFiles = update.getArtifactsXSwiftBus().asRemoteFiles();
return remoteFiles.findFirstByMatchingNameOrDefault(fileNameAndSize);
}
@@ -199,8 +199,8 @@ namespace BlackGui
void CInstallXSwiftBusComponent::updatesChanged()
{
const CUpdateInfo updateInfo = m_updates.get();
if (updateInfo.getArtifactsXsb().isEmpty()) { return; }
const CArtifactList artifacts = updateInfo.getArtifactsXsbLatestVersionFirst();
if (updateInfo.getArtifactsXSwiftBus().isEmpty()) { return; }
const CArtifactList artifacts = updateInfo.getArtifactsXSwiftBusLatestVersionFirst();
const CRemoteFileList remoteFiles = artifacts.asRemoteFiles();
if (!remoteFiles.isEmpty())
{

2
src/blackgui/components/updateinfocomponent.cpp
View File

@@ -185,7 +185,7 @@ namespace BlackGui
const CUpdateInfo updateInfo(m_updateInfo.get());
const CArtifactList artifactsPilotClient = updateInfo.getArtifactsPilotClient().findByDistributionAndPlatform(selectedDistribution, selectedPlatform, true);
const CArtifactList artifactsXsb = updateInfo.getArtifactsXsb().findByDistributionAndPlatform(selectedDistribution, selectedPlatform, true);
const CArtifactList artifactsXsb = updateInfo.getArtifactsXSwiftBus().findByDistributionAndPlatform(selectedDistribution, selectedPlatform, true);
const QStringList sortedPilotClientVersions = artifactsPilotClient.getSortedVersions();
ui->cb_ArtifactsPilotClient->clear();

16
src/blackmisc/db/updateinfo.cpp
View File

@@ -19,7 +19,7 @@ namespace BlackMisc
{
CUpdateInfo::CUpdateInfo(const CArtifactList &artifacts, const CDistributionList &distributions) :
m_artifactsPilotClient(artifacts.findByType(CArtifact::PilotClientInstaller)),
m_artifactsXsb(artifacts.findByType(CArtifact::XSwiftBus)),
m_artifactsXSwiftBus(artifacts.findByType(CArtifact::XSwiftBus)),
m_distributions(distributions)
{
// void
@@ -40,16 +40,16 @@ namespace BlackMisc
return artifacts;
}
CArtifactList CUpdateInfo::getArtifactsXsbLatestVersionFirst() const
CArtifactList CUpdateInfo::getArtifactsXSwiftBusLatestVersionFirst() const
{
CArtifactList artifacts(m_artifactsXsb);
CArtifactList artifacts(m_artifactsXSwiftBus);
artifacts.sortByVersion(Qt::DescendingOrder);
return artifacts;
}
CArtifactList CUpdateInfo::getArtifactsXsbForCurrentPlatform() const
CArtifactList CUpdateInfo::getArtifactsXSwiftBusForCurrentPlatform() const
{
CArtifactList artifacts = m_artifactsXsb.findMatchingForCurrentPlatform();
CArtifactList artifacts = m_artifactsXSwiftBus.findMatchingForCurrentPlatform();
artifacts.sortByVersion(Qt::DescendingOrder);
return artifacts;
}
@@ -93,7 +93,7 @@ namespace BlackMisc
this->getArtifactsPilotClient().toQString(i18n) %
separator %
QLatin1String("artifacts (XSB): ") %
this->getArtifactsXsb().toQString(i18n) %
this->getArtifactsXSwiftBus().toQString(i18n) %
separator %
QLatin1String("distributions: ") %
this->getDistributions().toQString(i18n);
@@ -106,7 +106,7 @@ namespace BlackMisc
switch (i)
{
case IndexArtifactsPilotClient: return CVariant::fromValue(m_artifactsPilotClient);
case IndexArtifactsXSwiftBus: CVariant::fromValue(m_artifactsXsb);
case IndexArtifactsXSwiftBus: CVariant::fromValue(m_artifactsXSwiftBus);
case IndexDistributions: return CVariant::fromValue(m_distributions);
default: return CValueObject::propertyByIndex(index);
}
@@ -119,7 +119,7 @@ namespace BlackMisc
switch (i)
{
case IndexArtifactsPilotClient: m_artifactsPilotClient = variant.value<CArtifactList>(); break;
case IndexArtifactsXSwiftBus: m_artifactsXsb = variant.value<CArtifactList>(); break;
case IndexArtifactsXSwiftBus: m_artifactsXSwiftBus = variant.value<CArtifactList>(); break;
case IndexDistributions: m_distributions = variant.value<CDistributionList>(); break;
default: CValueObject::setPropertyByIndex(index, variant); break;
}

10
src/blackmisc/db/updateinfo.h
View File

@@ -53,14 +53,14 @@ namespace BlackMisc
CArtifactList getArtifactsPilotClientForCurrentPlatform() const;
//! Artifacts (XSwiftBus)
const CArtifactList &getArtifactsXsb() const { return m_artifactsXsb; }
const CArtifactList &getArtifactsXSwiftBus() const { return m_artifactsXSwiftBus; }
//! Artifacts (XSwiftBus)
CArtifactList getArtifactsXsbLatestVersionFirst() const;
CArtifactList getArtifactsXSwiftBusLatestVersionFirst() const;
//! Artifacts for current platform
//! \note sorted by version
CArtifactList getArtifactsXsbForCurrentPlatform() const;
CArtifactList getArtifactsXSwiftBusForCurrentPlatform() const;
//! Distributions (all)
const CDistributionList &getDistributions() const { return m_distributions; }
@@ -97,13 +97,13 @@ namespace BlackMisc
private:
CArtifactList m_artifactsPilotClient; //!< artifacts pilot client
CArtifactList m_artifactsXsb; //!< artifacts XSwiftBus
CArtifactList m_artifactsXSwiftBus; //!< artifacts XSwiftBus
CDistributionList m_distributions; //!< all distributions (for any artifacts)
BLACK_METACLASS(
CUpdateInfo,
BLACK_METAMEMBER(artifactsPilotClient),
BLACK_METAMEMBER(artifactsXsb),
BLACK_METAMEMBER(artifactsXSwiftBus),
BLACK_METAMEMBER(distributions)
);
};

1
src/blackmisc/fileutils.cpp
View File

@@ -395,6 +395,7 @@ namespace BlackMisc
const QStringList &CFileUtils::executableSuffixes()
{
// incomplete list of file name appendixes
// dmg is not a executable. It is a MacOS container. If you open it, a new virtual drive will be mapped which includes a executable.
static const QStringList appendixes({".exe", ".dmg", ".run"});
return appendixes;
}

1
src/blackmisc/platformset.cpp
View File

@@ -22,7 +22,6 @@ namespace BlackMisc
{
CPlatformSet::CPlatformSet() { }
// cppcheck-suppress passedByValue
CPlatformSet::CPlatformSet(std::initializer_list<CPlatform> il) : CCollection<CPlatform>(il)
{ }

5
src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
View File

@@ -88,10 +88,7 @@ namespace BlackSimPlugin
//! Ctor
TraceFsxSendId(DWORD sendId, DWORD simObjectId, const QString &comment) :
sendId(sendId), simObjectId(simObjectId), comment(comment)
{
Q_ASSERT_X(sendId >= 0, Q_FUNC_INFO, "DWORD is unsigned");
Q_ASSERT_X(simObjectId >= 0, Q_FUNC_INFO, "DWORD is unsigned");
}
{ }
// DWORD is unsigned
DWORD sendId = 0; //!< the send id