refs #643, moved aircraft model icon loading to model class

* removed iconForModel from interface and aircraft config parser
* CPixmap support for loading pixmap from file
* Access to model of model set loader by model string
* icon path as member of CAircraftModel
This commit is contained in:
Klaus Basan
2016-04-15 18:49:55 +02:00
parent a3a3380008
commit ddc7347927
20 changed files with 143 additions and 67 deletions

View File

@@ -14,6 +14,7 @@
#include "blackmiscexport.h"
#include "valueobject.h"
#include "statusmessage.h"
#include <QPixmap>
#include <QReadWriteLock>
@@ -51,6 +52,9 @@ namespace BlackMisc
//! \copydoc BlackMisc::Mixin::String::toQString
QString convertToQString(bool i18n = false) const;
//! Load from file
static CPixmap loadFromFile(const QString &filePath, CStatusMessage &msg);
private:
//! Init the byte array with data
void fillByteArray();