refs #452, adjusted aircraft/aviation classes

* support for loading from datastore
* improved timestamp handling
* new color and country classes
* new attributes
* updates for missing parts in CUser

src/blackmisc/simulation/simulatedaircraftlist.h

@@ -15,7 +15,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/aviation/callsignobjectlist.h"
-#include "blackmisc/aviation/aircraftlist.h"
 #include "blackmisc/geo/geoobjectlist.h"
 #include "blackmisc/network/userlist.h"
 #include "blackmisc/collection.h"
@@ -59,12 +58,19 @@ namespace BlackMisc
             //! Callsigns of aircraft with synchronized parts
             BlackMisc::Aviation::CCallsignSet getCallsignsWithSyncronizedParts() const;
 
+            //! Update aircraft with data from VATSIM data file
+            //! \remarks The list used ("this") needs to contain the VATSIM data file objects
+            bool updateWithVatsimDataFileData(CSimulatedAircraft &aircraftToBeUpdated) const;
+
             //! Mark all aircraft as unrendered
             void markAllAsNotRendered();
 
             //! Mark given callsign as rendered
             int setRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered);
 
+            //! Set model
+            int setAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const CAircraftModel &model);
+
             //! Set aircraft parts
             int setAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts);
 
@@ -74,9 +80,6 @@ namespace BlackMisc
             //! Rendered?
             bool isRendered(const BlackMisc::Aviation::CCallsign &callsign) const;
 
-            //! To aircraft list
-            BlackMisc::Aviation::CAircraftList toAircraftList() const;
-
         };
 
     } //namespace