diff --git a/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc b/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc
index df21fe6..7d85996 100644
--- a/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc
+++ b/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc
@@ -65,54 +65,54 @@ const QVariantList& PX4AutoPilotPlugin::vehicleComponents(void)
             if (_vehicle->parameterManager()->parametersReady()) {
                 _airframeComponent = new AirframeComponent(_vehicle, this, this);
                 _airframeComponent->setupTriggerSignals();
-                _components.append(QVariant::fromValue((VehicleComponent*)_airframeComponent));
+                _components.append(QVariant::fromValue(static_cast<VehicleComponent*>(_airframeComponent)));
 
                 _sensorsComponent = new SensorsComponent(_vehicle, this, this);
                 _sensorsComponent->setupTriggerSignals();
-                _components.append(QVariant::fromValue((VehicleComponent*)_sensorsComponent));
+                _components.append(QVariant::fromValue(static_cast<VehicleComponent*>(_sensorsComponent)));
 
                 _radioComponent = new PX4RadioComponent(_vehicle, this, this);
                 _radioComponent->setupTriggerSignals();
-                _components.append(QVariant::fromValue((VehicleComponent*)_radioComponent));
+                _components.append(QVariant::fromValue(static_cast<VehicleComponent*>(_radioComponent)));
 
                 _flightModesComponent = new FlightModesComponent(_vehicle, this, this);
                 _flightModesComponent->setupTriggerSignals();
-                _components.append(QVariant::fromValue((VehicleComponent*)_flightModesComponent));
+                _components.append(QVariant::fromValue(static_cast<VehicleComponent*>(_flightModesComponent)));
 
                 _powerComponent = new PowerComponent(_vehicle, this, this);
                 _powerComponent->setupTriggerSignals();
-                _components.append(QVariant::fromValue((VehicleComponent*)_powerComponent));
+                _components.append(QVariant::fromValue(static_cast<VehicleComponent*>(_powerComponent)));
 
                 _motorComponent = new MotorComponent(_vehicle, this, this);
                 _motorComponent->setupTriggerSignals();
-                _components.append(QVariant::fromValue((VehicleComponent*)_motorComponent));
+                _components.append(QVariant::fromValue(static_cast<VehicleComponent*>(_motorComponent)));
 
                 _safetyComponent = new SafetyComponent(_vehicle, this, this);
                 _safetyComponent->setupTriggerSignals();
-                _components.append(QVariant::fromValue((VehicleComponent*)_safetyComponent));
+                _components.append(QVariant::fromValue(static_cast<VehicleComponent*>(_safetyComponent)));
 
                 _tuningComponent = new PX4TuningComponent(_vehicle, this, this);
                 _tuningComponent->setupTriggerSignals();
-                _components.append(QVariant::fromValue((VehicleComponent*)_tuningComponent));
+                _components.append(QVariant::fromValue(static_cast<VehicleComponent*>(_tuningComponent)));
 
                 if(_vehicle->parameterManager()->parameterExists(_vehicle->id(), "SYS_VEHICLE_RESP")) {
                     _flightBehavior = new PX4FlightBehavior(_vehicle, this, this);
                     _flightBehavior->setupTriggerSignals();
-                    _components.append(QVariant::fromValue((VehicleComponent*)_flightBehavior));
+                    _components.append(QVariant::fromValue(static_cast<VehicleComponent*>(_flightBehavior)));
                 }
 
                 //-- Is there support for cameras?
                 if(_vehicle->parameterManager()->parameterExists(_vehicle->id(), "TRIG_MODE")) {
                     _cameraComponent = new CameraComponent(_vehicle, this, this);
                     _cameraComponent->setupTriggerSignals();
-                    _components.append(QVariant::fromValue((VehicleComponent*)_cameraComponent));
+                    _components.append(QVariant::fromValue(static_cast<VehicleComponent*>(_cameraComponent)));
                 }
 
                 //-- Is there an ESP8266 Connected?
                 if(_vehicle->parameterManager()->parameterExists(MAV_COMP_ID_UDP_BRIDGE, "SW_VER")) {
                     _esp8266Component = new ESP8266Component(_vehicle, this, this);
                     _esp8266Component->setupTriggerSignals();
-                    _components.append(QVariant::fromValue((VehicleComponent*)_esp8266Component));
+                    _components.append(QVariant::fromValue(static_cast<VehicleComponent*>(_esp8266Component)));
                 }
             } else {
                 qWarning() << "Call to vehicleCompenents prior to parametersReady";
@@ -121,7 +121,7 @@ const QVariantList& PX4AutoPilotPlugin::vehicleComponents(void)
             if(_vehicle->parameterManager()->parameterExists(_vehicle->id(), "SLNK_RADIO_CHAN")) {
                 _syslinkComponent = new SyslinkComponent(_vehicle, this, this);
                 _syslinkComponent->setupTriggerSignals();
-                _components.append(QVariant::fromValue((VehicleComponent*)_syslinkComponent));
+                _components.append(QVariant::fromValue(static_cast<VehicleComponent*>(_syslinkComponent)));
             }
         } else {
             qWarning() << "Internal error";