diff --git a/Personnage/Personnage.cpp b/Personnage/Personnage.cpp index 80ba946..2dc40ae 100644 --- a/Personnage/Personnage.cpp +++ b/Personnage/Personnage.cpp @@ -17,10 +17,10 @@ Personnage::Personnage() Personnage::Personnage(const std::string &name, const std::string &pv) - : name(name), pv(pv) + : m_name(name), m_pv(pv) {} -const string &Personnage::getName() const +const string &Personnage::name() const { - return name; + return m_name; } diff --git a/Personnage/Personnage.h b/Personnage/Personnage.h index af7b9a0..1b2567d 100644 --- a/Personnage/Personnage.h +++ b/Personnage/Personnage.h @@ -10,12 +10,12 @@ class Personnage { private: - std::string name; - std::string pv; + std::string m_name; + std::string m_pv; public: virtual void parler(const std::string &message) const; - const std::string &getName() const; + const std::string &name() const; Personnage(); diff --git a/main.cpp b/main.cpp index 94c7a91..2587868 100644 --- a/main.cpp +++ b/main.cpp @@ -77,17 +77,17 @@ int main() // alpha's name is "greater" than x's name, // alpha should be "smallest", // fix that - if (alpha->getName().compare(x->getName()) > 0) + if (alpha->name().compare(x->name()) > 0) { alpha = x; } // omega's name is "smaller" than x's name, // omega should be "greatest", // fix that - if (omega->getName().compare(x->getName()) < 0) + if (omega->name().compare(x->name()) < 0) { omega = x; } }); - cout << endl << "alpha: " << alpha->getName() << " omega: " << omega->getName() << endl; + cout << endl << "alpha: " << alpha->name() << " omega: " << omega->name() << endl;