Prechádzať zdrojové kódy

Merge branch 'fix-warnings'

* fix-warnings:
  Fix unused variable warnings
  Fix warning complaining about missing resource with resource list is empty.
Jean-Christophe Fillion-Robin 11 rokov pred
rodič
commit
48ef9aeb89

+ 1 - 1
CMake/ctkMacroBuildLib.cmake

@@ -129,7 +129,7 @@ macro(ctkMacroBuildLib)
   else()
     QT4_WRAP_UI(MY_UI_CPP ${MY_UI_FORMS})
   endif()
-  if(DEFINED MY_RESOURCES)
+  if(DEFINED MY_RESOURCES AND NOT MY_RESOURCES STREQUAL "")
     if(CTK_QT_VERSION VERSION_GREATER "4")
       qt5_add_resources(MY_QRC_SRCS ${MY_RESOURCES})
     else()

+ 2 - 0
Libs/DICOM/Core/ctkDICOMModel.cpp

@@ -780,7 +780,9 @@ bool ctkDICOMModel::setChildData(const QModelIndex &index, const QVariant &value
 //------------------------------------------------------------------------------
 bool ctkDICOMModel::setParentData(const QModelIndex &index, const QVariant &value, int role)
 {
+#ifdef CHECKABLE_COLUMNS
   Q_D(const ctkDICOMModel);
+#endif
 
   if(!index.isValid()){
     return false;

+ 0 - 1
Libs/DICOM/Widgets/ctkDICOMBrowser.cpp

@@ -442,7 +442,6 @@ void ctkDICOMBrowser::openQueryDialog()
 //----------------------------------------------------------------------------
 void ctkDICOMBrowser::onQueryRetrieveFinished()
 {
-  Q_D(ctkDICOMBrowser);
   emit this->queryRetrieveFinished();
 }
 

+ 0 - 1
Libs/Visualization/VTK/Widgets/ctkVTKSliceView.cpp

@@ -234,7 +234,6 @@ void ctkVTKSliceView::setColorWindow(double newColorWindow)
 //----------------------------------------------------------------------------
 bool ctkVTKSliceView::eventFilter(QObject *object, QEvent *event)
 {
-  Q_D(ctkVTKSliceView);
   if (object == this->VTKWidget())
     {
     if (event->type() == QEvent::Resize)