fix(DialPlan): indent code correctly, avoid usage of deprecated atoi function, use string refs...

src/dial-plan/dial-plan-p.h

@@ -28,13 +28,14 @@
 LINPHONE_BEGIN_NAMESPACE
 
 class DialPlanPrivate : public ClonableObjectPrivate {
-
-public:
+private:
 	std::string country;
-	std::string isoCountryCode; /* ISO 3166-1 alpha-2 code, ex: FR for France*/
-	std::string countryCallingCode; /*country calling code*/
-	int nationalNumberLength = 0; /*maximum national number length*/
-	std::string internationalCallPrefix; /*international call prefix, ex: 00 in europe*/
+	std::string isoCountryCode; // ISO 3166-1 alpha-2 code, ex: FR for France.
+	std::string countryCallingCode; // Country calling code.
+	int nationalNumberLength = 0; // Maximum national number length.
+	std::string internationalCallPrefix; // International call prefix, ex: 00 in europe.
+
+	static const std::list<DialPlan> DialPlans;
 
 	L_DECLARE_PUBLIC(DialPlan);
 };

src/dial-plan/dial-plan.h

@@ -32,30 +32,33 @@ class DialPlanPrivate;
 
 class LINPHONE_PUBLIC DialPlan : public ClonableObject {
 public:
-	DialPlan (const std::string &country = "", const std::string &isoCountryCode = "", const std::string &ccc = "", int nnl = 0, const std::string &icp = "");
+	DialPlan (
+		const std::string &country = "",
+		const std::string &isoCountryCode = "",
+		const std::string &ccc = "",
+		int nnl = 0,
+		const std::string &icp = ""
+	);
 	DialPlan (const DialPlan &src);
-	~DialPlan ();
 
 	DialPlan &operator= (const DialPlan &src);
 
-	const std::string& getCountry() const;
-	const std::string& getIsoCountryCode() const;
-	const std::string& getCountryCallingCode() const;
-	int getNationalNumberLength() const;
-	const std::string& getInternationalCallPrefix() const;
-	bool isGeneric() const;
+	const std::string &getCountry () const;
+	const std::string &getIsoCountryCode () const;
+	const std::string &getCountryCallingCode () const;
+	int getNationalNumberLength () const;
+	const std::string &getInternationalCallPrefix () const;
+	bool isGeneric () const;
 
 	static const DialPlan MostCommon;
 
-	static int lookupCccFromE164(std::string e164);
-	static int lookupCccFromIso(std::string iso);
-	static const DialPlan& findByCccAsInt(int ccc);
-	static const DialPlan& findByCcc(const std::string& ccc);
-	static const std::list<DialPlan>& getAllDialPlans();
+	static int lookupCccFromE164 (const std::string &e164);
+	static int lookupCccFromIso (const std::string &iso);
+	static const DialPlan &findByCccAsInt (int ccc);
+	static const DialPlan &findByCcc (const std::string &ccc);
+	static const std::list<DialPlan> &getAllDialPlans ();
 
 private:
-	static std::list<DialPlan> const DialPlans;
-
 	L_DECLARE_PRIVATE(DialPlan);
 };