refs #786, follow up / corresponding adjustments based on context changes

* removed reload models menu item
* changed to renamed functions

src/blackcore/aircraftmatcher.h

@@ -103,6 +103,7 @@ namespace BlackCore
         BlackMisc::Simulation::CAircraftModelList getModelSet() const { return m_modelSet; }
 
         //! Set the models we want to use
+        //! \note use a set from "somewhere else" so it can also be used with arbitrary sets for testing
         int setModelSet(const BlackMisc::Simulation::CAircraftModelList &models);
 
         //! Default model

src/blackcore/airspacemonitor.h

@@ -220,7 +220,7 @@ namespace BlackCore
         CPartsPerCallsign                 m_partsByCallsign;         //!< parts, for performance reasons per callsign, thread safe access required
         BlackMisc::Aviation::CCallsignSet m_aircraftSupportingParts; //!< aircraft supporting parts, thread safe access required
 
-        QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CFlightPlan>       m_flightPlanCache;     //!< flight plan information retrieved any cached
+        QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CFlightPlan> m_flightPlanCache; //!< flight plan information retrieved any cached
 
         INetwork            *m_network                  = nullptr; //!< corresponding network interface
         CAirspaceAnalyzer   *m_analyzer                 = nullptr; //!< owned analyzer

src/blackcore/simulator.h

@@ -53,7 +53,6 @@ namespace BlackCore
 
     public:
         //! ISimulator status
-        //! \todo Qt5.5: Make use of QFlags
         enum SimulatorStatusFlag
         {
             Disconnected = 0,
@@ -114,9 +113,6 @@ namespace BlackCore
         //! Display a text message
         virtual void displayTextMessage(const BlackMisc::Network::CTextMessage &message) const = 0;
 
-        //! Reload the installed models from disk
-        virtual void reloadInstalledModels() = 0;
-
         //! Airports in range from simulator
         virtual BlackMisc::Aviation::CAirportList getAirportsInRange() const = 0;
 
@@ -178,10 +174,12 @@ namespace BlackCore
         static QString statusToString(int status);
 
         //! Status to enum
+        //! \fixme remove with Qt 5.5 when SimulatorStatus can be transferred via DBus
         static SimulatorStatus statusToEnum(int status);
 
     signals:
         //! Simulator combined status
+        //! \fixme with Qt 5.5 make use of QFlags
         void simulatorStatusChanged(int status);
 
         //! Emitted when own aircraft model has changed

src/blackcore/simulatorcommon.cpp

@@ -241,11 +241,6 @@ namespace BlackCore
         this->m_remoteAircraftProviderConnections.disconnectAll(); // disconnect signals from provider
     }
 
-    void CSimulatorCommon::reloadInstalledModels()
-    {
-        // currently we do nothing here
-    }
-
     CLength CSimulatorCommon::getRenderedDistanceBoundary() const
     {
         return CLength(20.0, CLengthUnit::NM());

src/blackcore/simulatorcommon.h

@@ -82,7 +82,6 @@ namespace BlackCore
         virtual const BlackMisc::Simulation::CSimulatorPluginInfo &getSimulatorPluginInfo() const override;
         virtual const BlackMisc::Simulation::CSimulatorSetup &getSimulatorSetup() const override;
         virtual void unload() override;
-        virtual void reloadInstalledModels() override;
         virtual void deleteAllRenderingRestrictions() override;
         virtual int physicallyRemoveMultipleRemoteAircraft(const BlackMisc::Aviation::CCallsignSet &callsigns) override;
         //! @}