From edfe948d50dc90b707ef539fda1fa74dbccf76ef Mon Sep 17 00:00:00 2001
From: Steve Williams <stephen.williams@stfc.ac.uk>
Date: Fri, 23 Jul 2010 14:58:07 +0000
Subject: [PATCH] Attempt to fix the Mantidplot failure on Darwin by
simplifying the code in the region of the error re #1263
---
Code/qtiplot/MantidQt/MantidWidgets/inc/SaveWorkspaces.h | 5 ++---
Code/qtiplot/MantidQt/MantidWidgets/src/SaveWorkspaces.cpp | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Code/qtiplot/MantidQt/MantidWidgets/inc/SaveWorkspaces.h b/Code/qtiplot/MantidQt/MantidWidgets/inc/SaveWorkspaces.h
index 6a4710e8138..e4a3708b057 100644
--- a/Code/qtiplot/MantidQt/MantidWidgets/inc/SaveWorkspaces.h
+++ b/Code/qtiplot/MantidQt/MantidWidgets/inc/SaveWorkspaces.h
@@ -47,9 +47,8 @@ namespace MantidQt
Q_OBJECT
public:
- SaveWorkspaces(QWidget *parent, const QString & suggFname = "",
- const QHash<const QCheckBox * const, QString> & defSavs =
- QHash<const QCheckBox * const, QString>());
+ SaveWorkspaces(QWidget *parent, const QString & suggFname,
+ QHash<const QCheckBox * const, QString> & defSavs);
void initLayout();
///Returns the save extension expected the name algorithm
static QString getSaveAlgExt(const QString & algName);
diff --git a/Code/qtiplot/MantidQt/MantidWidgets/src/SaveWorkspaces.cpp b/Code/qtiplot/MantidQt/MantidWidgets/src/SaveWorkspaces.cpp
index 1bce54643cc..ddac03f5361 100644
--- a/Code/qtiplot/MantidQt/MantidWidgets/src/SaveWorkspaces.cpp
+++ b/Code/qtiplot/MantidQt/MantidWidgets/src/SaveWorkspaces.cpp
@@ -32,7 +32,7 @@ using namespace Mantid::API;
* @param suggFname sets the initial entry in the filename box
* @param defSavs sets which boxes are ticked
*/
-SaveWorkspaces::SaveWorkspaces(QWidget *parent, const QString & suggFname, const QHash<const QCheckBox * const, QString> & defSavs) :
+SaveWorkspaces::SaveWorkspaces(QWidget *parent, const QString & suggFname, QHash<const QCheckBox * const, QString> & defSavs) :
API::MantidQtDialog(parent)
{
setWindowTitle("Save Workspaces");
--
GitLab