From 622101f11343175990ef3c32b3c497594cb55c1b Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 25 Oct 2017 16:50:00 +0200 Subject: [PATCH] Ref T118, formatted CDistributor --- src/blackmisc/simulation/distributor.cpp | 38 +++++++++--------------- src/blackmisc/simulation/distributor.h | 18 +++++------ 2 files changed, 23 insertions(+), 33 deletions(-) diff --git a/src/blackmisc/simulation/distributor.cpp b/src/blackmisc/simulation/distributor.cpp index c08dd64b0..ef510208e 100644 --- a/src/blackmisc/simulation/distributor.cpp +++ b/src/blackmisc/simulation/distributor.cpp @@ -59,7 +59,7 @@ namespace BlackMisc bool CDistributor::matchesSimulator(const CSimulatorInfo &simulator) const { - return this->m_simulator.matchesAny(simulator); + return m_simulator.matchesAny(simulator); } CVariant CDistributor::propertyByIndex(const CPropertyIndex &index) const @@ -71,9 +71,9 @@ namespace BlackMisc const ColumnIndex i = index.frontCasted(); switch (i) { - case IndexAlias1: return CVariant::from(this->m_alias1); - case IndexAlias2: return CVariant::from(this->m_alias2); - case IndexDescription: return CVariant::from(this->m_description); + case IndexAlias1: return CVariant::from(m_alias1); + case IndexAlias2: return CVariant::from(m_alias2); + case IndexDescription: return CVariant::from(m_description); case IndexSimulator: return m_simulator.propertyByIndex(index.copyFrontRemoved()); default: return CValueObject::propertyByIndex(index); @@ -89,21 +89,11 @@ namespace BlackMisc const ColumnIndex i = index.frontCasted(); switch (i) { - case IndexAlias1: - this->m_alias1 = variant.value(); - break; - case IndexAlias2: - this->m_alias2 = variant.value(); - break; - case IndexDescription: - this->m_description = variant.value(); - break; - case IndexSimulator: - this->m_simulator.setPropertyByIndex(index.copyFrontRemoved(), variant); - break; - default: - CValueObject::setPropertyByIndex(index, variant); - break; + case IndexAlias1: m_alias1 = variant.value(); break; + case IndexAlias2: m_alias2 = variant.value(); break; + case IndexDescription: m_description = variant.value(); break; + case IndexSimulator: m_simulator.setPropertyByIndex(index.copyFrontRemoved(), variant); break; + default: CValueObject::setPropertyByIndex(index, variant); break; } } @@ -115,10 +105,10 @@ namespace BlackMisc const ColumnIndex i = index.frontCasted(); switch (i) { - case IndexAlias1: return this->m_alias1.compare(compareValue.m_alias1, Qt::CaseInsensitive); - case IndexAlias2: return this->m_alias2.compare(compareValue.m_alias2, Qt::CaseInsensitive); - case IndexDescription: return this->m_description.compare(compareValue.getDescription(), Qt::CaseInsensitive); - case IndexSimulator: return this->m_simulator.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.m_simulator); + case IndexAlias1: return m_alias1.compare(compareValue.m_alias1, Qt::CaseInsensitive); + case IndexAlias2: return m_alias2.compare(compareValue.m_alias2, Qt::CaseInsensitive); + case IndexDescription: return m_description.compare(compareValue.getDescription(), Qt::CaseInsensitive); + case IndexSimulator: return m_simulator.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.m_simulator); default: break; } @@ -137,7 +127,7 @@ namespace BlackMisc bool CDistributor::hasCompleteData() const { - return !this->m_description.isEmpty() && !this->m_dbKey.isEmpty(); + return !m_description.isEmpty() && !m_dbKey.isEmpty(); } CStatusMessageList CDistributor::validate() const diff --git a/src/blackmisc/simulation/distributor.h b/src/blackmisc/simulation/distributor.h index c02a7e2a7..100b9803c 100644 --- a/src/blackmisc/simulation/distributor.h +++ b/src/blackmisc/simulation/distributor.h @@ -56,34 +56,34 @@ namespace BlackMisc CDistributor(const QString &id, const QString &description, const QString &alias1, const QString &alias2, const BlackMisc::Simulation::CSimulatorInfo &simulator = BlackMisc::Simulation::CSimulatorInfo()); //! Get description - const QString &getDescription() const { return this->m_description;} + const QString &getDescription() const { return m_description;} //! Get id and description const QString getIdAndDescription() const; //! Set description - void setDescription(const QString &description) { this->m_description = description.trimmed(); } + void setDescription(const QString &description) { m_description = description.trimmed(); } //! Has description - bool hasDescription() const { return !this->m_description.isEmpty(); } + bool hasDescription() const { return !m_description.isEmpty(); } //! Get alias1 - const QString &getAlias1() const { return this->m_alias1;} + const QString &getAlias1() const { return m_alias1;} //! Get alias2 - const QString &getAlias2() const { return this->m_alias2;} + const QString &getAlias2() const { return m_alias2;} //! Set alias1 - void setAlias1(const QString &alias) { this->m_alias1 = alias.trimmed().toUpper(); } + void setAlias1(const QString &alias) { m_alias1 = alias.trimmed().toUpper(); } //! Set alias2 - void setAlias2(const QString &alias) { this->m_alias2 = alias.trimmed().toUpper(); } + void setAlias2(const QString &alias) { m_alias2 = alias.trimmed().toUpper(); } //! Alias 1? - bool hasAlias1() const { return !this->m_alias1.isEmpty(); } + bool hasAlias1() const { return !m_alias1.isEmpty(); } //! Alias 2? - bool hasAlias2() const { return !this->m_alias2.isEmpty(); } + bool hasAlias2() const { return !m_alias2.isEmpty(); } //! Simulator const BlackMisc::Simulation::CSimulatorInfo &getSimulator() const { return m_simulator; }