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

Ref T292, adjusted the specific model loaders

Browse Source 
* no longer using "std::unique_ptr"
* QObject parent
* Style
This commit is contained in:
Klaus Basan
2018-07-22 18:05:23 +02:00
parent 5953bbe4c6
commit 40c0c6ae35
4 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp
View File

@@ -46,13 +46,12 @@ namespace BlackMisc
// response for async. loading
using LoaderResponse = std::tuple<CAircraftCfgEntriesList, CAircraftModelList, BlackMisc::CStatusMessageList, bool>;
CAircraftCfgParser::CAircraftCfgParser(const CSimulatorInfo &simInfo) :
IAircraftModelLoader(simInfo)
CAircraftCfgParser::CAircraftCfgParser(const CSimulatorInfo &simInfo, QObject *parent) : IAircraftModelLoader(simInfo, parent)
{ }
std::unique_ptr<CAircraftCfgParser> CAircraftCfgParser::createModelLoader(const CSimulatorInfo &simInfo)
CAircraftCfgParser *CAircraftCfgParser::createModelLoader(const CSimulatorInfo &simInfo, QObject *parent)
{
return std::make_unique<CAircraftCfgParser>(simInfo);
return new CAircraftCfgParser(simInfo, parent);
}
CAircraftCfgParser::~CAircraftCfgParser()
@@ -98,7 +97,7 @@ namespace BlackMisc
const bool hasData = !models.isEmpty();
if (hasData)
{
this->setCachedModels(models, simulator); // not thread safe
this->setModelsForSimulator(models, this->getSimulator());
}
// currently I treat no data as error
emit this->loadingFinished(hasData ? statusLoadingOk : statusLoadingError, simulator, ParsedData);
@@ -119,7 +118,7 @@ namespace BlackMisc
const bool hasData = !models.isEmpty();
if (hasData)
{
this->setCachedModels(models);
this->setCachedModels(models, this->getSimulator());
}
// currently I treat no data as error
emit this->loadingFinished(hasData ? statusLoadingOk : statusLoadingError, simulator, ParsedData);
@@ -392,8 +391,8 @@ namespace BlackMisc
QString content(line.midRef(index + 1).trimmed().toString());
// fix "" strings, some are malformed and just contain " at beginning, not at the end
if (content.endsWith('"')) { content.remove(content.size() - 1 , 1); }
if (content.startsWith('"')) { content.remove(0 , 1); }
if (content.endsWith('"')) { content.remove(content.size() - 1, 1); }
if (content.startsWith('"')) { content.remove(0, 1); }
// fix C style linebreaks
content.replace("\\n", " ");