Remove unused methods

src/AutoPilotPlugins/APM/APMAirframeComponent.cc

@@ -65,18 +65,6 @@ bool APMAirframeComponent::setupComplete(void) const
 #endif
 }
 
-QString APMAirframeComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-    
-    if (requiresSetup()) {
-        stateDescription = "Requires calibration";
-    } else {
-        stateDescription = "Calibrated";
-    }
-    return QString(stateDescription);
-}
-
 QStringList APMAirframeComponent::setupCompleteChangedTriggerList(void) const
 {
     // You'll need to figure out which parameters trigger setup complete
@@ -87,19 +75,6 @@ QStringList APMAirframeComponent::setupCompleteChangedTriggerList(void) const
 #endif
 }
 
-QStringList APMAirframeComponent::paramFilterList(void) const
-{
-#if 0
-    QStringList list;
-    
-    list << "SYS_AUTOSTART";
-    
-    return list;
-#else
-    return QStringList();
-#endif
-}
-
 QUrl APMAirframeComponent::setupSource(void) const
 {
     return QUrl::fromUserInput("qrc:/qml/APMAirframeComponent.qml");

src/AutoPilotPlugins/APM/APMAirframeComponent.h

@@ -42,9 +42,7 @@ public:
     virtual QString iconResource(void) const;
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
-    virtual QString setupStateDescription(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QStringList paramFilterList(void) const;
     virtual QUrl summaryQmlSource(void) const;    
     virtual QString prerequisiteSetup(void) const;
 

src/AutoPilotPlugins/APM/APMFlightModesComponent.cc

@@ -55,28 +55,11 @@ bool APMFlightModesComponent::setupComplete(void) const
     return true;
 }
 
-QString APMFlightModesComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-    
-    if (requiresSetup()) {
-        stateDescription = "Requires calibration";
-    } else {
-        stateDescription = "Calibrated";
-    }
-    return QString(stateDescription);
-}
-
 QStringList APMFlightModesComponent::setupCompleteChangedTriggerList(void) const
 {
     return QStringList();
 }
 
-QStringList APMFlightModesComponent::paramFilterList(void) const
-{
-    return QStringList();
-}
-
 QUrl APMFlightModesComponent::setupSource(void) const
 {
     return QUrl::fromUserInput("qrc:/qml/APMFlightModesComponent.qml");

src/AutoPilotPlugins/APM/APMFlightModesComponent.h

@@ -42,9 +42,7 @@ public:
     virtual QString iconResource(void) const;
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
-    virtual QString setupStateDescription(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QStringList paramFilterList(void) const;
     virtual QUrl summaryQmlSource(void) const;
     virtual QString prerequisiteSetup(void) const;
     

src/AutoPilotPlugins/APM/APMRadioComponent.cc

@@ -67,18 +67,6 @@ bool APMRadioComponent::setupComplete(void) const
     return true;
 }
 
-QString APMRadioComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-    
-    if (requiresSetup()) {
-        stateDescription = "Requires calibration";
-    } else {
-        stateDescription = "Calibrated";
-    }
-    return QString(stateDescription);
-}
-
 QStringList APMRadioComponent::setupCompleteChangedTriggerList(void) const
 {
     QStringList triggers;
@@ -88,15 +76,6 @@ QStringList APMRadioComponent::setupCompleteChangedTriggerList(void) const
     return triggers;
 }
 
-QStringList APMRadioComponent::paramFilterList(void) const
-{
-    QStringList list;
-    
-    list << "RC*";
-    
-    return list;
-}
-
 QUrl APMRadioComponent::setupSource(void) const
 {
     return QUrl::fromUserInput("qrc:/qml/RadioComponent.qml");

src/AutoPilotPlugins/APM/APMRadioComponent.h

@@ -42,9 +42,7 @@ public:
     virtual QString iconResource(void) const;
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
-    virtual QString setupStateDescription(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QStringList paramFilterList(void) const;
     virtual QUrl summaryQmlSource(void) const;
     virtual QString prerequisiteSetup(void) const;
     

src/AutoPilotPlugins/APM/APMSafetyComponent.cc

@@ -60,28 +60,11 @@ bool APMSafetyComponent::setupComplete(void) const
     return true;
 }
 
-QString APMSafetyComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-
-    if (requiresSetup()) {
-        stateDescription = "Requires setup";
-    } else {
-        stateDescription = "Setup complete";
-    }
-    return QString(stateDescription);
-}
-
 QStringList APMSafetyComponent::setupCompleteChangedTriggerList(void) const
 {
     return QStringList();
 }
 
-QStringList APMSafetyComponent::paramFilterList(void) const
-{
-    return QStringList();
-}
-
 QUrl APMSafetyComponent::setupSource(void) const
 {
     QString qmlFile;

src/AutoPilotPlugins/APM/APMSafetyComponent.h

@@ -42,9 +42,7 @@ public:
     virtual QString iconResource(void) const;
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
-    virtual QString setupStateDescription(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QStringList paramFilterList(void) const;
     virtual QUrl summaryQmlSource(void) const;
     virtual QString prerequisiteSetup(void) const;
     

src/AutoPilotPlugins/APM/APMSensorsComponent.cc

@@ -60,18 +60,6 @@ bool APMSensorsComponent::setupComplete(void) const
     return !compassSetupNeeded() && !accelSetupNeeded();
 }
 
-QString APMSensorsComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-    
-    if (requiresSetup()) {
-        stateDescription = "Requires calibration";
-    } else {
-        stateDescription = "Calibrated";
-    }
-    return QString(stateDescription);
-}
-
 QStringList APMSensorsComponent::setupCompleteChangedTriggerList(void) const
 {
     QStringList triggers;
@@ -91,11 +79,6 @@ QStringList APMSensorsComponent::setupCompleteChangedTriggerList(void) const
     return triggers;
 }
 
-QStringList APMSensorsComponent::paramFilterList(void) const
-{
-    return QStringList();
-}
-
 QUrl APMSensorsComponent::setupSource(void) const
 {
     return QUrl::fromUserInput("qrc:/qml/APMSensorsComponent.qml");

src/AutoPilotPlugins/APM/APMSensorsComponent.h

@@ -45,9 +45,7 @@ public:
     virtual QString iconResource(void) const;
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
-    virtual QString setupStateDescription(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QStringList paramFilterList(void) const;
     virtual QUrl summaryQmlSource(void) const;
     virtual QString prerequisiteSetup(void) const;
     

src/AutoPilotPlugins/PX4/AirframeComponent.cc

@@ -145,32 +145,11 @@ bool AirframeComponent::setupComplete(void) const
     return _autopilot->getParameterFact(FactSystem::defaultComponentId, "SYS_AUTOSTART")->rawValue().toInt() != 0;
 }
 
-QString AirframeComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-    
-    if (requiresSetup()) {
-        stateDescription = "Requires calibration";
-    } else {
-        stateDescription = "Calibrated";
-    }
-    return QString(stateDescription);
-}
-
 QStringList AirframeComponent::setupCompleteChangedTriggerList(void) const
 {
     return QStringList("SYS_AUTOSTART");
 }
 
-QStringList AirframeComponent::paramFilterList(void) const
-{
-    QStringList list;
-    
-    list << "SYS_AUTOSTART";
-    
-    return list;
-}
-
 QUrl AirframeComponent::setupSource(void) const
 {
     return QUrl::fromUserInput("qrc:/qml/AirframeComponent.qml");

src/AutoPilotPlugins/PX4/AirframeComponent.h

@@ -46,9 +46,7 @@ public:
     virtual QString iconResource(void) const;
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
-    virtual QString setupStateDescription(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QStringList paramFilterList(void) const;
     virtual QUrl summaryQmlSource(void) const;    
     virtual QString prerequisiteSetup(void) const;
 

src/AutoPilotPlugins/PX4/FlightModesComponent.cc

@@ -33,16 +33,6 @@ struct SwitchListItem {
     const char* name;
 };
 
-/// @brief Used to translate from RC_MAP_* parameters name to user string
-static const SwitchListItem switchList[] = {
-    { "RC_MAP_MODE_SW",     "Mode Switch:" },                // First entry must be mode switch
-    { "RC_MAP_POSCTL_SW",   "Position Control Switch:" },
-    { "RC_MAP_LOITER_SW",   "Loiter Switch:" },
-    { "RC_MAP_RETURN_SW",   "Return Switch:" },
-    { "RC_MAP_ACRO_SW",     "Acro Switch:" },
-};
-static const size_t cSwitchList = sizeof(switchList) / sizeof(switchList[0]);
-
 FlightModesComponent::FlightModesComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent) :
     PX4Component(vehicle, autopilot, parent),
     _name(tr("Flight Modes"))
@@ -77,34 +67,11 @@ bool FlightModesComponent::setupComplete(void) const
             _autopilot->getParameterFact(FactSystem::defaultComponentId, "RC_MAP_MODE_SW")->rawValue().toInt() != 0;
 }
 
-QString FlightModesComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-    
-    if (requiresSetup()) {
-        stateDescription = "Requires calibration";
-    } else {
-        stateDescription = "Calibrated";
-    }
-    return QString(stateDescription);
-}
-
 QStringList FlightModesComponent::setupCompleteChangedTriggerList(void) const
 {
     return QStringList("RC_MAP_MODE_SW");
 }
 
-QStringList FlightModesComponent::paramFilterList(void) const
-{
-    QStringList list;
-    
-    for (size_t i=0; i<cSwitchList; i++) {
-        list << switchList[i].param;
-    }
-
-    return list;
-}
-
 QUrl FlightModesComponent::setupSource(void) const
 {
     return QUrl::fromUserInput("qrc:/qml/FlightModesComponent.qml");

src/AutoPilotPlugins/PX4/FlightModesComponent.h

@@ -46,9 +46,7 @@ public:
     virtual QString iconResource(void) const;
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
-    virtual QString setupStateDescription(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QStringList paramFilterList(void) const;
     virtual QUrl summaryQmlSource(void) const;
     virtual QString prerequisiteSetup(void) const;
     

src/AutoPilotPlugins/PX4/PX4RadioComponent.cc

@@ -69,18 +69,6 @@ bool PX4RadioComponent::setupComplete(void) const
     return true;
 }
 
-QString PX4RadioComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-    
-    if (requiresSetup()) {
-        stateDescription = "Requires calibration";
-    } else {
-        stateDescription = "Calibrated";
-    }
-    return QString(stateDescription);
-}
-
 QStringList PX4RadioComponent::setupCompleteChangedTriggerList(void) const
 {
     QStringList triggers;
@@ -90,15 +78,6 @@ QStringList PX4RadioComponent::setupCompleteChangedTriggerList(void) const
     return triggers;
 }
 
-QStringList PX4RadioComponent::paramFilterList(void) const
-{
-    QStringList list;
-    
-    list << "RC*";
-    
-    return list;
-}
-
 QUrl PX4RadioComponent::setupSource(void) const
 {
     return QUrl::fromUserInput("qrc:/qml/RadioComponent.qml");

src/AutoPilotPlugins/PX4/PX4RadioComponent.h

@@ -42,9 +42,7 @@ public:
     virtual QString iconResource(void) const;
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
-    virtual QString setupStateDescription(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QStringList paramFilterList(void) const;
     virtual QUrl summaryQmlSource(void) const;
     virtual QString prerequisiteSetup(void) const;
     

src/AutoPilotPlugins/PX4/PowerComponent.cc

@@ -62,30 +62,11 @@ bool PowerComponent::setupComplete(void) const
         _autopilot->getParameterFact(FactSystem::defaultComponentId, "BAT_N_CELLS")->rawValue().toInt() != 0;
 }
 
-QString PowerComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-
-    if (requiresSetup()) {
-        stateDescription = "Requires setup";
-    } else {
-        stateDescription = "Setup complete";
-    }
-    return QString(stateDescription);
-}
-
 QStringList PowerComponent::setupCompleteChangedTriggerList(void) const
 {
     return QStringList();
 }
 
-QStringList PowerComponent::paramFilterList(void) const
-{
-    QStringList list;
-
-    return list;
-}
-
 QUrl PowerComponent::setupSource(void) const
 {
     return QUrl::fromUserInput("qrc:/qml/PowerComponent.qml");

src/AutoPilotPlugins/PX4/PowerComponent.h

@@ -46,9 +46,7 @@ public:
     virtual QString     iconResource            (void) const;
     virtual bool        requiresSetup           (void) const;
     virtual bool        setupComplete           (void) const;
-    virtual QString     setupStateDescription   (void) const;
     virtual QUrl        setupSource             (void) const;
-    virtual QStringList paramFilterList         (void) const;
     virtual QUrl        summaryQmlSource        (void) const;
     virtual QString     prerequisiteSetup       (void) const;
     

src/AutoPilotPlugins/PX4/SafetyComponent.cc

@@ -60,30 +60,11 @@ bool SafetyComponent::setupComplete(void) const
     return true;
 }
 
-QString SafetyComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-
-    if (requiresSetup()) {
-        stateDescription = "Requires setup";
-    } else {
-        stateDescription = "Setup complete";
-    }
-    return QString(stateDescription);
-}
-
 QStringList SafetyComponent::setupCompleteChangedTriggerList(void) const
 {
     return QStringList();
 }
 
-QStringList SafetyComponent::paramFilterList(void) const
-{
-    QStringList list;
-
-    return list;
-}
-
 QUrl SafetyComponent::setupSource(void) const
 {
     return QUrl::fromUserInput("qrc:/qml/SafetyComponent.qml");

src/AutoPilotPlugins/PX4/SafetyComponent.h

@@ -47,9 +47,7 @@ public:
     virtual QString iconResource(void) const;
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
-    virtual QString setupStateDescription(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QStringList paramFilterList(void) const;
     virtual QUrl summaryQmlSource(void) const;
     virtual QString prerequisiteSetup(void) const;
     

src/AutoPilotPlugins/PX4/SensorsComponent.cc

@@ -70,18 +70,6 @@ bool SensorsComponent::setupComplete(void) const
     return true;
 }
 
-QString SensorsComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-    
-    if (requiresSetup()) {
-        stateDescription = "Requires calibration";
-    } else {
-        stateDescription = "Calibrated";
-    }
-    return QString(stateDescription);
-}
-
 QStringList SensorsComponent::setupCompleteChangedTriggerList(void) const
 {
     QStringList triggers;
@@ -105,15 +93,6 @@ QStringList SensorsComponent::setupCompleteChangedTriggerList(void) const
     return triggers;
 }
 
-QStringList SensorsComponent::paramFilterList(void) const
-{
-    QStringList list;
-    
-    list << "SENS_*" << "CAL_*";
-    
-    return list;
-}
-
 QUrl SensorsComponent::setupSource(void) const
 {
     return QUrl::fromUserInput("qrc:/qml/SensorsComponent.qml");

src/AutoPilotPlugins/PX4/SensorsComponent.h

@@ -46,9 +46,7 @@ public:
     virtual QString iconResource(void) const;
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
-    virtual QString setupStateDescription(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QStringList paramFilterList(void) const;
     virtual QUrl summaryQmlSource(void) const;
     virtual QString prerequisiteSetup(void) const;
     

src/VehicleSetup/VehicleComponent.h

@@ -46,7 +46,6 @@ class VehicleComponent : public QObject
     Q_PROPERTY(QString description READ description CONSTANT)
     Q_PROPERTY(bool requiresSetup READ requiresSetup CONSTANT)
     Q_PROPERTY(bool setupComplete READ setupComplete STORED false NOTIFY setupCompleteChanged)
-    Q_PROPERTY(QString setupStateDescription READ setupStateDescription STORED false)
     Q_PROPERTY(QString iconResource READ iconResource CONSTANT)
     Q_PROPERTY(QUrl setupSource READ setupSource CONSTANT)
     Q_PROPERTY(QUrl summaryQmlSource READ summaryQmlSource CONSTANT)
@@ -61,9 +60,7 @@ public:
     virtual QString iconResource(void) const = 0;
     virtual bool requiresSetup(void) const = 0;
     virtual bool setupComplete(void) const = 0;
-    virtual QString setupStateDescription(void) const = 0;
     virtual QUrl setupSource(void) const = 0;
-    virtual QStringList paramFilterList(void) const = 0;
     virtual QUrl summaryQmlSource(void) const = 0;
     virtual QString prerequisiteSetup(void) const = 0;