浏览代码

COMP: explicitly create OFStrings to allow compilation on visual studio

Steve Pieper 15 年之前
父节点
当前提交
a750df1990

+ 1 - 1
Applications/ctkDICOMDemoSCU/ctkDICOMDemoSCUMain.cpp

@@ -48,7 +48,7 @@ int main(int argc, char** argv)
   
   
   // Setup SCU
   // Setup SCU
   DcmSCU scu;
   DcmSCU scu;
-  scu.setPeerHostName(host);
+  scu.setPeerHostName(OFString(host.c_str()));
   scu.setPeerPort(port);
   scu.setPeerPort(port);
   OFString verificationSOP = UID_VerificationSOPClass;
   OFString verificationSOP = UID_VerificationSOPClass;
   OFList<OFString> ts;
   OFList<OFString> ts;

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

@@ -163,9 +163,9 @@ void ctkDICOMQuery::query(QSqlDatabase database )
     logger.debug ( "DB not open in Query" );
     logger.debug ( "DB not open in Query" );
     }
     }
   d->StudyInstanceUIDList.clear();
   d->StudyInstanceUIDList.clear();
-  d->SCU.setAETitle ( this->callingAETitle().toStdString() );
-  d->SCU.setPeerAETitle ( this->calledAETitle().toStdString() );
-  d->SCU.setPeerHostName ( this->host().toStdString() );
+  d->SCU.setAETitle ( OFString(this->callingAETitle().toStdString().c_str()) );
+  d->SCU.setPeerAETitle ( OFString(this->calledAETitle().toStdString().c_str()) );
+  d->SCU.setPeerHostName ( OFString(this->host().toStdString().c_str()) );
   d->SCU.setPeerPort ( this->port() );
   d->SCU.setPeerPort ( this->port() );
 
 
   logger.error ( "Setting Transfer Syntaxes" );
   logger.error ( "Setting Transfer Syntaxes" );

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

@@ -115,10 +115,10 @@ void ctkDICOMRetrievePrivate::retrieve ( QString UID, QDir directory, RetrieveTy
   rootLogger.setLogLevel(log4cplus::DEBUG_LOG_LEVEL);
   rootLogger.setLogLevel(log4cplus::DEBUG_LOG_LEVEL);
 
 
   DcmSCU scu;
   DcmSCU scu;
-  scu.setAETitle ( CallingAETitle.toStdString() );
+  scu.setAETitle ( OFString(CallingAETitle.toStdString().c_str()) );
   scu.setPort ( CallingPort );
   scu.setPort ( CallingPort );
-  scu.setPeerAETitle ( CalledAETitle.toStdString() );
-  scu.setPeerHostName ( Host.toStdString() );
+  scu.setPeerAETitle ( OFString(CalledAETitle.toStdString().c_str()) );
+  scu.setPeerHostName ( OFString(Host.toStdString().c_str()) );
   scu.setPeerPort ( CalledPort );
   scu.setPeerPort ( CalledPort );
 
 
   logger.error ( "Setting Transfer Syntaxes" );
   logger.error ( "Setting Transfer Syntaxes" );