Commit 91db587a authored by Tom Titcombe's avatar Tom Titcombe
Browse files

Fix clang formatting issues

parent b184ab37
......@@ -35,8 +35,9 @@ public slots:
void doRefinements();
signals:
void refinementsComplete(Mantid::API::IAlgorithm_sptr /*_t1*/,
std::vector<GSASIIRefineFitPeaksOutputProperties> /*_t2*/);
void refinementsComplete(
Mantid::API::IAlgorithm_sptr /*_t1*/,
std::vector<GSASIIRefineFitPeaksOutputProperties> /*_t2*/);
void refinementSuccessful(Mantid::API::IAlgorithm_sptr /*_t1*/,
GSASIIRefineFitPeaksOutputProperties /*_t2*/);
......
......@@ -216,7 +216,8 @@ public:
public slots:
/// Slot for Q-Point selection notification
void QPointSelection_slot(bool /*lab_coords*/, double /*qx*/, double /*qy*/, double /*qz*/);
void QPointSelection_slot(bool /*lab_coords*/, double /*qx*/, double /*qy*/,
double /*qz*/);
private slots:
......
......@@ -62,9 +62,11 @@ public:
/// Clears the 'List of Logged Parameters' widget
void clearParametersList() const override;
/// Sets the 'List of workspaces' widget
void setWorkspaceList(const std::vector<std::string> & /*unused*/) const override;
void
setWorkspaceList(const std::vector<std::string> & /*unused*/) const override;
/// Sets the 'List of logged parameters' widget
void setParametersList(const std::vector<std::string> & /*unused*/) const override;
void
setParametersList(const std::vector<std::string> & /*unused*/) const override;
void disallowAutosave() override;
......
......@@ -97,7 +97,9 @@ int ReflSearchModel::rowCount(const QModelIndex & /*parent*/) const {
/**
@return the number of columns in the model.
*/
int ReflSearchModel::columnCount(const QModelIndex & /*parent*/) const { return 3; }
int ReflSearchModel::columnCount(const QModelIndex & /*parent*/) const {
return 3;
}
/**
Overrident data method, allows consuming view to extract data for an index and
......
......@@ -75,7 +75,8 @@ signals:
// signal to notify mask file loaded
void userfileLoaded();
/// signal to send gemoetry information
void sendGeometryInformation(QString & /*_t1*/, QString & /*_t2*/, QString & /*_t3*/, QString & /*_t4*/);
void sendGeometryInformation(QString & /*_t1*/, QString & /*_t2*/,
QString & /*_t3*/, QString & /*_t4*/);
private:
/// Stores the batch or single run mode selection
......
......@@ -32,7 +32,8 @@ const QString MASK_LIST =
class ExcludeRegionDelegate : public QItemDelegate {
public:
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem & /*option*/,
QWidget *createEditor(QWidget *parent,
const QStyleOptionViewItem & /*option*/,
const QModelIndex & /*index*/) const override {
auto lineEdit = Mantid::Kernel::make_unique<QLineEdit>(parent);
auto validator = Mantid::Kernel::make_unique<QRegExpValidator>(
......
......@@ -42,7 +42,8 @@ public:
signals:
void startXChanged(double /*_t1*/, std::size_t /*_t2*/, std::size_t /*_t3*/);
void endXChanged(double /*_t1*/, std::size_t /*_t2*/, std::size_t /*_t3*/);
void excludeRegionChanged(const std::string & /*_t1*/, std::size_t /*_t2*/, std::size_t /*_t3*/);
void excludeRegionChanged(const std::string & /*_t1*/, std::size_t /*_t2*/,
std::size_t /*_t3*/);
public slots:
void addData(std::size_t index);
......
......@@ -61,7 +61,8 @@ private:
};
struct CheckZeroSpectrum : boost::static_visitor<bool> {
bool operator()(const std::pair<std::size_t, std::size_t> & /*unused*/) const {
bool
operator()(const std::pair<std::size_t, std::size_t> & /*unused*/) const {
return false;
}
bool operator()(const DiscontinuousSpectra<std::size_t> &spectra) const {
......
......@@ -63,7 +63,8 @@ signals:
void dataChanged();
void startXChanged(double /*_t1*/, std::size_t /*_t2*/, std::size_t /*_t3*/);
void endXChanged(double /*_t1*/, std::size_t /*_t2*/, std::size_t /*_t3*/);
void excludeRegionChanged(const std::string & /*_t1*/, std::size_t /*_t2*/, std::size_t /*_t3*/);
void excludeRegionChanged(const std::string & /*_t1*/, std::size_t /*_t2*/,
std::size_t /*_t3*/);
void multipleDataViewSelected();
void singleDataViewSelected();
void requestedAddWorkspaceDialog();
......
......@@ -234,7 +234,9 @@ std::pair<double, double> DataController::getFittingRange(int i) const {
}
/// Inform the others that a dataset was updated.
void DataController::updateDataset(int row, int /*unused*/) { emit dataSetUpdated(row); }
void DataController::updateDataset(int row, int /*unused*/) {
emit dataSetUpdated(row);
}
/// Object's parent cast to MultiDatasetFit.
MultiDatasetFit *DataController::owner() const {
......
......@@ -21,10 +21,9 @@ LocalParameterItemDelegate::LocalParameterItemDelegate(
: QStyledItemDelegate(parent), m_currentEditor(nullptr) {}
/// Create a custom editor LocalParameterEditor.
QWidget *
LocalParameterItemDelegate::createEditor(QWidget *parent,
const QStyleOptionViewItem & /*option*/,
const QModelIndex &index) const {
QWidget *LocalParameterItemDelegate::createEditor(
QWidget *parent, const QStyleOptionViewItem & /*option*/,
const QModelIndex &index) const {
auto row = index.row();
m_currentEditor = new LocalParameterEditor(
parent, row, owner()->getValue(row), owner()->isFixed(row),
......@@ -53,8 +52,8 @@ LocalParameterItemDelegate::createEditor(QWidget *parent,
}
/// Initialize the editor with the current data in the cell.
void LocalParameterItemDelegate::setEditorData(QWidget * /*editor*/,
const QModelIndex & /*index*/) const {
void LocalParameterItemDelegate::setEditorData(
QWidget * /*editor*/, const QModelIndex & /*index*/) const {
// Needs to be empty to prevent Qt's default behaviour.
}
......
......@@ -830,7 +830,8 @@ void MultiDatasetFit::showParameterPlot() {
runPythonCode(pyInput);
}
void MultiDatasetFit::updateGuessFunction(const QString & /*unused*/, const QString & /*unused*/) {
void MultiDatasetFit::updateGuessFunction(const QString & /*unused*/,
const QString & /*unused*/) {
auto fun = m_functionBrowser->getFunction();
auto composite =
boost::dynamic_pointer_cast<Mantid::API::CompositeFunction>(fun);
......
......@@ -103,7 +103,8 @@ private slots:
void setLogNames();
void setParameterNamesForPlotting();
void invalidateOutput();
void updateGuessFunction(const QString & /*unused*/, const QString & /*unused*/);
void updateGuessFunction(const QString & /*unused*/,
const QString & /*unused*/);
protected:
void initLayout() override;
......
......@@ -143,8 +143,9 @@ signals:
void updateAlgorithmHistoryWindow(QString algName);
public:
AlgorithmHistoryWindow(QWidget *parent,
const boost::shared_ptr<const Mantid::API::Workspace> /*wsptr*/);
AlgorithmHistoryWindow(
QWidget *parent,
const boost::shared_ptr<const Mantid::API::Workspace> /*wsptr*/);
AlgorithmHistoryWindow(QWidget *parent, const QString &workspaceName);
~AlgorithmHistoryWindow() override;
......
......@@ -35,8 +35,8 @@ public:
AlgorithmProgressModel &model);
void algorithmStartedSlot(Mantid::API::AlgorithmID /*unused*/) override;
void updateProgressBarSlot(Mantid::API::AlgorithmID /*unused*/, double /*unused*/,
QString /*unused*/) override;
void updateProgressBarSlot(Mantid::API::AlgorithmID /*unused*/,
double /*unused*/, QString /*unused*/) override;
void algorithmEndedSlot(Mantid::API::AlgorithmID /*unused*/) override;
private:
......
......@@ -35,11 +35,12 @@ class AlgorithmProgressPresenter : public AlgorithmProgressPresenterBase {
Q_OBJECT
public:
AlgorithmProgressPresenter(QWidget *parent, AlgorithmProgressWidget * /*view*/);
AlgorithmProgressPresenter(QWidget *parent,
AlgorithmProgressWidget * /*view*/);
void algorithmStartedSlot(Mantid::API::AlgorithmID /*unused*/) override;
void updateProgressBarSlot(Mantid::API::AlgorithmID /*unused*/, double /*unused*/,
QString /*unused*/) override;
void updateProgressBarSlot(Mantid::API::AlgorithmID /*unused*/,
double /*unused*/, QString /*unused*/) override;
void algorithmEndedSlot(Mantid::API::AlgorithmID /*unused*/) override;
AlgorithmProgressModel &model() { return m_model; }
......
......@@ -42,9 +42,11 @@ public:
void algorithmEnded(Mantid::API::AlgorithmID /*alg*/);
/// Signals to the presenters that there has been progress in one of the
/// algorithms
void updateProgressBar(Mantid::API::AlgorithmID /*alg*/, double /*progress*/, const std::string & /*msg*/);
void updateProgressBar(Mantid::API::AlgorithmID /*alg*/, double /*progress*/,
const std::string & /*msg*/);
/// Sets the parameter progress bar to show the progress and message
void setProgressBar(QProgressBar * /*progressBar*/, double /*progress*/, const QString & /*message*/);
void setProgressBar(QProgressBar * /*progressBar*/, double /*progress*/,
const QString & /*message*/);
public slots:
virtual void algorithmStartedSlot(Mantid::API::AlgorithmID) = 0;
......@@ -54,7 +56,8 @@ public slots:
signals:
void algorithmStartedSignal(Mantid::API::AlgorithmID /*_t1*/);
void updateProgressBarSignal(Mantid::API::AlgorithmID /*_t1*/, double /*_t2*/, QString /*_t3*/);
void updateProgressBarSignal(Mantid::API::AlgorithmID /*_t1*/, double /*_t2*/,
QString /*_t3*/);
void algorithmEndedSignal(Mantid::API::AlgorithmID /*_t1*/);
};
} // namespace MantidWidgets
......
......@@ -36,24 +36,30 @@ public:
/// Notify this receiver with the list of table workspaces in the ADS that can
/// be loaded into the interface
virtual void notifyADSChanged(const QSet<QString> & /*unused*/, int /*unused*/) {}
virtual void notifyADSChanged(const QSet<QString> & /*unused*/,
int /*unused*/) {}
/// Return global options for pre-processing
virtual ColumnOptionsQMap getPreprocessingOptions(int /*unused*/) const {
return ColumnOptionsQMap();
}
/// Return global options for reduction
virtual OptionsQMap getProcessingOptions(int /*unused*/) const { return OptionsQMap(); }
virtual OptionsQMap getProcessingOptions(int /*unused*/) const {
return OptionsQMap();
}
/// Return global options for post-processing as a string
virtual QString getPostprocessingOptionsAsString(int /*unused*/) const {
return QString();
}
/// Return time-slicing values
virtual QString getTimeSlicingValues(int /*unused*/) const { return QString(); }
virtual QString getTimeSlicingValues(int /*unused*/) const {
return QString();
}
/// Return time-slicing type
virtual QString getTimeSlicingType(int /*unused*/) const { return QString(); }
/// Return transmission runs for a particular angle
virtual OptionsQMap getOptionsForAngle(const double /*unused*/, int /*unused*/) const {
virtual OptionsQMap getOptionsForAngle(const double /*unused*/,
int /*unused*/) const {
return OptionsQMap();
}
/// Return true if there are per-angle transmission runs set
......@@ -72,10 +78,12 @@ public:
virtual void confirmReductionCompleted(int /*unused*/) {}
virtual void confirmReductionPaused(int /*unused*/){};
virtual void confirmReductionResumed(int /*unused*/){};
virtual void completedGroupReductionSuccessfully(GroupData const & /*unused*/,
std::string const & /*unused*/){};
virtual void completedRowReductionSuccessfully(GroupData const & /*unused*/,
std::string const & /*unused*/){};
virtual void
completedGroupReductionSuccessfully(GroupData const & /*unused*/,
std::string const & /*unused*/){};
virtual void
completedRowReductionSuccessfully(GroupData const & /*unused*/,
std::string const & /*unused*/){};
};
} // namespace DataProcessor
} // namespace MantidWidgets
......
......@@ -40,19 +40,24 @@ class EXPORT_OPT_MANTIDQT_COMMON QDataProcessorWidget
public:
QDataProcessorWidget(std::unique_ptr<DataProcessorPresenter> presenter,
QWidget *parent = nullptr);
QDataProcessorWidget(const WhiteList & /*whitelist*/, QWidget *parent, int group = 0);
QDataProcessorWidget(const WhiteList & /*whitelist*/, const ProcessingAlgorithm & /*algorithm*/,
QWidget *parent, int group = 0);
QDataProcessorWidget(const WhiteList & /*whitelist*/, const PreprocessMap & /*preprocessMap*/,
const ProcessingAlgorithm & /*algorithm*/, QWidget *parent,
int group = 0);
QDataProcessorWidget(const WhiteList & /*whitelist*/, const ProcessingAlgorithm & /*algorithm*/,
const PostprocessingAlgorithm & /*postprocessor*/, QWidget *parent,
QDataProcessorWidget(const WhiteList & /*whitelist*/, QWidget *parent,
int group = 0);
QDataProcessorWidget(const WhiteList & /*whitelist*/, const PreprocessMap & /*preprocessMap*/,
QDataProcessorWidget(const WhiteList & /*whitelist*/,
const ProcessingAlgorithm & /*algorithm*/,
const PostprocessingAlgorithm & /*postprocessor*/, QWidget *parent,
int group = 0);
QWidget *parent, int group = 0);
QDataProcessorWidget(const WhiteList & /*whitelist*/,
const PreprocessMap & /*preprocessMap*/,
const ProcessingAlgorithm & /*algorithm*/,
QWidget *parent, int group = 0);
QDataProcessorWidget(const WhiteList & /*whitelist*/,
const ProcessingAlgorithm & /*algorithm*/,
const PostprocessingAlgorithm & /*postprocessor*/,
QWidget *parent, int group = 0);
QDataProcessorWidget(const WhiteList & /*whitelist*/,
const PreprocessMap & /*preprocessMap*/,
const ProcessingAlgorithm & /*algorithm*/,
const PostprocessingAlgorithm & /*postprocessor*/,
QWidget *parent, int group = 0);
~QDataProcessorWidget() override;
// Add actions to the toolbar
......
......@@ -86,7 +86,8 @@ public:
// Transfer rows into the table
void transfer(const std::vector<std::map<QString, QString>> &runs) override;
private slots:
void tableDataUpdated(const QModelIndex & /*unused*/, const QModelIndex & /*unused*/);
void tableDataUpdated(const QModelIndex & /*unused*/,
const QModelIndex & /*unused*/);
private:
/// Update all cached row data from the table data
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment