소스 검색

Fixed Windows compile errors.

Sascha Zelzer 13 년 전
부모
커밋
e1c7c4d1e7
2개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 3 3
      Libs/DICOM/Core/ctkDICOMRetrieve.cpp
  2. 1 1
      Libs/DICOM/Core/ctkDICOMRetrieve.h

+ 3 - 3
Libs/DICOM/Core/ctkDICOMRetrieve.cpp

@@ -96,7 +96,7 @@ public:
         QString qInstanceUID(instanceUID.c_str());
         emit this->retrieve->progress("Got STORE request for " + qInstanceUID);
         emit this->retrieve->progress(0);
-        continueCGETSession = not this->retrieve->wasCanceled();
+        continueCGETSession = !this->retrieve->wasCanceled();
         if (this->retrieve && this->retrieve->database())
           {
           this->retrieve->database()->insert(incomingObject);
@@ -121,7 +121,7 @@ public:
         {
         emit this->retrieve->progress("Got CGET response");
         emit this->retrieve->progress(0);
-        continueCGETSession = not this->retrieve->wasCanceled();
+        continueCGETSession = !this->retrieve->wasCanceled();
         return this->ctkDcmSCU::handleCGETResponse(presID, response, continueCGETSession);
         }
       return false;
@@ -704,7 +704,7 @@ bool ctkDICOMRetrieve::getSeries(const QString& studyInstanceUID,
 }
 
 //------------------------------------------------------------------------------
-bool ctkDICOMRetrieve::cancel()
+void ctkDICOMRetrieve::cancel()
 {
   Q_D(ctkDICOMRetrieve);
   d->WasCanceled = true;

+ 1 - 1
Libs/DICOM/Core/ctkDICOMRetrieve.h

@@ -95,7 +95,7 @@ public Q_SLOTS:
   /// Use CGET to ask peer host to store data to us
   bool getStudy( const QString& studyInstanceUID );
   /// Cancel the current operation
-  bool cancel();
+  void cancel();
 
 Q_SIGNALS:
   /// Signal is emitted inside the retrieve() function. It ranges from 0 to 100.