Fix warnings and minor refactoring

Author: codeling

libs/gui/mdichild.cpp

@@ -308,7 +308,7 @@ size_t MdiChild::addDataSet(std::shared_ptr<iADataSet> dataSet)
 	connect(viewer.get(), &iADataSetViewer::removeDataSet, this, &iAMdiChild::removeDataSet);
 	m_dataSetViewers[dataSetIdx] = viewer;
 	auto fw = runAsync(
-		[this, viewer, dataSetIdx, p]()
+		[viewer, dataSetIdx, p]()
 		{
 			viewer->prepare(p.get());
 		},

libs/guibase/iAvtkClipPolyData.cpp

@@ -11,14 +11,10 @@
 #include "vtkIncrementalPointLocator.h"
 #include "vtkInformation.h"
 #include "vtkInformationVector.h"
-#include "vtkLine.h"
 #include "vtkMergePoints.h"
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
-#include "vtkTriangle.h"
-
-#include <cmath>
 
 //VTK_ABI_NAMESPACE_BEGIN
 vtkStandardNewMacro(iAvtkClipPolyData);
@@ -124,7 +120,7 @@ int iAvtkClipPolyData::RequestData(vtkInformation *vtkNotUsed(request),
   vtkPolyData *input = vtkPolyData::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT()));
   vtkPolyData *output = vtkPolyData::SafeDownCast(outInfo->Get(vtkDataObject::DATA_OBJECT()));
 
-  vtkIdType cellId, i, updateTime;
+  vtkIdType cellId, updateTime;
   vtkPoints *cellPts;
   vtkDataArray *clipScalars;
   vtkFloatArray *cellScalars;
@@ -138,7 +134,6 @@ int iAvtkClipPolyData::RequestData(vtkInformation *vtkNotUsed(request),
   vtkIdType estimatedSize, numCells=input->GetNumberOfCells();
   vtkIdType numPts=input->GetNumberOfPoints();
   vtkPoints *inPts=input->GetPoints();
-  int numberOfPoints;
   vtkPointData *inPD=input->GetPointData(), *outPD = output->GetPointData();
   vtkCellData *inCD=input->GetCellData(), *outCD = output->GetCellData();
   vtkCellData *outClippedCD = nullptr;
@@ -171,12 +166,12 @@ int iAvtkClipPolyData::RequestData(vtkInformation *vtkNotUsed(request),
     {
       inPD->SetScalars(tmpScalars);
     }
-    for ( i=0; i < numPts; i++ )
+    for (vtkIdType i=0; i < numPts; i++ )
     {
       double minValue = VTK_DOUBLE_MAX;
-      for( int j = 0; j < ClipFunctions.size(); ++j )
+      for (auto func: ClipFunctions)
       {
-        minValue = std::min( ClipFunctions[j]->FunctionValue(inPts->GetPoint(i)), minValue );
+        minValue = std::min(func->FunctionValue(inPts->GetPoint(i)), minValue );
       }
       tmpScalars->SetComponent(i,0, minValue);
     }
@@ -269,10 +264,10 @@ int iAvtkClipPolyData::RequestData(vtkInformation *vtkNotUsed(request),
     input->GetCell(cellId,cell);
     cellPts = cell->GetPoints();
     cellIds = cell->GetPointIds();
-    numberOfPoints = cellPts->GetNumberOfPoints();
+    vtkIdType numberOfPoints = cellPts->GetNumberOfPoints();
 
     // evaluate implicit cutting function
-    for ( i=0; i < numberOfPoints; i++ )
+    for (vtkIdType i=0; i < numberOfPoints; ++i)
     {
       s = clipScalars->GetComponent(cellIds->GetId(i),0);
       cellScalars->InsertTuple(i, &s);

modules/Remote/iAPlaneSliceTool.cpp

@@ -238,7 +238,7 @@ iAPlaneSliceTool::iAPlaneSliceTool(iAMainWindow* mainWnd, iAMdiChild* child) :
 		m_snapshotTable->selectRow(idRow.second);
 		emit snapshotAdded(idRow.first, info);
 	});
-	iAMainWindow::get()->addActionIcon(addAction, "plus");
+	mainWnd->addActionIcon(addAction, "plus");
 	auto addButton = new QToolButton(buttonContainer);
 	addButton->setDefaultAction(addAction);
 
@@ -262,7 +262,7 @@ iAPlaneSliceTool::iAPlaneSliceTool(iAMainWindow* mainWnd, iAMdiChild* child) :
 				m_child->updateRenderer();
 			}
 		});
-	iAMainWindow::get()->addActionIcon(cutAction, "cut_plane");
+	mainWnd->addActionIcon(cutAction, "cut_plane");
 	auto cutButton = new QToolButton(buttonContainer);
 	cutButton->setDefaultAction(cutAction);
 
@@ -273,13 +273,13 @@ iAPlaneSliceTool::iAPlaneSliceTool(iAMainWindow* mainWnd, iAMdiChild* child) :
 		clearSnapshots();
 		emit snapshotsCleared();
 	});
-	iAMainWindow::get()->addActionIcon(clearAction, "close");
+	mainWnd->addActionIcon(clearAction, "close");
 	auto clearButton = new QToolButton(buttonContainer);
 	clearButton->setDefaultAction(clearAction);
 
 	auto resetAction = new QAction("Reset");
 	resetAction->setToolTip("Reset slicing position to middle of first image dataset, aligned along a selected coordinate axis.");
-	QObject::connect(resetAction, &QAction::triggered, child, [this, child]()
+	QObject::connect(resetAction, &QAction::triggered, child, [this]()
 	{
 		iAAttributes params;
 		addAttr(params, "Axis", iAValueType::Categorical, QStringList() << "+X" << "-X" << "+Y" << "-Y" << "+Z" << "-Z");
@@ -292,7 +292,7 @@ iAPlaneSliceTool::iAPlaneSliceTool(iAMainWindow* mainWnd, iAMdiChild* child) :
 		resetPlaneParameters(nameToAxis(axisStr.right(1)), axisStr[0] == '+');
 		updateSliceFromUser();
 	});
-	iAMainWindow::get()->addActionIcon(resetAction, "slice-planes-gray");
+	mainWnd->addActionIcon(resetAction, "slice-planes-gray");
 	auto resetButton = new QToolButton(buttonContainer);
 	resetButton->setDefaultAction(resetAction);
 
@@ -324,7 +324,7 @@ iAPlaneSliceTool::iAPlaneSliceTool(iAMainWindow* mainWnd, iAMdiChild* child) :
 			}
 		}
 	});
-	iAMainWindow::get()->addActionIcon(syncAction, "slicer-sync");
+	mainWnd->addActionIcon(syncAction, "slicer-sync");
 	auto syncButton = new QToolButton(buttonContainer);
 	syncButton->setDefaultAction(syncAction);
 
@@ -504,7 +504,7 @@ std::pair<quint64, int> iAPlaneSliceTool::addSnapshot(iASnapshotInfo info)
 		removeSnapshot(id);
 		emit snapshotRemoved(id);
 	});
-	iAMainWindow::get()->addActionIcon(removeAction, "delete");
+	m_mainWindow->addActionIcon(removeAction, "delete");
 	auto removeButton = new QToolButton(actionContainer);
 	removeButton->setDefaultAction(removeAction);
 	actionContainer->layout()->addWidget(removeButton);