From 05b9c630ef8f5f41d10aa7c53e3dc6d8cf36b5f1 Mon Sep 17 00:00:00 2001
From: Lottie Greenwood <lottie.greenwood@stfc.ac.uk>
Date: Mon, 6 Jun 2016 10:35:59 +0100
Subject: [PATCH] Removed commented out code Re #16326
---
MantidPlot/src/ApplicationWindow.cpp | 7 -------
MantidPlot/src/ApplicationWindow.h | 4 ++--
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/MantidPlot/src/ApplicationWindow.cpp b/MantidPlot/src/ApplicationWindow.cpp
index 6a7e504f09f..06fb1958c7c 100644
--- a/MantidPlot/src/ApplicationWindow.cpp
+++ b/MantidPlot/src/ApplicationWindow.cpp
@@ -910,8 +910,6 @@ QMenuBar *ApplicationWindow::myMenuBar() {
void ApplicationWindow::initToolBars() {
initPlot3DToolBar();
-
- // setWindowIcon(QIcon(getQPixmap("logo_xpm")));
setWindowIcon(QIcon(":/MantidPlot_Icon_32offset.png"));
QPixmap openIcon, saveIcon;
@@ -3872,7 +3870,6 @@ void ApplicationWindow::defineErrorBars(const QString &name, int type,
ycol = t->colIndex(xColName);
QVarLengthArray<double> Y(t->col(ycol));
- // Y=t->col(ycol);
QString errColName = t->colName(c);
double prc = percent.toDouble();
@@ -7412,7 +7409,6 @@ void ApplicationWindow::showPlotDialog(int curveKey) {
PlotDialog *pd = new PlotDialog(d_extended_plot_dialog, this, w);
pd->setAttribute(Qt::WA_DeleteOnClose);
pd->insertColumnsList(columnsList(Table::All));
- // pd->setMultiLayer(w);
if (curveKey >= 0) {
Graph *g = w->activeGraph();
if (g)
@@ -11899,8 +11895,6 @@ void ApplicationWindow::connectMultilayerPlot(MultiLayer *g) {
connect(g, SIGNAL(createTable(const QString &, int, int, const QString &)),
this, SLOT(newTable(const QString &, int, int, const QString &)));
connect(g, SIGNAL(viewTitleDialog()), this, SLOT(showTitleDialog()));
- // connect
- // (g,SIGNAL(modifiedWindow(MdiSubWindow*)),this,SLOT(modifiedProject(MdiSubWindow*)));
connect(g, SIGNAL(modifiedPlot()), this, SLOT(modifiedProject()));
connect(g, SIGNAL(showLineDialog()), this, SLOT(showLineDialog()));
connect(g, SIGNAL(pasteMarker()), this, SLOT(pasteSelection()));
@@ -12479,7 +12473,6 @@ void ApplicationWindow::createActions() {
connect(actionShowColumnOptionsDialog, SIGNAL(activated()), this,
SLOT(showColumnOptionsDialog()));
- // JZ May 3, 2011: Removed this because it segfaults.
actionShowColumnValuesDialog = new QAction(
QIcon(getQPixmap("formula_xpm")), tr("Set Column &Values ..."), this);
connect(actionShowColumnValuesDialog, SIGNAL(activated()), this,
diff --git a/MantidPlot/src/ApplicationWindow.h b/MantidPlot/src/ApplicationWindow.h
index 06582d69dcd..57fb3ffeee5 100644
--- a/MantidPlot/src/ApplicationWindow.h
+++ b/MantidPlot/src/ApplicationWindow.h
@@ -1403,7 +1403,7 @@ private:
QAction *actionNormalizeTable, *actionConvolute, *actionDeconvolute, *actionCorrelate, *actionAutoCorrelate;
QAction *actionSetAscValues, *actionSetRandomValues;
QAction *actionSetXCol, *actionSetYCol, *actionSetZCol, *actionSetLabelCol, *actionDisregardCol, *actionSetXErrCol, *actionSetYErrCol;
- QAction *actionBoxPlot, /**actionMultiPeakGauss, *actionMultiPeakLorentz,*/ *actionCheckUpdates;
+ QAction *actionBoxPlot, *actionCheckUpdates;
QAction *actionDonate, *actionHomePage, *actionDownloadManual, *actionTechnicalSupport, *actionTranslations;
QAction *actionHelpForums, *actionHelpBugReports, *actionAskHelp;
QAction *actionShowPlotDialog, *actionShowScaleDialog;
@@ -1413,7 +1413,7 @@ private:
QAction *actionShowScriptWindow, *actionShowScriptInterpreter;
QAction *actionAnimate, *actionPerspective, *actionFitFrame, *actionResetRotation;
QAction *actionDeleteRows, *actionDrawPoints;
- QAction *btnCursor, /* *btnSelect,*/ *btnPicker, *btnRemovePoints, *btnMovePoints, /* *btnPeakPick,*/ *btnMultiPeakPick;
+ QAction *btnCursor, *btnPicker, *btnRemovePoints, *btnMovePoints, *btnMultiPeakPick;
QAction *btnZoomIn, *btnZoomOut, *btnPointer, *btnLine, *btnArrow, *btnLabel;
QAction *actionFlipMatrixVertically, *actionFlipMatrixHorizontally, *actionRotateMatrix;
QAction *actionViewMatrixImage, *actionViewMatrix, *actionExportMatrix;
--
GitLab