From dec6897ec9fede318d79be8214a53da427714ef4 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 21 Sep 2016 21:10:41 +0200 Subject: [PATCH] fix -Wextra in Points --- src/Mod/Points/App/Points.cpp | 8 ++++---- src/Mod/Points/App/PointsGrid.cpp | 2 +- src/Mod/Points/App/PropertyPointKernel.cpp | 1 + src/Mod/Points/Gui/Command.cpp | 10 ++++++++++ src/Mod/Points/Gui/ViewProvider.cpp | 2 +- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/Mod/Points/App/Points.cpp b/src/Mod/Points/App/Points.cpp index c11c112d95..3580352801 100644 --- a/src/Mod/Points/App/Points.cpp +++ b/src/Mod/Points/App/Points.cpp @@ -52,12 +52,12 @@ std::vector PointKernel::getElementTypes(void) const return temp; } -unsigned long PointKernel::countSubElements(const char* Type) const +unsigned long PointKernel::countSubElements(const char* /*Type*/) const { return 0; } -Data::Segment* PointKernel::getSubElement(const char* Type, unsigned long n) const +Data::Segment* PointKernel::getSubElement(const char* /*Type*/, unsigned long /*n*/) const { //unsigned long i = 1; @@ -194,8 +194,8 @@ void PointKernel::save(std::ostream& out) const } void PointKernel::getPoints(std::vector &Points, - std::vector &Normals, - float Accuracy, uint16_t flags) const + std::vector &/*Normals*/, + float /*Accuracy*/, uint16_t /*flags*/) const { unsigned long ctpoints = _Points.size(); Points.reserve(ctpoints); diff --git a/src/Mod/Points/App/PointsGrid.cpp b/src/Mod/Points/App/PointsGrid.cpp index 428e1c520a..52b9b919f5 100644 --- a/src/Mod/Points/App/PointsGrid.cpp +++ b/src/Mod/Points/App/PointsGrid.cpp @@ -629,7 +629,7 @@ unsigned long PointsGrid::GetElements (unsigned long ulX, unsigned long ulY, uns return 0; } -void PointsGrid::AddPoint (const Base::Vector3d &rclPt, unsigned long ulPtIndex, float fEpsilon) +void PointsGrid::AddPoint (const Base::Vector3d &rclPt, unsigned long ulPtIndex, float /*fEpsilon*/) { unsigned long ulX, ulY, ulZ; Pos(Base::Vector3d(rclPt.x, rclPt.y, rclPt.z), ulX, ulY, ulZ); diff --git a/src/Mod/Points/App/PropertyPointKernel.cpp b/src/Mod/Points/App/PropertyPointKernel.cpp index 6e9a01c438..37367bcac0 100644 --- a/src/Mod/Points/App/PropertyPointKernel.cpp +++ b/src/Mod/Points/App/PropertyPointKernel.cpp @@ -125,6 +125,7 @@ void PropertyPointKernel::Restore(Base::XMLReader &reader) void PropertyPointKernel::SaveDocFile (Base::Writer &writer) const { // does nothing + (void)writer; } void PropertyPointKernel::RestoreDocFile(Base::Reader &reader) diff --git a/src/Mod/Points/Gui/Command.cpp b/src/Mod/Points/Gui/Command.cpp index 27cd79a053..a6768a9134 100644 --- a/src/Mod/Points/Gui/Command.cpp +++ b/src/Mod/Points/Gui/Command.cpp @@ -70,6 +70,8 @@ CmdPointsImport::CmdPointsImport() void CmdPointsImport::activated(int iMsg) { + Q_UNUSED(iMsg); + QString fn = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), QString::null, QString(), QString::fromLatin1("%1 (*.asc);;%2 (*.*)") .arg(QObject::tr("Ascii Points")).arg(QObject::tr("All Files"))); @@ -117,6 +119,8 @@ CmdPointsExport::CmdPointsExport() void CmdPointsExport::activated(int iMsg) { + Q_UNUSED(iMsg); + std::vector points = getSelection().getObjectsOfType(Points::Feature::getClassTypeId()); for (std::vector::const_iterator it = points.begin(); it != points.end(); ++it) { QString fn = Gui::FileDialog::getSaveFileName(Gui::getMainWindow(), @@ -156,6 +160,8 @@ CmdPointsTransform::CmdPointsTransform() void CmdPointsTransform::activated(int iMsg) { + Q_UNUSED(iMsg); + // This is a test command to transform a point cloud directly written in C++ (not Python) Base::Placement trans; trans.setRotation(Base::Rotation(Base::Vector3d(0.0, 0.0, 1.0), 1.570796)); @@ -190,6 +196,8 @@ CmdPointsConvert::CmdPointsConvert() void CmdPointsConvert::activated(int iMsg) { + Q_UNUSED(iMsg); + bool ok; double tol = QInputDialog::getDouble(Gui::getMainWindow(), QObject::tr("Distance"), QObject::tr("Enter maximum distance:"), 0.1, 0.05, 10.0, 2, &ok); @@ -277,6 +285,8 @@ CmdPointsPolyCut::CmdPointsPolyCut() void CmdPointsPolyCut::activated(int iMsg) { + Q_UNUSED(iMsg); + std::vector docObj = Gui::Selection().getObjectsOfType(Points::Feature::getClassTypeId()); for (std::vector::iterator it = docObj.begin(); it != docObj.end(); ++it) { if (it == docObj.begin()) { diff --git a/src/Mod/Points/Gui/ViewProvider.cpp b/src/Mod/Points/Gui/ViewProvider.cpp index e6a386de42..efecd9e720 100644 --- a/src/Mod/Points/Gui/ViewProvider.cpp +++ b/src/Mod/Points/Gui/ViewProvider.cpp @@ -297,7 +297,7 @@ void ViewProviderPoints::unsetEdit(int) { } -void ViewProviderPoints::clipPointsCallback(void * ud, SoEventCallback * n) +void ViewProviderPoints::clipPointsCallback(void *, SoEventCallback * n) { // When this callback function is invoked we must in either case leave the edit mode Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData());