Use properties for fields that are accessible via the rest api instead of members

of the private implementation.
Use the object field constants for accessing the properties.

Conflicts:

	Libs/XNAT/Core/ctkXnatProject.cpp

Libs/XNAT/Core/ctkXnatProject.cpp

@@ -40,15 +40,9 @@ public:
 
   void reset()
   {
-    secondaryId.clear();
-    piFirstName.clear();
-    piLastName.clear();
 //    uri.clear();
   }
 
-  QString secondaryId;
-  QString piFirstName;
-  QString piLastName;
 //  QString uri;
 };
 
@@ -79,43 +73,37 @@ QString ctkXnatProject::childDataType() const
 //----------------------------------------------------------------------------
 const QString& ctkXnatProject::secondaryId() const
 {
-  Q_D(const ctkXnatProject);
-  return d->secondaryId;
+  return property(ctkXnatObjectFields::SECONDARY_ID);
 }
 
 //----------------------------------------------------------------------------
 void ctkXnatProject::setSecondaryId(const QString& secondaryId)
 {
-  Q_D(ctkXnatProject);
-  d->secondaryId = secondaryId;
+  setProperty(ctkXnatObjectFields::SECONDARY_ID, secondaryId);
 }
 
 //----------------------------------------------------------------------------
 const QString& ctkXnatProject::piFirstName() const
 {
-  Q_D(const ctkXnatProject);
-  return d->piFirstName;
+  return property(ctkXnatObjectFields::PI_FIRSTNAME);
 }
 
 //----------------------------------------------------------------------------
 void ctkXnatProject::setPiFirstName(const QString& piFirstName)
 {
-  Q_D(ctkXnatProject);
-  d->piFirstName = piFirstName;
+  setProperty(ctkXnatObjectFields::PI_FIRSTNAME, piFirstName);
 }
 
 //----------------------------------------------------------------------------
 const QString& ctkXnatProject::piLastName() const
 {
-  Q_D(const ctkXnatProject);
-  return d->piLastName;
+  return property(ctkXnatObjectFields::PI_LASTNAME);
 }
 
 //----------------------------------------------------------------------------
 void ctkXnatProject::setPiLastName(const QString& piLastName)
 {
-  Q_D(ctkXnatProject);
-  d->piLastName = piLastName;
+  setProperty(ctkXnatObjectFields::PI_LASTNAME, piLastName);
 }
 
 //----------------------------------------------------------------------------
@@ -149,10 +137,10 @@ void ctkXnatProject::fetchImpl()
 
   foreach (ctkXnatObject* subject, subjects)
   {
-    QString label = subject->property("label");
+    QString label = subject->property(ctkXnatObjectFields::LABEL);
     if (!label.isEmpty())
     {
-      subject->setProperty("id", label);
+      subject->setProperty(ctkXnatObjectFields::ID, label);
     }
 
     this->add(subject);