Merge pull request #860 from commontk/fix-warnings-and-errors

Libs/DICOM: Fix warning and build errors
commontk · Apr 15, 2019 · faf3e5b · faf3e5b
2 parents 2e1c6b0 + fa757e1
commit faf3e5b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorAbstractRule.h b/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorAbstractRule.h
@@ -42,6 +42,8 @@ class ctkDICOMDatabase;
 class CTK_DICOM_CORE_EXPORT ctkDICOMDisplayedFieldGeneratorAbstractRule
 {
 public:
+  virtual ~ctkDICOMDisplayedFieldGeneratorAbstractRule(){}
+
   /// Generate displayed fields for a certain instance based on its cached tags
   /// Each rule plugin has the chance to fill any field in the series, study, and patient fields.
   /// The way these generated fields will be used is defined by \sa mergeDisplayedFieldsForInstance
@@ -63,7 +65,7 @@ class CTK_DICOM_CORE_EXPORT ctkDICOMDisplayedFieldGeneratorAbstractRule
   virtual QStringList getRequiredDICOMTags()=0;
 
   /// Utility function to convert a DICOM tag enum to string
-  static QString dicomTagToString(DcmTagKey& tag)
+  static QString dicomTagToString(const DcmTagKey& tag)
   {    
     return QString("%1,%2").arg(tag.getGroup(),4,16,QLatin1Char('0')).arg(tag.getElement(),4,16,QLatin1Char('0'));
   }  

diff --git a/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorDefaultRule.cpp b/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorDefaultRule.cpp
@@ -72,6 +72,9 @@ void ctkDICOMDisplayedFieldGeneratorDefaultRule::registerEmptyFieldNames(
   QMap<QString, QString> emptyFieldsDisplayStudies,
   QMap<QString, QString> emptyFieldsDisplayPatients )
 {
+  Q_UNUSED(emptyFieldsDisplaySeries);
+  Q_UNUSED(emptyFieldsDisplayStudies);
+  Q_UNUSED(emptyFieldsDisplayPatients);
   emptyFieldsDisplaySeries.insertMulti("SeriesDescription", EMPTY_SERIES_DESCRIPTION);
 }
 

diff --git a/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorRadiotherapySeriesDescriptionRule.cpp b/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorRadiotherapySeriesDescriptionRule.cpp
@@ -126,5 +126,13 @@ void ctkDICOMDisplayedFieldGeneratorRadiotherapySeriesDescriptionRule::mergeDisp
   const QMap<QString, QString> &emptyFieldsSeries, const QMap<QString, QString> &emptyFieldsStudy, const QMap<QString, QString> &emptyFieldsPatient
   )
 {
+  Q_UNUSED(initialFieldsStudy);
+  Q_UNUSED(initialFieldsPatient);
+  Q_UNUSED(newFieldsStudy);
+  Q_UNUSED(newFieldsPatient);
+  Q_UNUSED(mergedFieldsStudy);
+  Q_UNUSED(mergedFieldsPatient);
+  Q_UNUSED(emptyFieldsStudy);
+  Q_UNUSED(emptyFieldsPatient);
   mergeConcatenate("SeriesDescription", initialFieldsSeries, newFieldsSeries, mergedFieldsSeries, emptyFieldsSeries);
 }