CTK naming conventions for getters

Libs/XNAT/Core/ctkXnatConnection.cpp

@@ -181,7 +181,7 @@ void ctkXnatConnection::fetch(const ctkXnatServer::Pointer& server)
 
 void ctkXnatConnection::fetch(const ctkXnatProject::Pointer& project)
 {
-  const QString& projectTitle = project->getId();
+  const QString& projectTitle = project->id();
 
   Q_D(ctkXnatConnection);
 
@@ -192,7 +192,7 @@ void ctkXnatConnection::fetch(const ctkXnatProject::Pointer& project)
 
   foreach (ctkXnatSubject* subject, subjects)
   {
-    QString label = subject->getProperty("label");
+    QString label = subject->property("label");
     if (label.size())
     {
       subject->setProperty("ID", label);
@@ -207,8 +207,8 @@ void ctkXnatConnection::fetch(const ctkXnatProject::Pointer& project)
 
 void ctkXnatConnection::fetch(const QSharedPointer<ctkXnatSubject>& subject)
 {
-  const QString& subjectName = subject->getId();
-  const QString& projectName = subject->getParent()->getId();
+  const QString& subjectName = subject->id();
+  const QString& projectName = subject->parent()->id();
 
   Q_D(ctkXnatConnection);
 
@@ -220,7 +220,7 @@ void ctkXnatConnection::fetch(const QSharedPointer<ctkXnatSubject>& subject)
 
   foreach (ctkXnatExperiment* experiment, experiments)
   {
-    QString label = experiment->getProperty ("label");
+    QString label = experiment->property ("label");
     if (label.size())
       experiment->setProperty ("ID", label);
     ctkXnatObject::Pointer ptr(experiment);
@@ -233,11 +233,11 @@ void ctkXnatConnection::fetch(const QSharedPointer<ctkXnatSubject>& subject)
 
 void ctkXnatConnection::fetch(const QSharedPointer<ctkXnatExperiment>& experiment)
 {
-  const QString& experimentName = experiment->getId();
-  ctkXnatObject::Pointer subject = experiment->getParent();
-  const QString& subjectName = subject->getId();
-  ctkXnatObject::Pointer project = subject->getParent();
-  const QString& projectName = project->getId();
+  const QString& experimentName = experiment->id();
+  ctkXnatObject::Pointer subject = experiment->parent();
+  const QString& subjectName = subject->id();
+  ctkXnatObject::Pointer project = subject->parent();
+  const QString& projectName = project->id();
 
   Q_D(ctkXnatConnection);
   
@@ -272,12 +272,12 @@ void ctkXnatConnection::fetch(const QSharedPointer<ctkXnatExperiment>& experimen
 
 void ctkXnatConnection::fetch(const QSharedPointer<ctkXnatScanFolder>& scanFolder)
 {
-  ctkXnatObject::Pointer experiment = scanFolder->getParent();
-  const QString& experimentName = experiment->getId();
-  ctkXnatObject::Pointer subject = experiment->getParent();
-  const QString& subjectName = subject->getId();
-  ctkXnatObject::Pointer project = subject->getParent();
-  const QString& projectName = project->getId();
+  ctkXnatObject::Pointer experiment = scanFolder->parent();
+  const QString& experimentName = experiment->id();
+  ctkXnatObject::Pointer subject = experiment->parent();
+  const QString& subjectName = subject->id();
+  ctkXnatObject::Pointer project = subject->parent();
+  const QString& projectName = project->id();
   
   Q_D(ctkXnatConnection);
   
@@ -300,13 +300,13 @@ void ctkXnatConnection::fetch(const QSharedPointer<ctkXnatScanFolder>& scanFolde
 
 void ctkXnatConnection::fetch(const QSharedPointer<ctkXnatScan>& scan)
 {
-  const QString& scanName = scan->getId();
-  ctkXnatObject::Pointer experiment = scan->getParent()->getParent();
-  const QString& experimentName = experiment->getId();
-  ctkXnatObject::Pointer subject = experiment->getParent();
-  const QString& subjectName = subject->getId();
-  ctkXnatObject::Pointer project = subject->getParent();
-  const QString& projectName = project->getId();
+  const QString& scanName = scan->id();
+  ctkXnatObject::Pointer experiment = scan->parent()->parent();
+  const QString& experimentName = experiment->id();
+  ctkXnatObject::Pointer subject = experiment->parent();
+  const QString& subjectName = subject->id();
+  ctkXnatObject::Pointer project = subject->parent();
+  const QString& projectName = project->id();
   
   Q_D(ctkXnatConnection);
   
@@ -318,7 +318,7 @@ void ctkXnatConnection::fetch(const QSharedPointer<ctkXnatScan>& scan)
   
   foreach (ctkXnatScanResource* resource, resources)
   {
-    QString label = resource->getProperty("label");
+    QString label = resource->property("label");
     if (label.size())
     {
       resource->setProperty("ID", label);
@@ -335,15 +335,15 @@ void ctkXnatConnection::fetch(const QSharedPointer<ctkXnatScan>& scan)
 
 void ctkXnatConnection::fetch(const QSharedPointer<ctkXnatScanResource>& scanResource)
 {
-  const QString& resourceName = scanResource->getProperty ("label");
-  ctkXnatObject::Pointer scan = scanResource->getParent();
-  const QString& scanName = scan->getId();
-  ctkXnatObject::Pointer experiment = scan->getParent()->getParent();
-  const QString& experimentName = experiment->getId();
-  ctkXnatObject::Pointer subject = experiment->getParent();
-  const QString& subjectName = subject->getId();
-  ctkXnatObject::Pointer project = subject->getParent();
-  const QString& projectName = project->getId();
+  const QString& resourceName = scanResource->property ("label");
+  ctkXnatObject::Pointer scan = scanResource->parent();
+  const QString& scanName = scan->id();
+  ctkXnatObject::Pointer experiment = scan->parent()->parent();
+  const QString& experimentName = experiment->id();
+  ctkXnatObject::Pointer subject = experiment->parent();
+  const QString& subjectName = subject->id();
+  ctkXnatObject::Pointer project = subject->parent();
+  const QString& projectName = project->id();
   
   Q_D(ctkXnatConnection);
   
@@ -355,13 +355,13 @@ void ctkXnatConnection::fetch(const QSharedPointer<ctkXnatScanResource>& scanRes
 
   foreach (ctkXnatScanResourceFile* file, files)
   {
-    QString uri = file->getProperty("URI");
+    QString uri = file->property("URI");
     if (uri.size())
     {
       file->setUri(uri);
     }
 
-    QString label = file->getProperty("Name");
+    QString label = file->property("Name");
     if (label.size())
     {
       file->setProperty("ID", label);

Libs/XNAT/Core/ctkXnatExperiment.cpp

@@ -35,10 +35,10 @@ public:
 
   void reset()
   {
-    uri.clear();
+//    uri.clear();
   }
   
-  QString uri;
+//  QString uri;
 };
 
 
@@ -58,17 +58,17 @@ ctkXnatExperiment::~ctkXnatExperiment()
 {
 }
 
-const QString& ctkXnatExperiment::uri() const
-{
-  Q_D(const ctkXnatExperiment);
-  return d->uri;
-}
+//const QString& ctkXnatExperiment::uri() const
+//{
+//  Q_D(const ctkXnatExperiment);
+//  return d->uri;
+//}
 
-void ctkXnatExperiment::setUri(const QString& uri)
-{
-  Q_D(ctkXnatExperiment);
-  d->uri = uri;
-}
+//void ctkXnatExperiment::setUri(const QString& uri)
+//{
+//  Q_D(ctkXnatExperiment);
+//  d->uri = uri;
+//}
 
 void ctkXnatExperiment::reset()
 {
@@ -79,7 +79,7 @@ void ctkXnatExperiment::fetchImpl()
 {
   Q_D(ctkXnatExperiment);
   ctkXnatObject::Pointer self = d->selfPtr;
-  this->getConnection()->fetch(self.staticCast<ctkXnatExperiment>());
+  this->connection()->fetch(self.staticCast<ctkXnatExperiment>());
 }
 
 void ctkXnatExperiment::remove()

Libs/XNAT/Core/ctkXnatExperiment.h

@@ -40,8 +40,8 @@ public:
   static Pointer Create();
   virtual ~ctkXnatExperiment();
   
-  const QString& uri() const;
-  void setUri(const QString& uri);
+//  const QString& uri() const;
+//  void setUri(const QString& uri);
   
   void reset();
   void remove();

Libs/XNAT/Core/ctkXnatObject.cpp

@@ -44,9 +44,9 @@ ctkXnatObject::~ctkXnatObject()
 {
 }
 
-QString ctkXnatObject::getId() const
+QString ctkXnatObject::id() const
 {
-  return getProperty("ID");
+  return property("ID");
 }
 
 void ctkXnatObject::setId(const QString& id)
@@ -54,17 +54,27 @@ void ctkXnatObject::setId(const QString& id)
   setProperty("ID", id);
 }
 
-QString ctkXnatObject::getName() const
+QString ctkXnatObject::uri() const
 {
-  return getProperty("name");
+  return property("URI");
 }
 
-QString ctkXnatObject::getDescription() const
+void ctkXnatObject::setUri(const QString& uri)
 {
-  return getProperty("description");
+  setProperty("URI", uri);
 }
 
-QString ctkXnatObject::getProperty(const QString& name) const
+QString ctkXnatObject::name() const
+{
+  return property("name");
+}
+
+QString ctkXnatObject::description() const
+{
+  return property("description");
+}
+
+QString ctkXnatObject::property(const QString& name) const
 {
   Q_D(const ctkXnatObject);
   ctkXnatObjectPrivate::PropertyMapConstInterator iter = d->properties.find(name);
@@ -82,7 +92,7 @@ void ctkXnatObject::setProperty(const QString& name, const QVariant& value)
 }
 
 
-QList<QString> ctkXnatObject::getProperties()
+QList<QString> ctkXnatObject::properties()
 {
   Q_D(ctkXnatObject);
   
@@ -98,13 +108,13 @@ QList<QString> ctkXnatObject::getProperties()
   return value;
 }
 
-ctkXnatObject::Pointer ctkXnatObject::getParent() const
+ctkXnatObject::Pointer ctkXnatObject::parent() const
 {
   Q_D(const ctkXnatObject);
   return d->parent;
 }
 
-QList<ctkXnatObject::Pointer> ctkXnatObject::getChildren() const
+QList<ctkXnatObject::Pointer> ctkXnatObject::children() const
 {
   Q_D(const ctkXnatObject);
   return d->children;
@@ -150,17 +160,17 @@ void ctkXnatObject::fetch()
   }
 }
 
-ctkXnatConnection* ctkXnatObject::getConnection() const
+ctkXnatConnection* ctkXnatObject::connection() const
 {
   const ctkXnatObject* xnatObject = this;
   const ctkXnatServer* server;
   do {
-    xnatObject = xnatObject->getParent().data();
+    xnatObject = xnatObject->parent().data();
     server = dynamic_cast<const ctkXnatServer*>(xnatObject);
   }
   while (xnatObject && !server);
 
-  return server ? xnatObject->getConnection() : 0;
+  return server ? xnatObject->connection() : 0;
 }
 
 

Libs/XNAT/Core/ctkXnatObject.h

@@ -43,17 +43,18 @@ public:
 
   virtual ~ctkXnatObject();
 
-  QString getId() const;
-  QString getName() const;
-  QString getDescription() const;
+  QString id() const;
+  QString uri() const;
+  QString name() const;
+  QString description() const;
 
-  QString getProperty(const QString& name) const;
+  QString property(const QString& name) const;
   void setProperty(const QString& name, const QVariant& value);
 
-  QList<QString> getProperties();
+  QList<QString> properties();
   
-  ctkXnatObject::Pointer getParent() const;
-  QList<ctkXnatObject::Pointer> getChildren() const;
+  ctkXnatObject::Pointer parent() const;
+  QList<ctkXnatObject::Pointer> children() const;
 
   void addChild(Pointer& child);
   void removeChild(Pointer& child);
@@ -80,9 +81,10 @@ protected:
   ctkXnatObject();
   ctkXnatObject(ctkXnatObjectPrivate& dd);
 
-  virtual ctkXnatConnection* getConnection() const;
+  virtual ctkXnatConnection* connection() const;
 
   void setId(const QString& id);
+  void setUri(const QString& uri);
   void setName(const QString& name);
   void setDescription(const QString& description);
 

Libs/XNAT/Core/ctkXnatProject.cpp

@@ -38,13 +38,13 @@ public:
     secondaryId.clear();
     piFirstName.clear();
     piLastName.clear();
-    uri.clear();
+//    uri.clear();
   }
 
   QString secondaryId;
   QString piFirstName;
   QString piLastName;
-  QString uri;
+//  QString uri;
 };
 
 ctkXnatProject::ctkXnatProject()
@@ -99,17 +99,17 @@ void ctkXnatProject::setPiLastName(const QString& piLastName)
   d->piLastName = piLastName;
 }
 
-const QString& ctkXnatProject::uri() const
-{
-  Q_D(const ctkXnatProject);
-  return d->uri;
-}
+//const QString& ctkXnatProject::uri() const
+//{
+//  Q_D(const ctkXnatProject);
+//  return d->uri;
+//}
 
-void ctkXnatProject::setUri(const QString& uri)
-{
-  Q_D(ctkXnatProject);
-  d->uri = uri;
-}
+//void ctkXnatProject::setUri(const QString& uri)
+//{
+//  Q_D(ctkXnatProject);
+//  d->uri = uri;
+//}
 
 void ctkXnatProject::reset()
 {
@@ -120,7 +120,7 @@ void ctkXnatProject::fetchImpl()
 {
   Q_D(ctkXnatProject);
   ctkXnatObject::Pointer self = d->selfPtr;
-  this->getConnection()->fetch(self.staticCast<ctkXnatProject>());
+  this->connection()->fetch(self.staticCast<ctkXnatProject>());
 }
 
 void ctkXnatProject::remove()

Libs/XNAT/Core/ctkXnatProject.h

@@ -50,8 +50,8 @@ public:
   const QString& piLastName() const;
   void setPiLastName(const QString& piLastName);
 
-  const QString& uri() const;
-  void setUri(const QString& uri);
+//  const QString& uri() const;
+//  void setUri(const QString& uri);
 
   void reset();
   void remove();

Libs/XNAT/Core/ctkXnatScan.cpp

@@ -79,7 +79,7 @@ void ctkXnatScan::fetchImpl()
 {
   Q_D(ctkXnatScan);
   ctkXnatObject::Pointer self = d->selfPtr;
-  this->getConnection()->fetch(self.staticCast<ctkXnatScan>());
+  this->connection()->fetch(self.staticCast<ctkXnatScan>());
 }
 
 void ctkXnatScan::remove()

Libs/XNAT/Core/ctkXnatScanFolder.cpp

@@ -36,17 +36,17 @@ public:
 
   void reset()
   {
-    uri.clear();
+//    uri.clear();
   }
   
-  QString uri;
+//  QString uri;
 };
 
 
 ctkXnatScanFolder::ctkXnatScanFolder()
 : ctkXnatObject(new ctkXnatScanFolderPrivate())
 {
-  this->setProperty("ID", "scans");
+  this->setProperty("ID", "Scans");
 }
 
 ctkXnatScanFolder::Pointer ctkXnatScanFolder::Create()
@@ -60,17 +60,17 @@ ctkXnatScanFolder::~ctkXnatScanFolder()
 {
 }
 
-const QString& ctkXnatScanFolder::uri() const
-{
-  Q_D(const ctkXnatScanFolder);
-  return d->uri;
-}
+//const QString& ctkXnatScanFolder::uri() const
+//{
+//  Q_D(const ctkXnatScanFolder);
+//  return d->uri;
+//}
 
-void ctkXnatScanFolder::setUri(const QString& uri)
-{
-  Q_D(ctkXnatScanFolder);
-  d->uri = uri;
-}
+//void ctkXnatScanFolder::setUri(const QString& uri)
+//{
+//  Q_D(ctkXnatScanFolder);
+//  d->uri = uri;
+//}
 
 void ctkXnatScanFolder::reset()
 {
@@ -81,7 +81,7 @@ void ctkXnatScanFolder::fetchImpl()
 {
   Q_D(ctkXnatScanFolder);
   ctkXnatObject::Pointer self = d->selfPtr;
-  this->getConnection()->fetch(self.staticCast<ctkXnatScanFolder>());
+  this->connection()->fetch(self.staticCast<ctkXnatScanFolder>());
 }
 
 void ctkXnatScanFolder::remove()

Libs/XNAT/Core/ctkXnatScanFolder.h

@@ -40,8 +40,8 @@ public:
   static Pointer Create();
   virtual ~ctkXnatScanFolder();
   
-  const QString& uri() const;
-  void setUri(const QString& uri);
+//  const QString& uri() const;
+//  void setUri(const QString& uri);
   
   void reset();
   void remove();

Libs/XNAT/Core/ctkXnatScanResource.cpp

@@ -36,10 +36,10 @@ public:
 
   void reset()
   {
-    uri.clear();
+//    uri.clear();
   }
   
-  QString uri;
+//  QString uri;
 };
 
 
@@ -59,17 +59,17 @@ ctkXnatScanResource::~ctkXnatScanResource()
 {
 }
 
-const QString& ctkXnatScanResource::uri() const
-{
-  Q_D(const ctkXnatScanResource);
-  return d->uri;
-}
+//const QString& ctkXnatScanResource::uri() const
+//{
+//  Q_D(const ctkXnatScanResource);
+//  return d->uri;
+//}
 
-void ctkXnatScanResource::setUri(const QString& uri)
-{
-  Q_D(ctkXnatScanResource);
-  d->uri = uri;
-}
+//void ctkXnatScanResource::setUri(const QString& uri)
+//{
+//  Q_D(ctkXnatScanResource);
+//  d->uri = uri;
+//}
 
 void ctkXnatScanResource::reset()
 {
@@ -80,12 +80,12 @@ void ctkXnatScanResource::fetchImpl()
 {
   Q_D(ctkXnatScanResource);
   ctkXnatObject::Pointer self = d->selfPtr;
-  this->getConnection()->fetch(self.staticCast<ctkXnatScanResource>());
+  this->connection()->fetch(self.staticCast<ctkXnatScanResource>());
 }
 
 void ctkXnatScanResource::download(const QString& filename)
 {
-  this->getConnection()->download(this, filename);
+  this->connection()->download(this, filename);
 }
 
 void ctkXnatScanResource::remove()

Libs/XNAT/Core/ctkXnatScanResource.h

@@ -40,8 +40,8 @@ public:
   static Pointer Create();
   virtual ~ctkXnatScanResource();
   
-  const QString& uri() const;
-  void setUri(const QString& uri);
+//  const QString& uri() const;
+//  void setUri(const QString& uri);
   
   void reset();
   void remove();

Libs/XNAT/Core/ctkXnatScanResourceFile.cpp

@@ -37,10 +37,10 @@ public:
 
   void reset()
   {
-    uri.clear();
+//    uri.clear();
   }
   
-  QString uri;
+//  QString uri;
 };
 
 ctkXnatScanResourceFile::ctkXnatScanResourceFile()
@@ -59,17 +59,17 @@ ctkXnatScanResourceFile::~ctkXnatScanResourceFile()
 {
 }
 
-const QString& ctkXnatScanResourceFile::uri() const
-{
-  Q_D(const ctkXnatScanResourceFile);
-  return d->uri;
-}
+//const QString& ctkXnatScanResourceFile::uri() const
+//{
+//  Q_D(const ctkXnatScanResourceFile);
+//  return d->uri;
+//}
 
-void ctkXnatScanResourceFile::setUri(const QString& uri)
-{
-  Q_D(ctkXnatScanResourceFile);
-  d->uri = uri;
-}
+//void ctkXnatScanResourceFile::setUri(const QString& uri)
+//{
+//  Q_D(ctkXnatScanResourceFile);
+//  d->uri = uri;
+//}
 
 void ctkXnatScanResourceFile::download(const QString& filename)
 {
@@ -78,7 +78,7 @@ void ctkXnatScanResourceFile::download(const QString& filename)
   qDebug() << "file uri is" << object->uri();
   qDebug() << "downloading towards: " << filename;
 
-  object->getConnection()->download (this, filename);
+  object->connection()->download(this, filename);
 }
 
 void ctkXnatScanResourceFile::upload(const QString& filename)

Libs/XNAT/Core/ctkXnatScanResourceFile.h

@@ -40,8 +40,8 @@ public:
   static Pointer Create();
   virtual ~ctkXnatScanResourceFile();
   
-  const QString& uri() const;
-  void setUri(const QString& uri);
+//  const QString& uri() const;
+//  void setUri(const QString& uri);
 
   void download(const QString& filename);
   void upload(const QString& filename);

Libs/XNAT/Core/ctkXnatServer.cpp

@@ -56,18 +56,18 @@ ctkXnatServer::Pointer ctkXnatServer::Create(ctkXnatConnection* connection)
 {
   Pointer server(new ctkXnatServer(connection));
   server->d_func()->selfPtr = server;
+  server->setUri(connection->url());
   return server;
 }
 
 void ctkXnatServer::fetchImpl()
 {
   Q_D(ctkXnatObject);
-  qDebug() << "Starting to fetch projects...";
   ctkXnatObject::Pointer self = d->selfPtr;
-  this->getConnection()->fetch(self.staticCast<ctkXnatServer>());
+  this->connection()->fetch(self.staticCast<ctkXnatServer>());
 }
 
-ctkXnatConnection* ctkXnatServer::getConnection() const
+ctkXnatConnection* ctkXnatServer::connection() const
 {
   Q_D(const ctkXnatServer);
   return d->connection;

Libs/XNAT/Core/ctkXnatServer.h

@@ -41,7 +41,7 @@ public:
 
 protected:
 
-  virtual ctkXnatConnection* getConnection() const;
+  virtual ctkXnatConnection* connection() const;
 
 private:
 

Libs/XNAT/Core/ctkXnatSubject.cpp

@@ -39,13 +39,13 @@ public:
   {
     insertDate.clear();
     insertUser.clear();
-    uri.clear();
+//    uri.clear();
     projects.clear();
   }
 
   QString insertDate;
   QString insertUser;
-  QString uri;
+//  QString uri;
 
   QList<ctkXnatProject::WeakPointer> projects;
 };
@@ -83,17 +83,17 @@ void ctkXnatSubject::setInsertUser(const QString& insertUser)
   d->insertUser = insertUser;
 }
 
-const QString& ctkXnatSubject::uri() const
-{
-  Q_D(const ctkXnatSubject);
-  return d->uri;
-}
+//const QString& ctkXnatSubject::uri() const
+//{
+//  Q_D(const ctkXnatSubject);
+//  return d->uri;
+//}
 
-void ctkXnatSubject::setUri(const QString& uri)
-{
-  Q_D(ctkXnatSubject);
-  d->uri = uri;
-}
+//void ctkXnatSubject::setUri(const QString& uri)
+//{
+//  Q_D(ctkXnatSubject);
+//  d->uri = uri;
+//}
 
 void ctkXnatSubject::reset()
 {
@@ -105,7 +105,7 @@ void ctkXnatSubject::fetchImpl()
 {
   Q_D(ctkXnatSubject);
   ctkXnatObject::Pointer self = d->selfPtr;
-  getConnection()->fetch(self.staticCast<ctkXnatSubject>());
+  connection()->fetch(self.staticCast<ctkXnatSubject>());
 }
 
 ctkXnatSubject::Pointer ctkXnatSubject::Create()

Libs/XNAT/Core/ctkXnatSubject.h

@@ -50,8 +50,8 @@ public:
   const QString& insertUser() const;
   void setInsertUser(const QString& insertUser);
 
-  const QString& uri() const;
-  void setUri(const QString& uri);
+//  const QString& uri() const;
+//  void setUri(const QString& uri);
 
   void reset();
   void remove();

Libs/XNAT/Widgets/ctkXnatProjectListModel.cpp

@@ -37,7 +37,7 @@ void ctkXnatProjectListModel::setRootObject(const ctkXnatObject::Pointer& root)
 int ctkXnatProjectListModel::rowCount(const QModelIndex& /*parent*/) const
 {
   if (!rootObject) return 0;
-  return rootObject->getChildren().size();
+  return rootObject->children().size();
 }
 
 QVariant ctkXnatProjectListModel::data(const QModelIndex& index, int role) const
@@ -46,24 +46,24 @@ QVariant ctkXnatProjectListModel::data(const QModelIndex& index, int role) const
 
   if (role == Qt::DisplayRole)
   {
-    ctkXnatObject::Pointer child = rootObject->getChildren().at(index.row());
+    ctkXnatObject::Pointer child = rootObject->children().at(index.row());
     if (child.isNull())
     {
       qWarning() << "child at index" << index << "is NULL!";
     }
     else
     {
-      QString displayData = child->getName();
+      QString displayData = child->name();
       if (displayData.isEmpty())
       {
-        displayData = child->getId();
+        displayData = child->id();
       }
       return displayData;
     }
   }
   else if (role == Qt::UserRole)
   {
-    return QVariant::fromValue(rootObject->getChildren().at(index.row()));
+    return QVariant::fromValue(rootObject->children().at(index.row()));
   }
   return QVariant();
 }

Libs/XNAT/Widgets/ctkXnatTreeItem.cpp

@@ -80,7 +80,7 @@ int ctkXnatTreeItem::columnCount() const
 QVariant ctkXnatTreeItem::data(int column) const
 {
   Q_UNUSED(column);
-  return m_XnatObject->getName();
+  return m_XnatObject->name();
 }
 
 ctkXnatTreeItem* ctkXnatTreeItem::parent()

Libs/XNAT/Widgets/ctkXnatTreeModel.cpp

@@ -55,10 +55,10 @@ QVariant ctkXnatTreeModel::data(const QModelIndex& index, int role) const
   {
     ctkXnatObject::Pointer xnatObject = this->itemAt(index)->xnatObject();
     
-    QString displayData = xnatObject->getName();
+    QString displayData = xnatObject->name();
     if (displayData.isEmpty())
     {
-      displayData = xnatObject->getId();
+      displayData = xnatObject->id();
     }
     return displayData;
   }
@@ -66,7 +66,7 @@ QVariant ctkXnatTreeModel::data(const QModelIndex& index, int role) const
   {
     ctkXnatObject::Pointer xnatObject = this->itemAt(index)->xnatObject();
 
-    return xnatObject->getDescription();
+    return xnatObject->description();
   }
 
   return QVariant();
@@ -183,7 +183,7 @@ void ctkXnatTreeModel::fetchMore(const QModelIndex& index)
 
   xnatObject->fetch();
 
-  QList<ctkXnatObject::Pointer> children = xnatObject->getChildren();
+  QList<ctkXnatObject::Pointer> children = xnatObject->children();
   if (!children.isEmpty())
   {
     beginInsertRows(index, 0, children.size() - 1);
@@ -218,15 +218,15 @@ bool ctkXnatTreeModel::removeAllRows(const QModelIndex& parent)
   ctkXnatObject::Pointer xnatObject = item->xnatObject();
 
   // nt: not sure why the parent.row() is used here instead of the first item in list
-  // that is xnatObject->getChildren()[0];
-  ctkXnatObject::Pointer child = xnatObject->getChildren()[parent.row()];
+  // that is xnatObject->children()[0];
+  ctkXnatObject::Pointer child = xnatObject->children()[parent.row()];
 
   if ( child == NULL )
   {
     return false;
   }
 
-  int numberofchildren = child->getChildren().size();
+  int numberofchildren = child->children().size();
   if (numberofchildren > 0)
   {
     beginRemoveRows(parent, 0, numberofchildren - 1);
@@ -254,7 +254,7 @@ void ctkXnatTreeModel::downloadFile(const QModelIndex& index, const QString& zip
   ctkXnatTreeItem* item = this->itemAt(index);
   ctkXnatObject::Pointer object = item->xnatObject();
 
-  // ctkXnatObject::Pointer child = object->getChildren()[index.row()];
+  // ctkXnatObject::Pointer child = object->children()[index.row()];
 
   qDebug() << "object is null ? " << object.isNull();
   qDebug() << "object is file ? " << object->isFile();
@@ -273,7 +273,7 @@ void ctkXnatTreeModel::uploadFile(const QModelIndex& index, const QString& zipFi
 
   ctkXnatTreeItem* item = this->itemAt(index);
   ctkXnatObject::Pointer xnatObject = item->xnatObject();
-  ctkXnatObject::Pointer child = xnatObject->getChildren()[index.row()];
+  ctkXnatObject::Pointer child = xnatObject->children()[index.row()];
   
   child->upload(zipFilename);
 }
@@ -287,7 +287,7 @@ void ctkXnatTreeModel::addEntry(const QModelIndex& index, const QString& name)
 
   ctkXnatTreeItem* item = this->itemAt(index);
   ctkXnatObject::Pointer xnatObject = item->xnatObject();
-  ctkXnatObject::Pointer child = xnatObject->getChildren()[index.row()];
+  ctkXnatObject::Pointer child = xnatObject->children()[index.row()];
 
   child->add(name);
 }
@@ -301,7 +301,7 @@ void ctkXnatTreeModel::removeEntry(const QModelIndex& index)
 
   ctkXnatTreeItem* item = this->itemAt(index);
   ctkXnatObject::Pointer xnatObject = item->xnatObject();
-  ctkXnatObject::Pointer child = xnatObject->getChildren()[index.row()];
+  ctkXnatObject::Pointer child = xnatObject->children()[index.row()];
 
   child->remove();
 }