fix -Wextra & -Wdeprecated in Path

This commit is contained in:
wmayer 2016-09-22 18:53:24 +02:00
parent 664cf65d26
commit fa0b094e6a
9 changed files with 13 additions and 11 deletions

View File

@ -109,7 +109,7 @@ Vector3d Command::getCenter (void)
return vec; return vec;
} }
const double Command::getValue(const std::string& attr) double Command::getValue(const std::string& attr)
{ {
std::string a(attr); std::string a(attr);
boost::to_upper(a); boost::to_upper(a);
@ -119,7 +119,7 @@ const double Command::getValue(const std::string& attr)
return val; return val;
} }
const bool Command::has(const std::string& attr) bool Command::has(const std::string& attr)
{ {
std::string a(attr); std::string a(attr);
boost::to_upper(a); boost::to_upper(a);

View File

@ -55,9 +55,9 @@ namespace Path
std::string toGCode (void) const; // returns a GCode string representation of the command std::string toGCode (void) const; // returns a GCode string representation of the command
void setFromGCode (const std::string&); // sets the parameters from the contents of the given GCode string void setFromGCode (const std::string&); // sets the parameters from the contents of the given GCode string
void setFromPlacement (const Base::Placement&); // sets the parameters from the contents of the given placement void setFromPlacement (const Base::Placement&); // sets the parameters from the contents of the given placement
const bool has(const std::string&); // returns true if the given string exists in the parameters bool has(const std::string&); // returns true if the given string exists in the parameters
Command transform(const Base::Placement); // returns a transformed copy of this command Command transform(const Base::Placement); // returns a transformed copy of this command
const double getValue(const std::string&); // returns the value of a given parameter double getValue(const std::string&); // returns the value of a given parameter
// attributes // attributes
std::string Name; std::string Name;

View File

@ -26,7 +26,6 @@
#ifndef _PreComp_ #ifndef _PreComp_
#endif #endif
#include <strstream>
#include <boost/regex.hpp> #include <boost/regex.hpp>
#include <Base/Writer.h> #include <Base/Writer.h>
@ -43,7 +42,7 @@
#include "Path.h" #include "Path.h"
using namespace Path; using namespace Path;
using namespace Base; using namespace Base;
TYPESYSTEM_SOURCE(Path::Toolpath , Base::Persistence); TYPESYSTEM_SOURCE(Path::Toolpath , Base::Persistence);
@ -329,4 +328,4 @@ void Toolpath::RestoreDocFile(Base::Reader &reader)

View File

@ -28,7 +28,6 @@
#endif #endif
#include <strstream>
#include <Base/Console.h> #include <Base/Console.h>
#include <Base/Writer.h> #include <Base/Writer.h>
#include <Base/Reader.h> #include <Base/Reader.h>
@ -118,7 +117,7 @@ void PropertyPath::Restore(Base::XMLReader &reader)
} }
} }
void PropertyPath::SaveDocFile (Base::Writer &writer) const void PropertyPath::SaveDocFile (Base::Writer &) const
{ {
// does nothing // does nothing
} }

View File

@ -28,7 +28,6 @@
#endif #endif
#include <strstream>
#include <Base/Console.h> #include <Base/Console.h>
#include <Base/Writer.h> #include <Base/Writer.h>
#include <Base/Reader.h> #include <Base/Reader.h>

View File

@ -44,7 +44,7 @@ TYPESYSTEM_SOURCE(Path::Tool , Base::Persistence);
Tool::Tool(const char* name, Tool::Tool(const char* name,
ToolType type, ToolType type,
ToolMaterial material, ToolMaterial /*material*/,
double diameter, double diameter,
double lengthoffset, double lengthoffset,
double flatradius, double flatradius,

View File

@ -62,6 +62,7 @@ CmdPathCompound::CmdPathCompound()
void CmdPathCompound::activated(int iMsg) void CmdPathCompound::activated(int iMsg)
{ {
Q_UNUSED(iMsg);
std::vector<Gui::SelectionSingleton::SelObj> Sel = getSelection().getSelection(); std::vector<Gui::SelectionSingleton::SelObj> Sel = getSelection().getSelection();
if (Sel.size() > 0) { if (Sel.size() > 0) {
std::ostringstream cmd; std::ostringstream cmd;
@ -115,6 +116,7 @@ CmdPathShape::CmdPathShape()
void CmdPathShape::activated(int iMsg) void CmdPathShape::activated(int iMsg)
{ {
Q_UNUSED(iMsg);
std::vector<Gui::SelectionSingleton::SelObj> Sel = getSelection().getSelection(); std::vector<Gui::SelectionSingleton::SelObj> Sel = getSelection().getSelection();
if (Sel.size() == 1) { if (Sel.size() == 1) {
if (Sel[0].pObject->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) { if (Sel[0].pObject->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) {

View File

@ -127,6 +127,7 @@ void TaskDlgPathCompound::open()
void TaskDlgPathCompound::clicked(int button) void TaskDlgPathCompound::clicked(int button)
{ {
Q_UNUSED(button);
} }
bool TaskDlgPathCompound::accept() bool TaskDlgPathCompound::accept()

View File

@ -42,6 +42,7 @@ PROPERTY_SOURCE(PathGui::ViewProviderPathCompound, PathGui::ViewProviderPath)
bool ViewProviderPathCompound::setEdit(int ModNum) bool ViewProviderPathCompound::setEdit(int ModNum)
{ {
Q_UNUSED(ModNum);
Gui::TaskView::TaskDialog* dlg = new TaskDlgPathCompound(this); Gui::TaskView::TaskDialog* dlg = new TaskDlgPathCompound(this);
Gui::Control().showDialog(dlg); Gui::Control().showDialog(dlg);
return true; return true;
@ -49,6 +50,7 @@ bool ViewProviderPathCompound::setEdit(int ModNum)
void ViewProviderPathCompound::unsetEdit(int ModNum) void ViewProviderPathCompound::unsetEdit(int ModNum)
{ {
Q_UNUSED(ModNum);
// when pressing ESC make sure to close the dialog // when pressing ESC make sure to close the dialog
Gui::Control().closeDialog(); Gui::Control().closeDialog();
} }