Skip to content

Commit

Permalink
Quieting cppcheck warnings. Refs #3868.
Browse files Browse the repository at this point in the history
  • Loading branch information
@peterfpeterson
peterfpeterson committed Jan 4, 2012
1 parent 4fc2c13 commit fb13527
Show file tree
Hide file tree
Showing 22 changed files with 123 additions and 121 deletions.
12 changes: 6 additions & 6 deletions Code/Mantid/MantidPlot/src/AxesDialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1228,7 +1228,7 @@ AxesDialog::AxesDialog( QWidget* parent, Qt::WFlags fl )

void AxesDialog::initScalesPage()
{
ApplicationWindow *app = (ApplicationWindow *)parent();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parent());
scalesPage = new QWidget();

QGroupBox * middleBox = new QGroupBox(QString());
Expand Down Expand Up @@ -1476,14 +1476,14 @@ void AxesDialog::initGridPage()
rightLayout->addWidget( new QLabel(tr( "Thickness" )), 3, 0 );

boxWidthMajor = new DoubleSpinBox('f');
boxWidthMajor->setLocale(((ApplicationWindow *)parent())->locale());
boxWidthMajor->setLocale(dynamic_cast<ApplicationWindow *>(this->parent())->locale());
boxWidthMajor->setSingleStep(0.1);
boxWidthMajor->setRange(0.1, 20);
boxWidthMajor->setValue(1);
rightLayout->addWidget( boxWidthMajor, 3, 1);

boxWidthMinor = new DoubleSpinBox('f');
boxWidthMinor->setLocale(((ApplicationWindow *)parent())->locale());
boxWidthMinor->setLocale(dynamic_cast<ApplicationWindow *>(this->parent())->locale());
boxWidthMinor->setSingleStep(0.1);
boxWidthMinor->setRange(0.1, 20);
boxWidthMinor->setValue(1);
Expand Down Expand Up @@ -2247,7 +2247,7 @@ void AxesDialog::updateGrid()

case 2:
{
ApplicationWindow *app = (ApplicationWindow *)parent();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parent());
if (!app)
return;

Expand Down Expand Up @@ -2575,7 +2575,7 @@ bool AxesDialog::updatePlot()

void AxesDialog::setGraph(Graph *g)
{
ApplicationWindow *app = (ApplicationWindow *)this->parent();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parent());
if (!app)
return;

Expand Down Expand Up @@ -3129,7 +3129,7 @@ void AxesDialog::showAxis(int axis, int type, const QString& labelsColName, bool
int majTicksType, int minTicksType, bool labelsOn, const QColor& c, int format,
int prec, int rotation, int baselineDist, const QString& formula, const QColor& labelsColor)
{
ApplicationWindow *app = (ApplicationWindow *)this->parent();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parent());
if (!app)
return;

Expand Down
42 changes: 21 additions & 21 deletions Code/Mantid/MantidPlot/src/ConfigDialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ ConfigDialog::ConfigDialog( QWidget* parent, Qt::WFlags fl )
: QDialog( parent, fl )
{
// get current values from app window
ApplicationWindow *app = (ApplicationWindow *)parentWidget();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());
plot3DTitleFont = app->plot3DTitleFont;
plot3DNumbersFont = app->plot3DNumbersFont;
plot3DAxesFont = app->plot3DAxesFont;
Expand Down Expand Up @@ -179,7 +179,7 @@ void ConfigDialog::setCurrentPage(int index)

void ConfigDialog::initTablesPage()
{
ApplicationWindow *app = (ApplicationWindow *)parentWidget();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());
tables = new QWidget();

QHBoxLayout * topLayout = new QHBoxLayout();
Expand Down Expand Up @@ -245,7 +245,7 @@ void ConfigDialog::initTablesPage()

void ConfigDialog::initPlotsPage()
{
ApplicationWindow *app = (ApplicationWindow *)parentWidget();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());

plotsTabWidget = new QTabWidget();

Expand Down Expand Up @@ -355,7 +355,7 @@ void ConfigDialog::showFrameWidth(bool ok)

void ConfigDialog::initPlots3DPage()
{
ApplicationWindow *app = (ApplicationWindow *)parentWidget();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());
plots3D = new QWidget();

QGroupBox * topBox = new QGroupBox();
Expand Down Expand Up @@ -441,7 +441,7 @@ void ConfigDialog::initPlots3DPage()

void ConfigDialog::initAppPage()
{
ApplicationWindow *app = (ApplicationWindow *)parentWidget();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());

appTabWidget = new QTabWidget(generalDialog);
appTabWidget->setUsesScrollButtons(false);
Expand Down Expand Up @@ -1152,7 +1152,7 @@ void ConfigDialog::initCurveFittingTab()
}
}

ApplicationWindow *app = (ApplicationWindow *)parentWidget();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());

// Set the correct default property
QString setting = //QString::fromStdString(Mantid::Kernel::ConfigService::Instance().getString("curvefitting.autoBackground"));
Expand Down Expand Up @@ -1227,7 +1227,7 @@ void ConfigDialog::initCurveFittingTab()

void ConfigDialog::initOptionsPage()
{
ApplicationWindow *app = (ApplicationWindow *)parentWidget();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());

plotOptions = new QWidget();

Expand Down Expand Up @@ -1304,7 +1304,7 @@ void ConfigDialog::initOptionsPage()

void ConfigDialog::initAxesPage()
{
ApplicationWindow *app = (ApplicationWindow *)parentWidget();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());

plotAxes = new QWidget();

Expand Down Expand Up @@ -1382,7 +1382,7 @@ void ConfigDialog::initAxesPage()

void ConfigDialog::initCurvesPage()
{
ApplicationWindow *app = (ApplicationWindow *)parentWidget();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());

curves = new QWidget();

Expand Down Expand Up @@ -1429,7 +1429,7 @@ void ConfigDialog::initCurvesPage()

void ConfigDialog::initFittingPage()
{
ApplicationWindow *app = (ApplicationWindow *)parentWidget();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());
fitPage = new QWidget();

groupBoxFittingCurve = new QGroupBox();
Expand Down Expand Up @@ -1503,7 +1503,7 @@ void ConfigDialog::initFittingPage()

void ConfigDialog::initConfirmationsPage()
{
ApplicationWindow *app = (ApplicationWindow *)parentWidget();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());
confirm = new QWidget();

groupBoxConfirm = new QGroupBox();
Expand Down Expand Up @@ -1552,7 +1552,7 @@ void ConfigDialog::initConfirmationsPage()

void ConfigDialog::initFileLocationsPage()
{
ApplicationWindow *app = (ApplicationWindow *)parentWidget();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());
fileLocationsPage = new QWidget();

QGroupBox *gb = new QGroupBox();
Expand Down Expand Up @@ -1607,7 +1607,7 @@ void ConfigDialog::initFileLocationsPage()
void ConfigDialog::languageChange()
{
setWindowTitle( tr( "MantidPlot - Choose default settings" ) ); //Mantid
ApplicationWindow *app = (ApplicationWindow *)parentWidget();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());

// pages list
itemsList->clear();
Expand Down Expand Up @@ -1872,7 +1872,7 @@ void ConfigDialog::accept()

void ConfigDialog::apply()
{
ApplicationWindow *app = (ApplicationWindow *)parentWidget();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());
if (!app)
return;

Expand Down Expand Up @@ -2096,7 +2096,7 @@ void ConfigDialog::updateCurveFitSettings()
setting += std::string(" ") + args.toStdString();
}

ApplicationWindow *app = (ApplicationWindow *)parentWidget();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());

//mantid_config.setString("curvefitting.autoBackground", setting);
app->mantidUI->fitFunctionBrowser()->setAutoBackgroundName(QString::fromStdString(setting));
Expand Down Expand Up @@ -2144,7 +2144,7 @@ void ConfigDialog::updateMantidOptionsTab()
mantid_config.setString("algorithms.categories.hidden",hiddenCategoryString);

//update the algorithm tree
ApplicationWindow *app = (ApplicationWindow *)parentWidget();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());
app->mantidUI->updateAlgorithms();
}
}
Expand Down Expand Up @@ -2372,14 +2372,14 @@ void ConfigDialog::gotoMantidDirectories()

void ConfigDialog::switchToLanguage(int param)
{
ApplicationWindow *app = (ApplicationWindow *)parentWidget();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());
app->switchToLanguage(param);
languageChange();
}

void ConfigDialog::insertLanguagesList()
{
ApplicationWindow *app = (ApplicationWindow *)parentWidget();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());
if(!app)
return;

Expand Down Expand Up @@ -2431,7 +2431,7 @@ void ConfigDialog::showPointsBox(bool)

void ConfigDialog::chooseTranslationsFolder()
{
ApplicationWindow *app = (ApplicationWindow *)parentWidget();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());
if (!app)
return;

Expand All @@ -2449,7 +2449,7 @@ void ConfigDialog::chooseTranslationsFolder()

void ConfigDialog::chooseHelpFolder()
{
ApplicationWindow *app = (ApplicationWindow *)parentWidget();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());
if (!app)
return;

Expand All @@ -2462,7 +2462,7 @@ void ConfigDialog::chooseHelpFolder()
// #ifdef SCRIPTING_PYTHON
// void ConfigDialog::choosePythonConfigFolder()
// {
// ApplicationWindow *app = (ApplicationWindow *)parentWidget();
// ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parentWidget());
// if (!app)
// return;

Expand Down
14 changes: 7 additions & 7 deletions Code/Mantid/MantidPlot/src/CurvesDialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ void CurvesDialog::showCurveRangeDialog()
if (curve < 0)
curve = 0;

ApplicationWindow *app = (ApplicationWindow *)this->parent();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(parent());
if (app)
{
app->showCurveRangeDialog(d_graph, curve);
Expand All @@ -228,7 +228,7 @@ void CurvesDialog::showPlotAssociations()
if (curve < 0)
curve = 0;

ApplicationWindow *app = (ApplicationWindow *)this->parent();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(parent());
close();

if (app)
Expand All @@ -237,7 +237,7 @@ void CurvesDialog::showPlotAssociations()

void CurvesDialog::showFunctionDialog()
{
ApplicationWindow *app = (ApplicationWindow *)this->parent();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(parent());
int currentRow = contents->currentRow();
close();

Expand Down Expand Up @@ -283,7 +283,7 @@ void CurvesDialog::contextMenuEvent(QContextMenuEvent *e)

void CurvesDialog::init()
{
ApplicationWindow *app = (ApplicationWindow *)this->parent();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(parent());
if (app){
bool currentFolderOnly = app->d_show_current_folder;
boxShowCurrentFolder->setChecked(currentFolderOnly);
Expand Down Expand Up @@ -377,7 +377,7 @@ void CurvesDialog::addCurves()

bool CurvesDialog::addCurve(const QString& name)
{
ApplicationWindow *app = (ApplicationWindow *)this->parent();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parent());
if (!app)
return false;

Expand Down Expand Up @@ -553,7 +553,7 @@ void CurvesDialog::updateCurveRange()

void CurvesDialog::showCurrentFolder(bool currentFolder)
{
ApplicationWindow *app = (ApplicationWindow *)this->parent();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parent());
if (!app)
return;

Expand Down Expand Up @@ -583,7 +583,7 @@ void CurvesDialog::showCurrentFolder(bool currentFolder)

void CurvesDialog::closeEvent(QCloseEvent* e)
{
ApplicationWindow *app = (ApplicationWindow *)this->parent();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parent());
if (app)
{
app->d_add_curves_dialog_size = this->size();
Expand Down
10 changes: 5 additions & 5 deletions Code/Mantid/MantidPlot/src/CustomActionDialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ CustomActionDialog::CustomActionDialog(QWidget* parent, Qt::WFlags fl)

void CustomActionDialog::init()
{
ApplicationWindow *app = (ApplicationWindow *)parent();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(parent());
folderBox->setText(app->customActionsDirPath);

d_menus = app->customizableMenusList();
Expand Down Expand Up @@ -263,7 +263,7 @@ bool CustomActionDialog::validUserInput()
folder = folderBox->text();
}

ApplicationWindow *app = (ApplicationWindow *)this->parent();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(parent());
QList<QAction *>actions = app->customActionsList();

if (textBox->text().isEmpty()){
Expand Down Expand Up @@ -394,7 +394,7 @@ void CustomActionDialog::saveCurrentAction()
if ((toolBarBtn->isChecked() && w->objectName() != toolBarBox->currentText()) ||
(menuBtn->isChecked() && w->objectName() != menuBox->currentText())){
//relocate action: create a new one and delete the old
ApplicationWindow *app = (ApplicationWindow *)parent();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(parent());
QAction *newAction = new QAction(app);
customizeAction(newAction);
if (toolBarBtn->isChecked()){
Expand Down Expand Up @@ -426,7 +426,7 @@ void CustomActionDialog::saveAction(QAction *action)
if (!action)
return;

ApplicationWindow *app = (ApplicationWindow *)parent();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(parent());
QString fileName = app->customActionsDirPath + "/" + action->text() + ".qca";
QFile f(fileName);
if (!f.open( QIODevice::WriteOnly)){
Expand Down Expand Up @@ -496,7 +496,7 @@ void CustomActionDialog::chooseFolder()

QAction * CustomActionDialog::actionAt(int row)
{
ApplicationWindow *app = (ApplicationWindow *)this->parent();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(parent());
QList<QAction *>actions = app->customActionsList();
if (actions.isEmpty() || row < 0 || row >= actions.count())
return 0;
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/MantidPlot/src/Differentiation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ void Differentiation::output()
for (int i = 1; i < d_n-1; i++)
result[i]=0.5*((d_y[i+1]-d_y[i])/(d_x[i+1]-d_x[i]) + (d_y[i]-d_y[i-1])/(d_x[i]-d_x[i-1]));

ApplicationWindow *app = (ApplicationWindow *)parent();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(parent());
QLocale locale = app->locale();
QString tableName = app->generateUniqueName(QString(objectName()));
QString dataSet;
Expand Down
6 changes: 3 additions & 3 deletions Code/Mantid/MantidPlot/src/ExpDecayDialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ void ExpDecayDialog::activateCurve(const QString& curveName)
if (!c)
return;

ApplicationWindow *app = (ApplicationWindow *)this->parent();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parent());
if (!app)
return;

Expand Down Expand Up @@ -201,7 +201,7 @@ void ExpDecayDialog::fit()
return;
}

ApplicationWindow *app = (ApplicationWindow *)this->parent();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parent());
if (!app)
return;

Expand Down Expand Up @@ -264,7 +264,7 @@ void ExpDecayDialog::closeEvent (QCloseEvent * e )
{
if(fitter)
{
ApplicationWindow *app = (ApplicationWindow *)this->parent();
ApplicationWindow *app = dynamic_cast<ApplicationWindow *>(this->parent());
if (app && app->pasteFitResultsToPlot)
fitter->showLegend();

Expand Down

0 comments on commit fb13527

Please sign in to comment.