removing useless code

medInria · Oct 10, 2015 · 10173a9 · 10173a9
1 parent ad1e945
commit 10173a9
Showing 1 changed file with 16 additions and 38 deletions.
diff --git a/src/QtDcmMoveScu.cpp b/src/QtDcmMoveScu.cpp
@@ -73,7 +73,6 @@ class QtDcmMoveScu::Private
     OFBool abortAssociation;
     OFCmdSignedInt cancelAfterNResponses;
     OFBool ignorePendingDatasets;
-    OFBool useStoreSCP;
     DcmDataset overrideKeys;
     OFString outputDirectory;
 
@@ -115,7 +114,6 @@ QtDcmMoveScu::QtDcmMoveScu ( QObject * parent )
     d->ignorePendingDatasets = OFTrue;
     d->outputDirectory = ".";
     d->acseTimeout = 30;
-    d->useStoreSCP = true;
     d->blockMode = DIMSE_BLOCKING;
 
     d->mode = QtDcmMoveScu::IMPORT;
@@ -971,43 +969,23 @@ OFCondition QtDcmMoveScu::moveSCU ( T_ASC_Association * assoc, const char *fname
         strcpy( req.MoveDestination, d->moveDestination );
     }
 
-    OFCondition cond = EC_Normal;
-
-    if ( d->useStoreSCP ) {
-        cond = DIMSE_moveUser ( assoc, 
-                                d->presId, 
-                                &req, 
-                                file.getDataset(), 
-                                moveCallback, 
-                                ( void* ) this, 
-                                d->blockMode, 
-                                d->dimseTimeout, 
-                                d->net, 
-                                subOpCallback, 
-                                ( void* ) this, 
-                                &rsp, 
-                                &statusDetail, 
-                                &rspIds, 
-                                d->ignorePendingDatasets );
-    }
-    else {
-        cond = DIMSE_moveUser ( assoc, 
-                                d->presId, 
-                                &req, 
-                                file.getDataset(), 
-                                moveCallback, 
-                                ( void* ) this, 
-                                d->blockMode, 
-                                d->dimseTimeout, 
-                                d->net, 
-                                NULL, 
-                                ( void* ) this, 
-                                &rsp, 
-                                &statusDetail, 
-                                &rspIds, 
-                                d->ignorePendingDatasets );
-    }
 
+    const OFCondition cond = DIMSE_moveUser ( assoc, 
+                                              d->presId, 
+                                              &req, 
+                                              file.getDataset(), 
+                                              moveCallback, 
+                                              ( void* ) this, 
+                                              d->blockMode, 
+                                              d->dimseTimeout, 
+                                              d->net, 
+                                              subOpCallback, 
+                                              ( void* ) this, 
+                                              &rsp, 
+                                              &statusDetail, 
+                                              &rspIds, 
+                                              d->ignorePendingDatasets );
+
     if ( rspIds != NULL ) delete rspIds;
 
     return cond;