flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Style: renaming methods

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-08-16 20:01:01 +01:00
parent d43a55f087
commit 5b14cf7f71
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,7 +190,7 @@ namespace BlackGui
const CUrl download = remoteFile.getSmartUrl();
if (download.isEmpty())
{
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"No download URL for file name '%1'") << remoteFile.getNameAndSize();
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"No download URL for file name '%1'") << remoteFile.getBaseNameAndSize();
this->showOverlayMessage(msg, CDownloadComponent::OverlayMsgTimeoutMs);
return false;
}

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

@@ -222,7 +222,7 @@ namespace BlackGui
const CUrl download = rf.getSmartUrl();
if (download.isEmpty())
{
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"No download URL for file name '%1'") << rf.getNameAndSize();
const CStatusMessage msg = CStatusMessage(this, CLogCategory::validation()).error(u"No download URL for file name '%1'") << rf.getBaseNameAndSize();
this->showOverlayMessage(msg, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs);
return;
}
@@ -287,10 +287,10 @@ namespace BlackGui
CRemoteFile CInstallXSwiftBusComponent::getRemoteFileSelected() const
{
const QString fileNameAndSize = ui->cb_DownloadFile->currentText();
const QString baseNameAndSize = ui->cb_DownloadFile->currentText();
const CUpdateInfo update = m_updates.get();
const CRemoteFileList remoteFiles = update.getArtifactsXSwiftBus().asRemoteFiles();
return remoteFiles.findFirstByMatchingNameOrDefault(fileNameAndSize);
return remoteFiles.findFirstByMatchingBaseNameOrDefault(baseNameAndSize);
}
QString CInstallXSwiftBusComponent::downloadDir() const
@@ -331,7 +331,7 @@ namespace BlackGui
const CRemoteFileList remoteFiles = artifacts.asRemoteFiles();
if (!remoteFiles.isEmpty())
{
const QStringList xSwiftBusFiles(remoteFiles.getNamesPlusSize(false));
const QStringList xSwiftBusFiles(remoteFiles.getBaseNamesPlusSize(false));
m_xSwiftBusArtifacts = artifacts;
ui->cb_DownloadFile->addItems(xSwiftBusFiles);
@@ -340,17 +340,17 @@ namespace BlackGui
if (m_defaultDownloadName.isEmpty())
{
const CRemoteFile rf = remoteFiles.findFirstContainingNameOrDefault(CBuildConfig::getVersionString(), Qt::CaseInsensitive);
if (rf.hasName()) { current = rf.getNameAndSize(); }
if (rf.hasName()) { current = rf.getBaseNameAndSize(); }
}
else
{
const CRemoteFile rf = remoteFiles.findFirstByMatchingNameOrDefault(m_defaultDownloadName);
if (rf.hasName()) { current = rf.getNameAndSize(); }
const CRemoteFile rf = remoteFiles.findFirstByMatchingBaseNameOrDefault(m_defaultDownloadName);
if (rf.hasName()) { current = rf.getBaseNameAndSize(); }
}
ui->cb_DownloadFile->setCurrentText(
current.isEmpty() ?
remoteFiles.frontOrDefault().getNameAndSize() :
remoteFiles.frontOrDefault().getBaseNameAndSize() :
current
); // latest version
}