fly/flightgear
1
0
Fork 0
Code Activity

Add-ons: rename ContactTraits to contact_traits for style consistency

Browse source 
This will be consistent with other traits classes such as
shared_ptr_traits (in flightgear::addons as well as in nasal
namespaces).
This commit is contained in:
Florent Rougon 2018-01-04 18:59:15 +01:00
parent 59d8dea0d7
commit a999b87e06
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Add-ons/Addon.cxx
View file

@ -500,10 +500,10 @@ parseContactsNode_readNode(const SGPath& metadataFile,
// Static method template (private and only used in this file)
template <class T>
vector<typename ContactTraits<T>::strong_ref>
vector<typename contact_traits<T>::strong_ref>
Addon::parseContactsNode(const SGPath& metadataFile, SGPropertyNode* mainNode)
{
using contactTraits = ContactTraits<T>;
using contactTraits = contact_traits<T>;
vector<typename contactTraits::strong_ref> res;
if (mainNode != nullptr) {

2
src/Add-ons/Addon.hxx
View file

@ -182,7 +182,7 @@ private:
// Return the corresponding vector<AuthorRef> or vector<MaintainerRef>. If
// the 'mainNode' argument is nullptr, return an empty vector.
template <class T>
static std::vector<typename ContactTraits<T>::strong_ref>
static std::vector<typename contact_traits<T>::strong_ref>
parseContactsNode(const SGPath& metadataFile, SGPropertyNode* mainNode);
// The add-on identifier, in reverse DNS style. The AddonManager refuses to

8
src/Add-ons/contacts.hxx
View file

@ -89,14 +89,14 @@ public:
};
// ***************************************************************************
// * ContactTraits *
// * contact_traits *
// ***************************************************************************
template <typename T>
struct ContactTraits;
struct contact_traits;
template<>
struct ContactTraits<Author>
struct contact_traits<Author>
{
using contact_type = Author;
using strong_ref = AuthorRef;
@ -108,7 +108,7 @@ struct ContactTraits<Author>
};
template<>
struct ContactTraits<Maintainer>
struct contact_traits<Maintainer>
{
using contact_type = Maintainer;
using strong_ref = MaintainerRef;