Browse Source

Use constants for accessing the properties of an object

Andreas Fetzer 10 years ago
parent
commit
6a06d02e8d
1 changed files with 12 additions and 11 deletions
  1. 12 11
      Libs/XNAT/Core/ctkXnatObject.cpp

+ 12 - 11
Libs/XNAT/Core/ctkXnatObject.cpp

@@ -22,9 +22,10 @@
 #include "ctkXnatObject.h"
 #include "ctkXnatObjectPrivate.h"
 
+#include "ctkXnatConstants.h"
 #include "ctkXnatDataModel.h"
-#include "ctkXnatSession.h"
 #include "ctkXnatDefaultSchemaTypes.h"
+#include "ctkXnatSession.h"
 
 #include <QDateTime>
 #include <QDebug>
@@ -79,13 +80,13 @@ void ctkXnatObject::setId(const QString& id)
 //----------------------------------------------------------------------------
 QString ctkXnatObject::name() const
 {
-  return property("name");
+  return property(ctkXnatObjectFields::NAME);
 }
 
 //----------------------------------------------------------------------------
 void ctkXnatObject::setName(const QString& name)
 {
-  setProperty("name", name);
+  setProperty(ctkXnatObjectFields::NAME, name);
 }
 
 //----------------------------------------------------------------------------
@@ -261,6 +262,12 @@ QString ctkXnatObject::schemaType() const
 }
 
 //----------------------------------------------------------------------------
+void ctkXnatObject::setSchemaType(const QString& schemaType)
+{
+  this->setProperty("xsiType", schemaType);
+}
+
+//----------------------------------------------------------------------------
 void ctkXnatObject::fetch()
 {
   Q_D(ctkXnatObject);
@@ -284,12 +291,6 @@ ctkXnatSession* ctkXnatObject::session() const
 }
 
 //----------------------------------------------------------------------------
-void ctkXnatObject::setSchemaType(const QString& schemaType)
-{
-  this->setProperty("xsiType", schemaType);
-}
-
-//----------------------------------------------------------------------------
 void ctkXnatObject::download(const QString& /*zipFilename*/)
 {
 }
@@ -323,13 +324,13 @@ void ctkXnatObject::fetchResources(const QString& path)
 
   foreach (ctkXnatObject* resource, resources)
   {
-    QString label = resource->property("label");
+    QString label = resource->property(ctkXnatObjectFields::LABEL);
     if (label.isEmpty())
     {
       label = "NO NAME";
     }
 
-    resource->setProperty("label", label);
+    resource->setProperty(ctkXnatObjectFields::LABEL, label);
     this->add(resource);
   }
 }