Made last commit non-C++11 compatible

FreeCAD · Jan 19, 2016 · f480791 · f480791 · ianrrees · Jan 19, 2016
1 parent 5364a17
commit f480791
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/Mod/Mesh/App/AppMeshPy.cpp b/src/Mod/Mesh/App/AppMeshPy.cpp
@@ -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))

diff --git a/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.cpp b/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.cpp
@@ -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();

diff --git a/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h b/src/Mod/Mesh/Gui/DlgSettingsImportExportImp.h
@@ -38,16 +38,16 @@ class DlgSettingsImportExport : public Gui::Dialog::PreferencePage
     Q_OBJECT
 
 public:
-    DlgSettingsImportExport(QWidget *parent=nullptr);
-    ~DlgSettingsImportExport() = default;
+    DlgSettingsImportExport(QWidget* parent = 0);
+    ~DlgSettingsImportExport();
 
 protected:
     void saveSettings();
     void loadSettings();
     void changeEvent(QEvent *e);
 
 private:
-    std::auto_ptr<Ui_DlgSettingsImportExport> ui;
+    Ui_DlgSettingsImportExport* ui;
 };  // end class DlgSettingsImportExport
 
 } // namespace MeshGui