From 2a3e0acf2313d5dd1fbe5e7b88cdec5f2de5f018 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Mon, 16 Mar 2015 17:04:16 +0000 Subject: [PATCH] refs #356 Update base class name in derived class method implementations. --- src/blackmisc/avaircraft.cpp | 4 ++-- src/blackmisc/avaircrafticao.cpp | 4 ++-- src/blackmisc/avaircraftsituation.cpp | 4 ++-- src/blackmisc/avairport.cpp | 4 ++-- src/blackmisc/avatcstation.cpp | 4 ++-- src/blackmisc/avcallsign.cpp | 4 ++-- src/blackmisc/aviation/aircraftlights.cpp | 4 ++-- src/blackmisc/aviation/aircraftparts.cpp | 4 ++-- src/blackmisc/aviomodulator.cpp | 4 ++-- src/blackmisc/coordinategeodetic.cpp | 4 ++-- src/blackmisc/namevariantpair.cpp | 4 ++-- src/blackmisc/nwaircraftmapping.cpp | 4 ++-- src/blackmisc/nwclient.cpp | 4 ++-- src/blackmisc/nwtextmessage.cpp | 4 ++-- src/blackmisc/nwuser.cpp | 4 ++-- src/blackmisc/pqphysicalquantity.cpp | 4 ++-- src/blackmisc/setkeyboardhotkey.cpp | 4 ++-- src/blackmisc/simulation/aircraftmodel.cpp | 4 ++-- src/blackmisc/statusmessage.cpp | 4 ++-- src/blackmisc/voiceroom.cpp | 4 ++-- src/blacksim/fscommon/aircraftcfgentries.cpp | 4 ++-- 21 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/blackmisc/avaircraft.cpp b/src/blackmisc/avaircraft.cpp index b426f01b9..0a4ee066d 100644 --- a/src/blackmisc/avaircraft.cpp +++ b/src/blackmisc/avaircraft.cpp @@ -190,7 +190,7 @@ namespace BlackMisc default: return (ICoordinateGeodetic::canHandleIndex(index)) ? ICoordinateGeodetic::propertyByIndex(index) : - CValueObject::propertyByIndex(index); + CValueObjectStdTuple::propertyByIndex(index); } } @@ -232,7 +232,7 @@ namespace BlackMisc this->m_parts.setPropertyByIndex(variant, index.copyFrontRemoved()); break; default: - CValueObject::setPropertyByIndex(variant, index); + CValueObjectStdTuple::setPropertyByIndex(variant, index); break; } } diff --git a/src/blackmisc/avaircrafticao.cpp b/src/blackmisc/avaircrafticao.cpp index 1f8a3ace2..95a0bfde0 100644 --- a/src/blackmisc/avaircrafticao.cpp +++ b/src/blackmisc/avaircrafticao.cpp @@ -117,7 +117,7 @@ namespace BlackMisc case IndexIsVtol: return CVariant::fromValue(this->isVtol()); default: - return CValueObject::propertyByIndex(index); + return CValueObjectStdTuple::propertyByIndex(index); } } @@ -145,7 +145,7 @@ namespace BlackMisc this->setAircraftColor(variant.value()); break; default: - CValueObject::setPropertyByIndex(variant, index); + CValueObjectStdTuple::setPropertyByIndex(variant, index); break; } } diff --git a/src/blackmisc/avaircraftsituation.cpp b/src/blackmisc/avaircraftsituation.cpp index 05a9ead74..fe8540160 100644 --- a/src/blackmisc/avaircraftsituation.cpp +++ b/src/blackmisc/avaircraftsituation.cpp @@ -62,7 +62,7 @@ namespace BlackMisc case IndexCallsign: return this->m_correspondingCallsign.propertyByIndex(index.copyFrontRemoved()); default: - return CValueObject::propertyByIndex(index); + return CValueObjectStdTuple::propertyByIndex(index); } } @@ -101,7 +101,7 @@ namespace BlackMisc this->m_correspondingCallsign.setPropertyByIndex(variant, index.copyFrontRemoved()); break; default: - CValueObject::setPropertyByIndex(variant, index); + CValueObjectStdTuple::setPropertyByIndex(variant, index); break; } } diff --git a/src/blackmisc/avairport.cpp b/src/blackmisc/avairport.cpp index 36f01848e..5833e9fee 100644 --- a/src/blackmisc/avairport.cpp +++ b/src/blackmisc/avairport.cpp @@ -89,7 +89,7 @@ namespace BlackMisc default: return (ICoordinateGeodetic::canHandleIndex(index)) ? ICoordinateGeodetic::propertyByIndex(index) : - CValueObject::propertyByIndex(index); + CValueObjectStdTuple::propertyByIndex(index); } } @@ -122,7 +122,7 @@ namespace BlackMisc this->m_distanceToOwnAircraft.setPropertyByIndex(variant, index.copyFrontRemoved()); break; default: - CValueObject::setPropertyByIndex(variant, index); + CValueObjectStdTuple::setPropertyByIndex(variant, index); break; } } diff --git a/src/blackmisc/avatcstation.cpp b/src/blackmisc/avatcstation.cpp index 942689276..46e875b08 100644 --- a/src/blackmisc/avatcstation.cpp +++ b/src/blackmisc/avatcstation.cpp @@ -306,7 +306,7 @@ namespace BlackMisc return this->m_voiceRoom.propertyByIndex(index.copyFrontRemoved()); default: if (ICoordinateGeodetic::canHandleIndex(index)) { return ICoordinateGeodetic::propertyByIndex(index); } - return CValueObject::propertyByIndex(index); + return CValueObjectStdTuple::propertyByIndex(index); } } @@ -356,7 +356,7 @@ namespace BlackMisc this->m_voiceRoom.setPropertyByIndex(variant, index.copyFrontRemoved()); break; default: - CValueObject::setPropertyByIndex(variant, index); + CValueObjectStdTuple::setPropertyByIndex(variant, index); break; } } diff --git a/src/blackmisc/avcallsign.cpp b/src/blackmisc/avcallsign.cpp index 249e79476..314c98864 100644 --- a/src/blackmisc/avcallsign.cpp +++ b/src/blackmisc/avcallsign.cpp @@ -162,7 +162,7 @@ namespace BlackMisc case IndexSuffix: return CVariant(this->getSuffix()); default: - return CValueObject::propertyByIndex(index); + return CValueObjectStdTuple::propertyByIndex(index); } } @@ -189,7 +189,7 @@ namespace BlackMisc this->m_telephonyDesignator = variant.toQString(); break; default: - return CValueObject::setPropertyByIndex(variant, index); + return CValueObjectStdTuple::setPropertyByIndex(variant, index); } } diff --git a/src/blackmisc/aviation/aircraftlights.cpp b/src/blackmisc/aviation/aircraftlights.cpp index f0c57e414..c43c4126f 100644 --- a/src/blackmisc/aviation/aircraftlights.cpp +++ b/src/blackmisc/aviation/aircraftlights.cpp @@ -68,7 +68,7 @@ namespace BlackMisc case IndexTaxi: return CVariant::from(m_taxiOn); default: - return CValueObject::propertyByIndex(index); + return CValueObjectStdTuple::propertyByIndex(index); } } @@ -102,7 +102,7 @@ namespace BlackMisc this->m_taxiOn = variant.toBool(); break; default: - CValueObject::setPropertyByIndex(variant, index); + CValueObjectStdTuple::setPropertyByIndex(variant, index); break; } } diff --git a/src/blackmisc/aviation/aircraftparts.cpp b/src/blackmisc/aviation/aircraftparts.cpp index 395f1b197..d0a68dcff 100644 --- a/src/blackmisc/aviation/aircraftparts.cpp +++ b/src/blackmisc/aviation/aircraftparts.cpp @@ -54,7 +54,7 @@ namespace BlackMisc case IndexSpoilersOut: return CVariant::fromValue(this->m_spoilersOut); default: - return CValueObject::propertyByIndex(index); + return CValueObjectStdTuple::propertyByIndex(index); } } @@ -93,7 +93,7 @@ namespace BlackMisc this->m_correspondingCallsign.setPropertyByIndex(variant, index.copyFrontRemoved()); break; default: - CValueObject::setPropertyByIndex(variant, index); + CValueObjectStdTuple::setPropertyByIndex(variant, index); break; } } diff --git a/src/blackmisc/aviomodulator.cpp b/src/blackmisc/aviomodulator.cpp index 5a95f24cb..4e1e2c58f 100644 --- a/src/blackmisc/aviomodulator.cpp +++ b/src/blackmisc/aviomodulator.cpp @@ -52,7 +52,7 @@ namespace BlackMisc case IndexOutputVolume: return CVariant::from(this->getVolumeOutput()); default: - return CValueObject::propertyByIndex(index); + return CValueObjectStdTuple, CAvionicsBase>::propertyByIndex(index); } } @@ -85,7 +85,7 @@ namespace BlackMisc this->setVolumeOutput(variant.toInt()); break; default: - CValueObject::setPropertyByIndex(variant, index); + CValueObjectStdTuple, CAvionicsBase>::setPropertyByIndex(variant, index); break; } } diff --git a/src/blackmisc/coordinategeodetic.cpp b/src/blackmisc/coordinategeodetic.cpp index 604dd0a6a..0c25e88f4 100644 --- a/src/blackmisc/coordinategeodetic.cpp +++ b/src/blackmisc/coordinategeodetic.cpp @@ -132,7 +132,7 @@ namespace BlackMisc } else { - return CValueObject::propertyByIndex(index.copyFrontRemoved()); + return CValueObjectStdTuple::propertyByIndex(index); } } @@ -165,7 +165,7 @@ namespace BlackMisc this->m_geodeticHeight.parseFromString(variant.toQString()); break; default: - CValueObject::setPropertyByIndex(variant, index); + CValueObjectStdTuple::setPropertyByIndex(variant, index); break; } } diff --git a/src/blackmisc/namevariantpair.cpp b/src/blackmisc/namevariantpair.cpp index 665b37e05..62bc385f5 100644 --- a/src/blackmisc/namevariantpair.cpp +++ b/src/blackmisc/namevariantpair.cpp @@ -65,7 +65,7 @@ namespace BlackMisc case IndexPixmap: return CVariant(this->m_icon.toPixmap()); default: - return CValueObject::propertyByIndex(index); + return CValueObjectStdTuple::propertyByIndex(index); } } @@ -100,7 +100,7 @@ namespace BlackMisc } break; default: - CValueObject::setPropertyByIndex(variant, index); + CValueObjectStdTuple::setPropertyByIndex(variant, index); break; } } diff --git a/src/blackmisc/nwaircraftmapping.cpp b/src/blackmisc/nwaircraftmapping.cpp index d38575f5f..0fd91577f 100644 --- a/src/blackmisc/nwaircraftmapping.cpp +++ b/src/blackmisc/nwaircraftmapping.cpp @@ -61,7 +61,7 @@ namespace BlackMisc case IndexSource: return QVariant::fromValue(this->m_source); default: - return CValueObject::propertyByIndex(index); + return CValueObjectStdTuple::propertyByIndex(index); } } @@ -91,7 +91,7 @@ namespace BlackMisc this->m_source = variant.toQString(); break; default: - CValueObject::setPropertyByIndex(variant, index); + CValueObjectStdTuple::setPropertyByIndex(variant, index); break; } } diff --git a/src/blackmisc/nwclient.cpp b/src/blackmisc/nwclient.cpp index d8e3ebe4a..c51546f8c 100644 --- a/src/blackmisc/nwclient.cpp +++ b/src/blackmisc/nwclient.cpp @@ -112,7 +112,7 @@ namespace BlackMisc case IndexVoiceCapabilitiesString: return CVariant(this->m_voiceCapabilities.toQString(true)); default: - return CValueObject::propertyByIndex(index); + return CValueObjectStdTuple::propertyByIndex(index); } } @@ -148,7 +148,7 @@ namespace BlackMisc this->m_voiceCapabilities.setPropertyByIndex(variant, index.copyFrontRemoved()); break; default: - CValueObject::setPropertyByIndex(variant, index); + CValueObjectStdTuple::setPropertyByIndex(variant, index); break; } } diff --git a/src/blackmisc/nwtextmessage.cpp b/src/blackmisc/nwtextmessage.cpp index c325cdaf1..b83341a6d 100644 --- a/src/blackmisc/nwtextmessage.cpp +++ b/src/blackmisc/nwtextmessage.cpp @@ -203,7 +203,7 @@ namespace BlackMisc case IndexMessage: return CVariant::fromValue(this->m_message); default: - return CValueObject::propertyByIndex(index); + return CValueObjectStdTuple::propertyByIndex(index); } } @@ -229,7 +229,7 @@ namespace BlackMisc this->m_message = variant.value(); break; default: - CValueObject::setPropertyByIndex(variant, index); + CValueObjectStdTuple::setPropertyByIndex(variant, index); break; } } diff --git a/src/blackmisc/nwuser.cpp b/src/blackmisc/nwuser.cpp index d3249a20a..07ba0a778 100644 --- a/src/blackmisc/nwuser.cpp +++ b/src/blackmisc/nwuser.cpp @@ -191,7 +191,7 @@ namespace BlackMisc case IndexCallsign: return this->m_callsign.propertyByIndex(index.copyFrontRemoved()); default: - return CValueObject::propertyByIndex(index); + return CValueObjectStdTuple::propertyByIndex(index); } } @@ -224,7 +224,7 @@ namespace BlackMisc this->m_callsign.setPropertyByIndex(variant, index.copyFrontRemoved()); break; default: - CValueObject::setPropertyByIndex(variant, index); + CValueObjectStdTuple::setPropertyByIndex(variant, index); break; } } diff --git a/src/blackmisc/pqphysicalquantity.cpp b/src/blackmisc/pqphysicalquantity.cpp index b1ae81b95..a8df96080 100644 --- a/src/blackmisc/pqphysicalquantity.cpp +++ b/src/blackmisc/pqphysicalquantity.cpp @@ -311,7 +311,7 @@ namespace BlackMisc case IndexValueRounded6DigitsWithUnit: return CVariant::from(this->valueRoundedWithUnit(6)); default: - return CValueObject::propertyByIndex(index); + return CValueObjectStdTuple>::propertyByIndex(index); } } @@ -342,7 +342,7 @@ namespace BlackMisc this->parseFromString(variant.toQString()); break; default: - CValueObject::setPropertyByIndex(variant, index); + CValueObjectStdTuple>::setPropertyByIndex(variant, index); break; } } diff --git a/src/blackmisc/setkeyboardhotkey.cpp b/src/blackmisc/setkeyboardhotkey.cpp index 9952eeacb..4345137bf 100644 --- a/src/blackmisc/setkeyboardhotkey.cpp +++ b/src/blackmisc/setkeyboardhotkey.cpp @@ -65,7 +65,7 @@ namespace BlackMisc case IndexKeyAsStringRepresentation: return CVariant::from(m_key.getKeyAsStringRepresentation()); default: - return CValueObject::propertyByIndex(index); + return CValueObjectStdTuple::propertyByIndex(index); } } @@ -106,7 +106,7 @@ namespace BlackMisc this->setObject(variant.value()); break; default: - CValueObject::setPropertyByIndex(variant, index); + CValueObjectStdTuple::setPropertyByIndex(variant, index); break; } } diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp index dd60e8724..2e45281f8 100644 --- a/src/blackmisc/simulation/aircraftmodel.cpp +++ b/src/blackmisc/simulation/aircraftmodel.cpp @@ -56,7 +56,7 @@ namespace BlackMisc case IndexCallsign: return m_callsign.propertyByIndex(index.copyFrontRemoved()); default: - return CValueObject::propertyByIndex(index); + return CValueObjectStdTuple::propertyByIndex(index); } } @@ -89,7 +89,7 @@ namespace BlackMisc this->m_modelType = variant.toInt(); break; default: - CValueObject::setPropertyByIndex(variant, index); + CValueObjectStdTuple::setPropertyByIndex(variant, index); break; } } diff --git a/src/blackmisc/statusmessage.cpp b/src/blackmisc/statusmessage.cpp index 4ac24beb5..823451477 100644 --- a/src/blackmisc/statusmessage.cpp +++ b/src/blackmisc/statusmessage.cpp @@ -262,7 +262,7 @@ namespace BlackMisc case IndexCategoryHumanReadable: return CVariant::from(this->getHumanReadableCategory()); default: - return CValueObject::propertyByIndex(index); + return CValueObjectStdTuple::propertyByIndex(index); } } @@ -286,7 +286,7 @@ namespace BlackMisc this->m_categories = variant.value(); break; default: - CValueObject::setPropertyByIndex(variant, index); + CValueObjectStdTuple::setPropertyByIndex(variant, index); break; } } diff --git a/src/blackmisc/voiceroom.cpp b/src/blackmisc/voiceroom.cpp index 2b8847367..72ecde7f3 100644 --- a/src/blackmisc/voiceroom.cpp +++ b/src/blackmisc/voiceroom.cpp @@ -48,7 +48,7 @@ namespace BlackMisc case IndexUrl: return CVariant::from(this->getVoiceRoomUrl()); default: - return CValueObject::propertyByIndex(index); + return CValueObjectStdTuple::propertyByIndex(index); } } @@ -82,7 +82,7 @@ namespace BlackMisc this->setVoiceRoomUrl(variant.value()); break; default: - CValueObject::setPropertyByIndex(variant, index); + CValueObjectStdTuple::setPropertyByIndex(variant, index); break; } } diff --git a/src/blacksim/fscommon/aircraftcfgentries.cpp b/src/blacksim/fscommon/aircraftcfgentries.cpp index 38e4cf8d5..c4d84d9f2 100644 --- a/src/blacksim/fscommon/aircraftcfgentries.cpp +++ b/src/blacksim/fscommon/aircraftcfgentries.cpp @@ -106,7 +106,7 @@ namespace BlackSim case IndexDescription: return CVariant::from(this->m_description); default: - return CValueObject::propertyByIndex(index); + return CValueObjectStdTuple::propertyByIndex(index); } } @@ -144,7 +144,7 @@ namespace BlackSim this->setTexture(variant.toQString()); break; default: - CValueObject::setPropertyByIndex(variant, index); + CValueObjectStdTuple::setPropertyByIndex(variant, index); break; } }