Formatting, comments

This commit is contained in:
Klaus Basan
2016-01-25 03:36:36 +01:00
parent c54dd8560d
commit 6089dc1106
3 changed files with 14 additions and 7 deletions

View File

@@ -383,8 +383,9 @@ namespace BlackGui
CIdentifier CMappingComponent::mappingIdentifier() CIdentifier CMappingComponent::mappingIdentifier()
{ {
if (m_identifier.getName().isEmpty()) if (m_identifier.getName().isEmpty())
{
m_identifier = CIdentifier(QStringLiteral("MAPPINGCOMPONENT")); m_identifier = CIdentifier(QStringLiteral("MAPPINGCOMPONENT"));
}
return m_identifier; return m_identifier;
} }

View File

@@ -123,16 +123,21 @@ namespace BlackGui
void ps_onMenuHighlightInSimulator(const BlackMisc::Simulation::CSimulatedAircraft &aircraft); void ps_onMenuHighlightInSimulator(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
private: private:
//! Identifier for data send from this component
BlackMisc::CIdentifier mappingIdentifier(); BlackMisc::CIdentifier mappingIdentifier();
//! Update simulated aircraft view
void updateSimulatedAircraftView(bool forceUpdate = false); void updateSimulatedAircraftView(bool forceUpdate = false);
QScopedPointer<Ui::CMappingComponent> ui; QScopedPointer<Ui::CMappingComponent> ui;
QScopedPointer<CUpdateTimer> m_updateTimer; QScopedPointer<CUpdateTimer> m_updateTimer;
QCompleter *m_modelCompleter = nullptr; QCompleter *m_modelCompleter = nullptr;
bool m_missedSimulatedAircraftUpdate = true; bool m_missedSimulatedAircraftUpdate = true;
BlackGui::Views::CCheckBoxDelegate *m_currentMappingsViewDelegate = nullptr; BlackGui::Views::CCheckBoxDelegate *m_currentMappingsViewDelegate = nullptr;
BlackMisc::CIdentifier m_identifier; BlackMisc::CIdentifier m_identifier;
private slots: private slots:
//! Updated by timer
void ps_backgroundUpdate(); void ps_backgroundUpdate();
}; };

View File

@@ -371,7 +371,7 @@ namespace BlackGui
{ {
if (!filter) if (!filter)
{ {
this->removeFilter(); // empty filter this->removeFilter(); // clear filter
return; return;
} }
if (filter->isValid()) if (filter->isValid())
@@ -384,6 +384,7 @@ namespace BlackGui
} }
else else
{ {
// invalid filter, so clear filter
this->removeFilter(); this->removeFilter();
} }
} }