ref #701, "improved countries"

* utility function for "accent free" strings
* added 3 letter ISO, alias names
* improved searching in countries

src/blackmisc/country.h

@@ -40,9 +40,13 @@ namespace BlackMisc
         enum ColumnIndex
         {
             IndexIsoCode = BlackMisc::CPropertyIndex::GlobalIndexCCountry,
+            IndexIso3Code,
             IndexName,
+            IndexAlias1,
+            IndexAlias2,
             IndexNameIso,
-            IndexIsoName
+            IndexIsoName,
+            IndexHistoric
         };
 
         //! Constructor
@@ -60,15 +64,45 @@ namespace BlackMisc
         //! DB ISO code
         const QString &getIsoCode() const { return m_dbKey; }
 
+        //! Get 3 letter iso code
+        const QString &getIso3Code() const { return m_iso3; }
+
         //! Country ISO code (US, DE, GB, PL)
         void setIsoCode(const QString &iso);
 
+        //! Country ISO code (USA, DEU, GBR, POL)
+        void setIso3Code(const QString &iso);
+
         //! ISO code?
         bool hasIsoCode() const;
 
+        //! ISO 3 letter code?
+        bool hasIso3Code() const;
+
         //! Country name
         const QString &getName() const { return m_name; }
 
+        //! Country name (no accents ...)
+        const QString &getSimplifiedName() const { return m_simplifiedName; }
+
+        //! Alias 1
+        const QString &getAlias1() const { return m_alias1; }
+
+        //! Alias 1
+        void setAlias1(const QString &alias);
+
+        //! Alias 2
+        const QString &getAlias2() const { return m_alias2; }
+
+        //! Alias 2
+        void setAlias2(const QString &alias);
+
+        //! Historic / non-existing country (e.g. Soviet Union)
+        bool isHistoric() const { return m_historic; }
+
+        //! Historic country?
+        void setHistoric(bool historic) { m_historic = historic; }
+
         //! Combined string ISO/name
         QString getCombinedStringIsoName() const;
 
@@ -81,6 +115,9 @@ namespace BlackMisc
         //! Matches country name
         bool matchesCountryName(const QString &name) const;
 
+        //! Matches alias
+        bool matchesAlias(const QString &alias) const;
+
         //! \copydoc BlackMisc::Mixin::String::toQString
         QString convertToQString(bool i18n = false) const;
 
@@ -100,13 +137,26 @@ namespace BlackMisc
         static bool isValidIsoCode(const QString &isoCode);
 
     private:
-        QString m_name; //!< country name
+        //! Set a simplified name if not equal to "official name"
+        void setSimplifiedNameIfNotSame();
+
+        QString m_iso3;              //!< 3 letter code
+        QString m_name;              //!< country name
+        QString m_simplifiedName;    //!< no accent characters
+        QString m_alias1;            //!< 1st alias
+        QString m_alias2;            //!< 2nd alias
+        bool    m_historic = false;  //!< historic country
 
         BLACK_METACLASS(
             CCountry,
             BLACK_METAMEMBER(dbKey),
             BLACK_METAMEMBER(timestampMSecsSinceEpoch),
-            BLACK_METAMEMBER(name)
+            BLACK_METAMEMBER(iso3),
+            BLACK_METAMEMBER(name),
+            BLACK_METAMEMBER(simplifiedName),
+            BLACK_METAMEMBER(alias1),
+            BLACK_METAMEMBER(alias2),
+            BLACK_METAMEMBER(historic)
         );
     };
 } // namespace