suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made last commit non-C++11 compatible

Browse Source
This commit is contained in:
Yorik van Havre 2016-01-19 11:25:16 -02:00
parent 5364a17c50
commit f480791472
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Mesh/App/AppMeshPy.cpp
View File

@ -195,7 +195,7 @@ static PyObject * exporter(PyObject *self, PyObject *args)
// If tolerance is specified via python interface, use that.
// If not, use the preference, if that exists, else default to 0.1mm.
auto hGrp(App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Mesh") );
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Mesh");
float fTolerance = hGrp->GetFloat( "MaxDeviationExport", 0.1f );
if (!PyArg_ParseTuple(args, "Oet|f", &object, "utf-8", &Name, &fTolerance))

5
src/Mod/Mesh/Gui/DlgSettingsImportExportImp.cpp
View File

@ -33,6 +33,11 @@ DlgSettingsImportExport::DlgSettingsImportExport(QWidget* parent)
ui->setupUi(this);
}
DlgSettingsImportExport::~DlgSettingsImportExport()
{
// no need to delete child widgets, Qt does it all for us
}
void DlgSettingsImportExport::saveSettings()
{
ui->maxDeviationExport->onSave();

6
src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h
View File

@ -38,8 +38,8 @@ class DlgSettingsImportExport : public Gui::Dialog::PreferencePage
Q_OBJECT
public:
DlgSettingsImportExport(QWidget *parent=nullptr);
~DlgSettingsImportExport() = default;
DlgSettingsImportExport(QWidget* parent = 0);
~DlgSettingsImportExport();
protected:
void saveSettings();
@ -47,7 +47,7 @@ protected:
void changeEvent(QEvent *e);
private:
std::auto_ptr<Ui_DlgSettingsImportExport> ui;
Ui_DlgSettingsImportExport* ui;
}; // end class DlgSettingsImportExport
} // namespace MeshGui