Skip to content

Commit 76c5fc2

Browse files
authored
Merge pull request #190 from atsju/JST/warning
fix remaining build warnings
2 parents 90c4cbd + b7e0a35 commit 76c5fc2

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

DFTFringe.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ QT += charts concurrent core datavisualization gui multimedia multimediawidgets
1818

1919
qtHaveModule(printsupport): QT += printsupport
2020

21-
QMAKE_CXXFLAGS += -std=c++11
21+
QMAKE_CXXFLAGS += -std=c++14
2222

2323
# disable qDebug() in release
2424
CONFIG( release, debug|release ) {

astigstatsdlg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ class RunningStat
187187
{
188188
public:
189189
RunningStat() :
190-
m_n(0), m_oldM(NAN), m_oldS(0.), m_min(DBL_MAX), m_max(DBL_MIN)
190+
m_n(0), m_oldM(NAN), m_oldS(0.), m_newS(0.), m_min(DBL_MAX), m_max(DBL_MIN)
191191
{}
192192

193193
void Push(double x)

mainwindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2074,7 +2074,7 @@ void MainWindow::on_actionastig_in_polar_triggered()
20742074
{
20752075
surfaceAnalysisTools *saTools = surfaceAnalysisTools::get_Instance();
20762076
QList<int> list = saTools->SelectedWaveFronts();
2077-
astigPolargraph * graph = new astigPolargraph( list);
2077+
astigPolargraph * graph = new astigPolargraph( list, this);
20782078
graph->resize(2000,1000);
20792079
graph->exec();
20802080
}

percentcorrectiondlg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ void percentCorrectionDlg::plot(){
482482
if (surfs.length() < 2) {
483483
// draw zone rectangles
484484

485-
double width;
485+
double width= 0.;
486486
for(int i = 0; i < percent.length(); ++i){
487487

488488
double y = percent[i].y();

profileplot.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ ProfilePlot::ProfilePlot(QWidget *parent , ContourTools *tools):
7575
zoomed = false;
7676
m_defocus_mode = false;
7777
m_plot = new QwtPlot(this);
78-
profilePlotPicker *picker = new profilePlotPicker(m_plot);
78+
new profilePlotPicker(m_plot);
7979
type = 0;
8080
QHBoxLayout * l1 = new QHBoxLayout();
8181
QVBoxLayout *v1 = new QVBoxLayout();

0 commit comments

Comments
 (0)