Bladeren bron

COMP: Fixed warnings: unused variable, use of old-style cast

Jean-Christophe Fillion-Robin 15 jaren geleden
bovenliggende
commit
b9304d7b55

+ 2 - 2
Libs/Core/Testing/Cpp/ctkDependencyGraphTest1.cpp

@@ -113,9 +113,9 @@ int ctkDependencyGraphTest1(int argc, char * argv [] )
     return EXIT_FAILURE;
     }
 
-  int corigin = graph.cycleOrigin();
+  //int corigin = graph.cycleOrigin();
 
-  int cend = graph.cycleEnd();
+  //int cend = graph.cycleEnd();
 
   QList<int> path;
   QList<int> expectedPath;

+ 6 - 5
Libs/Core/Testing/Cpp/ctkModelTesterTest1.cpp

@@ -65,17 +65,18 @@ int ctkModelTesterTest1(int argc, char * argv [] )
     QList<QTreeWidgetItem *> items;
     for (int i = 0; i < 10; ++i)
       {
-      items.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("item: %1").arg(i))));
+      items.append(new QTreeWidgetItem(
+          reinterpret_cast<QTreeWidget*>(0), QStringList(QString("item: %1").arg(i))));
       }
     treeWidget.addTopLevelItems(items);
     treeWidget.takeTopLevelItem(0);
     treeWidget.takeTopLevelItem(treeWidget.topLevelItemCount() / 2 );
     treeWidget.takeTopLevelItem(treeWidget.topLevelItemCount() - 1);
     treeWidget.insertTopLevelItem(0, new QTreeWidgetItem(&treeWidget, QStringList("new item 0")));
-    treeWidget.insertTopLevelItem(treeWidget.topLevelItemCount() / 2, 
-                                  new QTreeWidgetItem((QTreeWidget*)0, QStringList("new item 1")));
-    treeWidget.insertTopLevelItem(treeWidget.topLevelItemCount(), 
-                                  new QTreeWidgetItem((QTreeWidget*)0, QStringList("new item 2")));
+    treeWidget.insertTopLevelItem(treeWidget.topLevelItemCount() / 2, new QTreeWidgetItem(
+        reinterpret_cast<QTreeWidget*>(0), QStringList("new item 1")));
+    treeWidget.insertTopLevelItem(treeWidget.topLevelItemCount(), new QTreeWidgetItem(
+        reinterpret_cast<QTreeWidget*>(0), QStringList("new item 2")));
     new QTreeWidgetItem(treeWidget.topLevelItem(0), QStringList("new item 3"));
     QAbstractItemModel* model = treeWidget.model();
     model->setData(model->index(0,0),QString("foo"));

+ 12 - 4
Libs/DICOM/Core/ctkDICOMIndexer.cpp

@@ -337,11 +337,19 @@ void ctkDICOMIndexer::addDirectory(QSqlDatabase database, const QString& directo
         std::stringstream query_string;
 
         query_string << "INSERT INTO Series VALUES('"
-          << seriesInstanceUID << "','" << studyInstanceUID << "','" << (int) seriesNumber << "','"
+          << seriesInstanceUID << "','"
+          << studyInstanceUID << "','"
+          << static_cast<int>(seriesNumber) << "','"
           << QDate::fromString(seriesDate.c_str(), "yyyyMMdd").toString("yyyy-MM-dd").toStdString() << "','"
-          << seriesTime << "','" << seriesDescription << "','" << bodyPartExamined << "','"
-          << frameOfReferenceUID << "','" << (int) acquisitionNumber << "','" << contrastAgent << "','"
-          << scanningSequence << "','" << (int) echoNumber << "','" << (int) temporalPosition << "')";
+          << seriesTime << "','"
+          << seriesDescription << "','"
+          << bodyPartExamined << "','"
+          << frameOfReferenceUID << "','"
+          << static_cast<int>(acquisitionNumber) << "','"
+          << contrastAgent << "','"
+          << scanningSequence << "','"
+          << static_cast<int>(echoNumber) << "','"
+          << static_cast<int>(temporalPosition) << "')";
 
         query.exec(query_string.str().c_str());
       }

+ 4 - 4
Libs/DICOM/Core/ctkDICOMIndexerBase.cpp

@@ -234,17 +234,17 @@ void ctkDICOMIndexerBase::insert ( DcmDataset *dataset, QString filename ) {
       statement.prepare ( "INSERT INTO Series ( 'SeriesInstanceUID', 'StudyInstanceUID', 'SeriesNumber', 'SeriesDate', 'SeriesTime', 'SeriesDescription', 'BodyPartExamined', 'FrameOfReferenceUID', 'AcquisitionNumber', 'ContrastAgent', 'ScanningSequence', 'EchoNumber', 'TemporalPosition' ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )" );
       statement.bindValue ( 0, QString ( seriesInstanceUID.c_str() ) );
       statement.bindValue ( 1, QString ( studyInstanceUID.c_str() ) );
-      statement.bindValue ( 2, (int) seriesNumber );
+      statement.bindValue ( 2, static_cast<int>(seriesNumber) );
       statement.bindValue ( 3, QString ( seriesDate.c_str() ) );
       statement.bindValue ( 4, QDate::fromString ( seriesTime.c_str(), "yyyyMMdd" ) );
       statement.bindValue ( 5, QString ( seriesDescription.c_str() ) );
       statement.bindValue ( 6, QString ( bodyPartExamined.c_str() ) );
       statement.bindValue ( 7, QString ( frameOfReferenceUID.c_str() ) );
-      statement.bindValue ( 8, (int) acquisitionNumber );
+      statement.bindValue ( 8, static_cast<int>(acquisitionNumber) );
       statement.bindValue ( 9, QString ( contrastAgent.c_str() ) );
       statement.bindValue ( 10, QString ( scanningSequence.c_str() ) );
-      statement.bindValue ( 11, (int) echoNumber );
-      statement.bindValue ( 12, (int) temporalPosition );
+      statement.bindValue ( 11, static_cast<int>(echoNumber) );
+      statement.bindValue ( 12, static_cast<int>(temporalPosition) );
       if ( !statement.exec() )
         {
         logger.error ( "Error executing statament: " + statement.lastQuery() + " Error: " + statement.lastError().text() );

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

@@ -357,6 +357,7 @@ void ctkDICOMModelPrivate::fetch(const QModelIndex& indexValue, int limit)
 //------------------------------------------------------------------------------
 ctkDICOMModel::ctkDICOMModel(QObject* parentValue)
 {
+  Q_UNUSED(parentValue);
   CTK_INIT_PRIVATE(ctkDICOMModel);
   ctk_d()->init();
 }
@@ -423,6 +424,7 @@ void ctkDICOMModel::fetchMore ( const QModelIndex & parentValue )
 //------------------------------------------------------------------------------
 Qt::ItemFlags ctkDICOMModel::flags ( const QModelIndex & indexValue ) const
 {
+  Q_UNUSED(indexValue);
   return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
 }
 

+ 1 - 0
Libs/Visualization/VTK/Core/ctkVTKCompositeFunction.cpp

@@ -267,6 +267,7 @@ QVariant ctkVTKCompositeFunction::value(qreal pos)const
 //-----------------------------------------------------------------------------
 int ctkVTKCompositeFunction::insertControlPoint(const ctkControlPoint& cp)
 {
+  Q_UNUSED(cp);
   CTK_D(ctkVTKCompositeFunction);
   int index = -1;
   // check piecewise

+ 2 - 3
Libs/Visualization/VTK/Core/ctkVTKHistogram.cpp

@@ -149,7 +149,7 @@ void ctkVTKHistogram::range(qreal& minRange, qreal& maxRange)const
 //-----------------------------------------------------------------------------
 QVariant ctkVTKHistogram::minValue()const
 {
-  CTK_D(const ctkVTKHistogram);
+  //CTK_D(const ctkVTKHistogram);
   return 0;//d->MinBin;
 }
 
@@ -173,7 +173,6 @@ ctkControlPoint* ctkVTKHistogram::controlPoint(int index)const
 //-----------------------------------------------------------------------------
 QVariant ctkVTKHistogram::value(qreal pos)const
 {
-  CTK_D(const ctkVTKHistogram);
   QSharedPointer<ctkControlPoint> point(this->controlPoint(this->posToIndex(pos)));
   return point->value();
 }
@@ -296,7 +295,7 @@ void populateIrregularBins(vtkIntArray* bins, const ctkVTKHistogram* histogram)
       {
       continue;
       }
-    binsPtr[vtkMath::Floor(((double)*ptr - offset) * binWidth)]++;
+    binsPtr[vtkMath::Floor((static_cast<double>(*ptr) - offset) * binWidth)]++;
     }
 }
 

+ 6 - 3
Libs/Visualization/VTK/Core/ctkVTKLookupTable.cpp

@@ -151,7 +151,6 @@ int ctkVTKLookupTable::posToIndex(qreal pos)const
 //-----------------------------------------------------------------------------
 ctkControlPoint* ctkVTKLookupTable::controlPoint(int index)const
 {
-  CTK_D(const ctkVTKLookupTable);
   ctkControlPoint* cp = new ctkControlPoint();
   cp->P.X = this->indexToPos(index);
   cp->P.Value = this->value(cp->P.X);
@@ -172,7 +171,8 @@ QVariant ctkVTKLookupTable::value(qreal pos)const
 //-----------------------------------------------------------------------------
 int ctkVTKLookupTable::insertControlPoint(const ctkControlPoint& cp)
 {
-  CTK_D(ctkVTKLookupTable);
+  Q_UNUSED(cp);
+  //CTK_D(ctkVTKLookupTable);
   qDebug() << "ctkVTKLookupTable doesn't support insertControlPoint";
   return -1;
 }
@@ -181,6 +181,7 @@ int ctkVTKLookupTable::insertControlPoint(const ctkControlPoint& cp)
 // insert point with value = 0
 int ctkVTKLookupTable::insertControlPoint(qreal pos)
 {
+  Q_UNUSED(pos);
   // nothing
   int index = 0;
 
@@ -189,7 +190,9 @@ int ctkVTKLookupTable::insertControlPoint(qreal pos)
 //-----------------------------------------------------------------------------
 void ctkVTKLookupTable::setControlPointPos(int index, qreal pos)
 {
-  CTK_D(ctkVTKLookupTable);
+  Q_UNUSED(index);
+  Q_UNUSED(pos);
+  //CTK_D(ctkVTKLookupTable);
   // TODO, inform that nothing is done here.
   qDebug() << "ctkVTKLookupTable doesn't support setControlPointPos";
   return;

+ 1 - 0
Libs/Widgets/ctkCheckableHeaderView.cpp

@@ -328,6 +328,7 @@ void ctkCheckableHeaderView::updateHeaders(int first, int last)
 void ctkCheckableHeaderView::updateHeadersFromItems(const QModelIndex & topLeft,
                                                      const QModelIndex & bottomRight)
 {
+  Q_UNUSED(bottomRight);
   CTK_D(ctkCheckableHeaderView);
   if(d->ItemsAreUpdating || !d->PropagateToItems || 
      topLeft.parent() != this->rootIndex())

+ 2 - 2
Libs/Widgets/ctkMenuButton.cpp

@@ -146,8 +146,8 @@ void ctkMenuButton::paintEvent(QPaintEvent * _event)
   QColor buttonColor = this->palette().button().color();
   QColor darkColor;
   darkColor.setHsv(buttonColor.hue(),
-                   qMin(255, (int)(buttonColor.saturation()*1.9)),
-                   qMin(255, (int)(buttonColor.value()*0.7)));
+                   qMin(255, static_cast<int>(buttonColor.saturation()*1.9)),
+                   qMin(255, static_cast<int>(buttonColor.value()*0.7)));
   painter.setPen(buttonColor.darker(130));
   int borderSize = 2;
   painter.drawLine(QPoint(downArrowRect.left() - 1, downArrowRect.top() + borderSize),

+ 2 - 0
Libs/Widgets/ctkRangeSlider.cpp

@@ -407,6 +407,8 @@ void ctkRangeSlider::setPositions(int min, int max)
 // --------------------------------------------------------------------------
 void ctkRangeSlider::onRangeChanged(int minimum, int maximum)
 {
+  Q_UNUSED(minimum);
+  Q_UNUSED(maximum);
   CTK_D(ctkRangeSlider);
   this->setValues(d->m_MinimumValue, d->m_MaximumValue);
 }

+ 0 - 1
Libs/Widgets/ctkRangeWidget.cpp

@@ -120,7 +120,6 @@ void ctkRangeWidgetPrivate::synchronizeSiblingSpinBox(int width)
 // --------------------------------------------------------------------------
 void ctkRangeWidgetPrivate::relayout()
 {
-  CTK_P(ctkRangeWidget);
   this->GridLayout->removeWidget(this->MinimumSpinBox);
   this->GridLayout->removeWidget(this->MaximumSpinBox);
   this->GridLayout->removeWidget(this->Slider);

+ 2 - 0
Libs/Widgets/ctkTransferFunctionBarsItem.cpp

@@ -92,6 +92,8 @@ qreal ctkTransferFunctionBarsItem::barWidth()const
 void ctkTransferFunctionBarsItem::paint(
   QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget)
 {
+  Q_UNUSED(option);
+  Q_UNUSED(widget);
   CTK_D(ctkTransferFunctionBarsItem);
   int count = this->transferFunction() ? this->transferFunction()->count() : 0;
   if (count <= 0)

+ 2 - 1
Libs/Widgets/ctkTransferFunctionControlPointsItem.cpp

@@ -85,6 +85,8 @@ ctkTransferFunctionControlPointsItem::~ctkTransferFunctionControlPointsItem()
 void ctkTransferFunctionControlPointsItem::paint(
   QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget)
 {
+  Q_UNUSED(option);
+  Q_UNUSED(widget);
   CTK_D(ctkTransferFunctionControlPointsItem);
   int count = this->transferFunction() ? this->transferFunction()->count() : 0;
   if (count <= 0)
@@ -121,7 +123,6 @@ void ctkTransferFunctionControlPointsItem::paint(
 void ctkTransferFunctionControlPointsItem::mousePressEvent(QGraphicsSceneMouseEvent* e)
 {
   CTK_D(ctkTransferFunctionControlPointsItem);
-  QWidget* w = e->widget();
   ctkTransferFunctionWidget* view = qobject_cast<ctkTransferFunctionWidget*>(e->widget()->parentWidget());
   Q_ASSERT(view);
   // e->pos() is ok, pointArea should be in the world coordiate

+ 2 - 0
Libs/Widgets/ctkTransferFunctionGradientItem.cpp

@@ -66,6 +66,8 @@ ctkTransferFunctionGradientItem::~ctkTransferFunctionGradientItem()
 void ctkTransferFunctionGradientItem::paint(
   QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget)
 {
+  Q_UNUSED(option);
+  Q_UNUSED(widget);
   ctkTransferFunctionScene* tfScene = dynamic_cast<ctkTransferFunctionScene*>(this->scene());
   Q_ASSERT(tfScene);
 

+ 1 - 2
Libs/Widgets/ctkTransferFunctionItem.cpp

@@ -52,7 +52,7 @@ ctkTransferFunctionItemPrivate::ctkTransferFunctionItemPrivate()
 //-----------------------------------------------------------------------------
 void ctkTransferFunctionItemPrivate::init()
 {
-  CTK_P(ctkTransferFunctionItem);
+  //CTK_P(ctkTransferFunctionItem);
 }
 
 //-----------------------------------------------------------------------------
@@ -264,7 +264,6 @@ qreal ctkTransferFunctionItem::rangeYOffSet()
   QVariant rangeY[2];
   rangeY[0] = d->TransferFunction->minValue();
   rangeY[1] = d->TransferFunction->maxValue();
-  qreal rangeYOffSet;
   if (rangeY[0].canConvert<qreal>())
     {
     if (rangeY[1].toReal() == rangeY[0].toReal())