comparison common/Objects.h @ 4:719a4f477098 classical-rdf

* Add Classical Archives composer list importer; run it

 #include <QSet>
 #include <QMutex>
 #include <QMutexLocker>
 #include <QMap>
 
+extern unsigned int qHash(const QUrl &u);
+
 namespace ClassicalData {
 
 class HistoricalEvent : public QObject
 {
     Q_OBJECT

 class Composer : public NamedEntity
 {
     Q_OBJECT
 
     Q_PROPERTY(QString gender READ gender WRITE setGender STORED true)
-    Q_PROPERTY(QString nationality READ nationality WRITE setNationality STORED true)
+    Q_PROPERTY(QSet<QString> nationality READ nationality WRITE setNationality STORED true)
+    Q_PROPERTY(QSet<QUrl> geonameURIs READ geonameURIs WRITE setGeonameURIs STORED true)
     Q_PROPERTY(QString period READ period WRITE setPeriod STORED true)
     Q_PROPERTY(ClassicalData::Birth *birth READ birth WRITE setBirth STORED true)
     Q_PROPERTY(ClassicalData::Death *death READ death WRITE setDeath STORED true)
 
 public:
     Composer(QObject *parent = 0) : NamedEntity(parent), m_birth(0), m_death(0) { }
 
     QString gender() const { return m_gender; }
     void setGender(QString n) { m_gender = n; }
 
-    QString nationality() const { return m_nationality; }
-    void setNationality(QString n) { m_nationality = n; }
+    QSet<QString> nationality() const { return m_nationality; }
+    void setNationality(QSet<QString> n) { m_nationality = n; }
+    void addNationality(QString n) { m_nationality.insert(n); }
+
+    QSet<QUrl> geonameURIs() const { return m_geonameURIs; }
+    void setGeonameURIs(QSet<QUrl> n) { m_geonameURIs = n; }
+    void addGeonameURI(QUrl n) { m_geonameURIs.insert(n); }
 
     QString period() const { return m_period; }
     void setPeriod(QString n) { m_period = n; }
 
     Birth *birth() { return m_birth; }

     QString getSortName(bool caps) const;
     QString getDisplayDates() const;
 
 private:
     QString m_gender;
-    QString m_nationality;
+    QSet<QString> m_nationality;
+    QSet<QUrl> m_geonameURIs;
     QString m_period;
     Birth *m_birth;
     Death *m_death;
 };
 

 Q_DECLARE_METATYPE(ClassicalData::Composition*);
 Q_DECLARE_METATYPE(ClassicalData::Work*);
 Q_DECLARE_METATYPE(ClassicalData::Movement*);
 Q_DECLARE_METATYPE(ClassicalData::Document*);
 Q_DECLARE_METATYPE(QSet<QString>);
+Q_DECLARE_METATYPE(QSet<QUrl>);
 Q_DECLARE_METATYPE(QSet<ClassicalData::Work*>);
 Q_DECLARE_METATYPE(QSet<ClassicalData::Movement*>);
 Q_DECLARE_METATYPE(QSet<ClassicalData::Document*>);
 Q_DECLARE_METATYPE(ClassicalData::Composer*);
 Q_DECLARE_METATYPE(ClassicalData::Form*);