Ref T252, formatting

This commit is contained in:
Klaus Basan
2018-02-15 22:30:39 +01:00
parent 4da3309226
commit 1970ae9f9b
7 changed files with 54 additions and 54 deletions

View File

@@ -39,10 +39,10 @@ namespace BlackMisc
*/
class BLACKMISC_EXPORT IAircraftModelLoader :
public QObject,
public BlackMisc::Simulation::IModelsSetable,
public BlackMisc::Simulation::IModelsUpdatable,
public BlackMisc::Simulation::IModelsPerSimulatorSetable,
public BlackMisc::Simulation::IModelsPerSimulatorUpdatable
public IModelsSetable,
public IModelsUpdatable,
public IModelsPerSimulatorSetable,
public IModelsPerSimulatorUpdatable
{
Q_OBJECT
Q_INTERFACES(BlackMisc::Simulation::IModelsSetable)

View File

@@ -35,7 +35,7 @@ namespace BlackMisc
namespace FsCommon
{
//! Utility, parsing the aircraft.cfg files
class BLACKMISC_EXPORT CAircraftCfgParser : public BlackMisc::Simulation::IAircraftModelLoader
class BLACKMISC_EXPORT CAircraftCfgParser : public IAircraftModelLoader
{
Q_OBJECT

View File

@@ -93,25 +93,25 @@ namespace BlackMisc
{
if (model.getDistributor().hasDescription() && !model.getName().contains(model.getDistributor().getDescription()))
{
return "[ACF] " % model.getName() % " by " % model.getDistributor().getDescription();
return QStringLiteral("[ACF] ") % model.getName() % QStringLiteral(" by ") % model.getDistributor().getDescription();
}
else
{
return "[ACF] " % model.getName();
return QStringLiteral("[ACF] ") % model.getName();
}
}
else if (model.hasAircraftDesignator())
{
if (model.getDistributor().hasDescription())
{
return "[ACF] " % model.getAircraftIcaoCodeDesignator() % " by " % model.getDistributor().getDescription();
return QStringLiteral("[ACF] ") % model.getAircraftIcaoCodeDesignator() % QStringLiteral(" by ") % model.getDistributor().getDescription();
}
else
{
return "[ACF] " % model.getAircraftIcaoCodeDesignator();
return QStringLiteral("[ACF] ") % model.getAircraftIcaoCodeDesignator();
}
}
return "[ACF]";
return QStringLiteral("[ACF]");
}
CAircraftModelLoaderXPlane::CAircraftModelLoaderXPlane() : IAircraftModelLoader(CSimulatorInfo::XPLANE)

View File

@@ -35,7 +35,7 @@ namespace BlackMisc
/*!
* XPlane aircraft model loader
*/
class BLACKMISC_EXPORT CAircraftModelLoaderXPlane : public BlackMisc::Simulation::IAircraftModelLoader
class BLACKMISC_EXPORT CAircraftModelLoaderXPlane : public IAircraftModelLoader
{
Q_OBJECT
@@ -74,10 +74,10 @@ namespace BlackMisc
QString objectName; //!< Complete basename of the object file
QString textureName; //!< Complete basename of the texture file. Can be empty.
QString filePath; //!< object filePath
QString icao; //!< Icao type of this model
QString airline; //!< Airline identifier. Can be empty.
QString livery; //!< Livery identifier. Can be empty.
QString filePath; //!< object filePath
QString icao; //!< Icao type of this model
QString airline; //!< Airline identifier. Can be empty.
QString livery; //!< Livery identifier. Can be empty.
};
struct CSLPackage