Просмотр исходного кода

Merge branch '293-dicom-warnings'

* 293-dicom-warnings:
  Remove compile warnings - Closes #293
Steve Pieper лет назад: 12
Родитель
Сommit
233ed1f0c5
2 измененных файлов с 0 добавлено и 9 удалено
  1. 0 4
      Libs/DICOM/Core/ctkDICOMDatabase.cpp
  2. 0 5
      Libs/DICOM/Core/ctkDICOMIndexer.cpp

+ 0 - 4
Libs/DICOM/Core/ctkDICOMDatabase.cpp

@@ -233,8 +233,6 @@ bool ctkDICOMDatabasePrivate::loggedExec(QSqlQuery& query, const QString& queryS
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 void ctkDICOMDatabasePrivate::beginTransaction()
 void ctkDICOMDatabasePrivate::beginTransaction()
 {
 {
-  Q_Q(ctkDICOMDatabase);
-
   QSqlQuery transaction( this->Database );
   QSqlQuery transaction( this->Database );
   transaction.prepare( "BEGIN TRANSACTION" );
   transaction.prepare( "BEGIN TRANSACTION" );
   transaction.exec();
   transaction.exec();
@@ -243,8 +241,6 @@ void ctkDICOMDatabasePrivate::beginTransaction()
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 void ctkDICOMDatabasePrivate::endTransaction()
 void ctkDICOMDatabasePrivate::endTransaction()
 {
 {
-  Q_Q(ctkDICOMDatabase);
-
   QSqlQuery transaction( this->Database );
   QSqlQuery transaction( this->Database );
   transaction.prepare( "END TRANSACTION" );
   transaction.prepare( "END TRANSACTION" );
   transaction.exec();
   transaction.exec();

+ 0 - 5
Libs/DICOM/Core/ctkDICOMIndexer.cpp

@@ -62,7 +62,6 @@ static ctkLogger logger("org.commontk.dicom.DICOMIndexer" );
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 ctkDICOMIndexerPrivate::ctkDICOMIndexerPrivate(ctkDICOMIndexer& o) : q_ptr(&o), Canceled(false)
 ctkDICOMIndexerPrivate::ctkDICOMIndexerPrivate(ctkDICOMIndexer& o) : q_ptr(&o), Canceled(false)
 {
 {
-  Q_Q(ctkDICOMIndexer);
 }
 }
 
 
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
@@ -107,8 +106,6 @@ void ctkDICOMIndexer::addDirectory(ctkDICOMDatabase& ctkDICOMDatabase,
                                    const QString& directoryName,
                                    const QString& directoryName,
                                    const QString& destinationDirectoryName)
                                    const QString& destinationDirectoryName)
 {
 {
-  Q_D(ctkDICOMIndexer);
-
   QStringList listOfFiles;
   QStringList listOfFiles;
   QDir directory(directoryName);
   QDir directory(directoryName);
 
 
@@ -157,8 +154,6 @@ void ctkDICOMIndexer::addDicomdir(ctkDICOMDatabase& ctkDICOMDatabase,
                  const QString& destinationDirectoryName
                  const QString& destinationDirectoryName
                  )
                  )
 {
 {
-  Q_D(ctkDICOMIndexer);
-
   //Initialize dicomdir with directory path
   //Initialize dicomdir with directory path
   QString dcmFilePath = directoryName;
   QString dcmFilePath = directoryName;
   dcmFilePath.append("/DICOMDIR");
   dcmFilePath.append("/DICOMDIR");