Simplify ctkDicomObjectLocatorCache::getData signature

This function now takes only a list of objectUuids as parameter. Some
other class should be responsible of handling the acceptableTransferSyntaxUIDs
and includeBulkData parameters.

Plugins/org.commontk.dah.app/ctkDicomAbstractApp.cpp

@@ -153,7 +153,9 @@ QList<ctkDicomAppHosting::ObjectLocator> ctkDicomAbstractApp::getData(
   const QList<QString>& acceptableTransferSyntaxUIDs,
   bool includeBulkData)
 {
-  return this->objectLocatorCache()->getData(objectUUIDs, acceptableTransferSyntaxUIDs, includeBulkData);
+  Q_UNUSED(acceptableTransferSyntaxUIDs);
+  Q_UNUSED(includeBulkData);
+  return this->objectLocatorCache()->getData(objectUUIDs);
 }
 
 //----------------------------------------------------------------------------

Plugins/org.commontk.dah.core/ctkDicomObjectLocatorCache.cpp

@@ -141,10 +141,7 @@ bool ctkDicomObjectLocatorCache::remove(const QString& objectUuid)
 }
 
 //----------------------------------------------------------------------------
-QList<ctkDicomAppHosting::ObjectLocator> ctkDicomObjectLocatorCache::getData(
-  const QList<QUuid>& objectUUIDs,
-  const QList<QString>& acceptableTransferSyntaxUIDs,
-  bool includeBulkData)
+QList<ctkDicomAppHosting::ObjectLocator> ctkDicomObjectLocatorCache::getData(const QList<QUuid>& objectUUIDs)
 {
   QList<ctkDicomAppHosting::ObjectLocator> objectLocators;
   foreach(const QUuid& uuid, objectUUIDs)
@@ -153,13 +150,8 @@ QList<ctkDicomAppHosting::ObjectLocator> ctkDicomObjectLocatorCache::getData(
     bool found = this->find(uuid, objectLocator);
     if (!found)
       {
-      // What to do .. ? Create an empty objectLocator ...
-      continue;
-      }
-    if (includeBulkData)
-      {
-      Q_UNUSED(acceptableTransferSyntaxUIDs);
-      // Not implemented
+      // Use the empty objectLocator
+      // TODO Source should be set to NULL
       }
     objectLocators << objectLocator;
     }

Plugins/org.commontk.dah.core/ctkDicomObjectLocatorCache.h

@@ -50,10 +50,7 @@ public:
 
   bool remove(const QString& objectUuid);
 
-  QList<ctkDicomAppHosting::ObjectLocator> getData(
-    const QList<QUuid>& objectUUIDs,
-    const QList<QString>& acceptableTransferSyntaxUIDs,
-    bool includeBulkData);
+  QList<ctkDicomAppHosting::ObjectLocator> getData(const QList<QUuid>& objectUUIDs);
 
 private:
   Q_DECLARE_PRIVATE(ctkDicomObjectLocatorCache)

Plugins/org.commontk.dah.host/ctkDicomAbstractHost.cpp

@@ -112,7 +112,9 @@ QList<ctkDicomAppHosting::ObjectLocator> ctkDicomAbstractHost::getData(
   const QList<QString>& acceptableTransferSyntaxUIDs,
   bool includeBulkData)
 {
-  return this->objectLocatorCache()->getData(objectUUIDs, acceptableTransferSyntaxUIDs, includeBulkData);
+  Q_UNUSED(acceptableTransferSyntaxUIDs);
+  Q_UNUSED(includeBulkData);
+  return this->objectLocatorCache()->getData(objectUUIDs);
 }
 
 //----------------------------------------------------------------------------