Clean-up

Libs/XNAT/Core/ctkXnatConnection.cpp

@@ -37,7 +37,6 @@
 #include "ctkXnatServer.h"
 #include "ctkXnatSubject.h"
 
-#include <QDebug>
 #include <QScopedPointer>
 #include <QStringBuilder>
 
@@ -93,9 +92,9 @@ void ctkXnatConnection::createConnections()
 
 void ctkXnatConnection::progress(QUuid queryId, double progress)
 {
-  qDebug() << "ctkXnatConnection::progress(QUuid queryId, double progress)";
-  qDebug() << "query id:" << queryId;
-  qDebug() << "progress:" << (progress * 100.0) << "%";
+//  qDebug() << "ctkXnatConnection::progress(QUuid queryId, double progress)";
+//  qDebug() << "query id:" << queryId;
+//  qDebug() << "progress:" << (progress * 100.0) << "%";
 }
 
 QString ctkXnatConnection::profileName() const
@@ -487,7 +486,6 @@ void ctkXnatConnection::fetch(const QSharedPointer<ctkXnatReconstructionResource
 
 //void ctkXnatConnection::downloadScanFiles(ctkXnatExperiment* experiment, const QString& fileName)
 //{
-////  qDebug() << "ctkXnatConnection::downloadScanFiles(ctkXnatExperiment* experiment, const QString& zipFilename)";
 //  const QString& experimentName = experiment->getName();
 //  ctkXnatObject* subject = experiment->getParent();
 //  const QString& subjectName = subject->getName();
@@ -629,7 +627,6 @@ void ctkXnatConnection::fetch(const QSharedPointer<ctkXnatReconstructionResource
 
 //void ctkXnatConnection::download(ctkXnatReconstructionResourceFile* reconstructionResourceFile, const QString& fileName)
 //{
-////  qDebug() <<  "ctkXnatConnection::download(ctkXnatReconstructionResourceFile* reconstructionResourceFile, const QString& zipFilename)";
 //  const QString& reconstructionResourceFileName = reconstructionResourceFile->getName();
 //  ctkXnatObject* reconstructionResource = reconstructionResourceFile->getParent();
 //  const QString& reconstructionResourceName = reconstructionResource->getName();
@@ -670,7 +667,6 @@ void ctkXnatConnection::fetch(const QSharedPointer<ctkXnatReconstructionResource
 
 //void ctkXnatConnection::download(ctkXnatScan* scan, const QString& fileName)
 //{
-////  qDebug() << "ctkXnatConnection::download(ctkXnatScan* scan, const QString& zipFilename)";
 //  const QString& scanName = scan->getName();
 //  ctkXnatObject* experiment = scan->getParent()->getParent();
 //  const QString& experimentName = experiment->getName();

Libs/XNAT/Core/ctkXnatObject.cpp

@@ -23,10 +23,8 @@
 #include "ctkXnatObjectPrivate.h"
 
 #include "ctkXnatServer.h"
-#include <QVariant>
-
 #include <QDebug>
-
+#include <QVariant>
 
 
 ctkXnatObject::ctkXnatObject(ctkXnatObjectPrivate& d)

Libs/XNAT/Core/ctkXnatReconstructionResourceFile.cpp

@@ -24,7 +24,6 @@
 #include "ctkXnatConnection.h"
 #include "ctkXnatObjectPrivate.h"
 
-#include <QDebug>
 
 class ctkXnatReconstructionResourceFilePrivate : public ctkXnatObjectPrivate
 {
@@ -71,22 +70,13 @@ ctkXnatReconstructionResourceFile::~ctkXnatReconstructionResourceFile()
 //  d->uri = uri;
 //}
 
-void ctkXnatReconstructionResourceFile::download(const QString& filename)
+void ctkXnatReconstructionResourceFile::download(const QString& fileName)
 {
-  ctkXnatReconstructionResourceFile* object = this;
-  
-  qDebug() << "file uri is" << object->uri();
-  qDebug() << "downloading towards: " << filename;
-
-  object->connection()->download(this, filename);
+  this->connection()->download(this, fileName);
 }
 
-void ctkXnatReconstructionResourceFile::upload(const QString& filename)
+void ctkXnatReconstructionResourceFile::upload(const QString& fileName)
 {
-  ctkXnatReconstructionResourceFile* object = this;
-  
-  qDebug() << "file uri is" << object->uri();
-  qDebug() << "uploading from: " << filename;
 }
 
 

Libs/XNAT/Core/ctkXnatScanResourceFile.cpp

@@ -24,7 +24,6 @@
 #include "ctkXnatConnection.h"
 #include "ctkXnatObjectPrivate.h"
 
-#include <QDebug>
 
 class ctkXnatScanResourceFilePrivate : public ctkXnatObjectPrivate
 {
@@ -73,20 +72,11 @@ ctkXnatScanResourceFile::~ctkXnatScanResourceFile()
 
 void ctkXnatScanResourceFile::download(const QString& filename)
 {
-  ctkXnatScanResourceFile* object = this;
-  
-  qDebug() << "file uri is" << object->uri();
-  qDebug() << "downloading towards: " << filename;
-
-  object->connection()->download(this, filename);
+  this->connection()->download(this, filename);
 }
 
 void ctkXnatScanResourceFile::upload(const QString& filename)
 {
-  ctkXnatScanResourceFile* object = this;
-  
-  qDebug() << "file uri is" << object->uri();
-  qDebug() << "uploading from: " << filename;
 }
 
 

Libs/XNAT/Core/ctkXnatServer.cpp

@@ -24,8 +24,6 @@
 #include "ctkXnatObjectPrivate.h"
 #include "ctkXnatConnection.h"
 
-#include <QDebug>
-
 class ctkXnatServerPrivate : public ctkXnatObjectPrivate
 {
   explicit ctkXnatServerPrivate(ctkXnatConnection* connection);

Libs/XNAT/Widgets/ctkXnatTreeModel.cpp

@@ -26,7 +26,6 @@
 #include "ctkXnatSubject.h"
 
 #include <QList>
-#include <QDebug>
 
 ctkXnatTreeModel::ctkXnatTreeModel()
 : m_RootItem(new ctkXnatTreeItem())
@@ -244,9 +243,9 @@ bool ctkXnatTreeModel::removeAllRows(const QModelIndex& parent)
   return true;
 }
 
-void ctkXnatTreeModel::downloadFile(const QModelIndex& index, const QString& zipFilename)
+void ctkXnatTreeModel::downloadFile(const QModelIndex& index, const QString& zipFileName)
 {
-  if ( !index.isValid() )
+  if (!index.isValid())
   {
     return;
   }
@@ -254,19 +253,14 @@ void ctkXnatTreeModel::downloadFile(const QModelIndex& index, const QString& zip
   ctkXnatTreeItem* item = this->itemAt(index);
   ctkXnatObject::Pointer object = item->xnatObject();
 
-  // ctkXnatObject::Pointer child = object->children()[index.row()];
-
-  qDebug() << "object is null ? " << object.isNull();
-  qDebug() << "object is file ? " << object->isFile();
-  
-  object->download (zipFilename);
+  object->download(zipFileName);
 
   return;
 }
 
-void ctkXnatTreeModel::uploadFile(const QModelIndex& index, const QString& zipFilename)
+void ctkXnatTreeModel::uploadFile(const QModelIndex& index, const QString& zipFileName)
 {
-  if ( !index.isValid() )
+  if (!index.isValid())
   {
     return;
   }
@@ -275,12 +269,12 @@ void ctkXnatTreeModel::uploadFile(const QModelIndex& index, const QString& zipFi
   ctkXnatObject::Pointer xnatObject = item->xnatObject();
   ctkXnatObject::Pointer child = xnatObject->children()[index.row()];
   
-  child->upload(zipFilename);
+  child->upload(zipFileName);
 }
 
 void ctkXnatTreeModel::addEntry(const QModelIndex& index, const QString& name)
 {
-  if ( !index.isValid() )
+  if (!index.isValid())
   {
     return;
   }
@@ -294,7 +288,7 @@ void ctkXnatTreeModel::addEntry(const QModelIndex& index, const QString& name)
 
 void ctkXnatTreeModel::removeEntry(const QModelIndex& index)
 {
-  if ( !index.isValid() )
+  if (!index.isValid())
   {
     return;
   }