diff options
Diffstat (limited to 'src/qalculateplotdialog.cpp')
| -rw-r--r-- | src/qalculateplotdialog.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/qalculateplotdialog.cpp b/src/qalculateplotdialog.cpp index 6755bed..6c0a61b 100644 --- a/src/qalculateplotdialog.cpp +++ b/src/qalculateplotdialog.cpp @@ -20,6 +20,8 @@ #include "qalculateplotdialog.h" #include "qalculateexpressionedit.h" +#include <vector> +#include <string> #include <klineedit.h> #include <kpushbutton.h> #include <kcombobox.h> @@ -587,7 +589,7 @@ void QalculatePlotDialog::applyAppearance() { updatePlot(); } -bool QalculatePlotDialog::generatePlot(PlotParameters &pp, vector<MathStructure> &y_vectors, vector<MathStructure> &x_vectors, vector<PlotDataParameters*> &pdps) { +bool QalculatePlotDialog::generatePlot(PlotParameters &pp, std::vector<MathStructure> &y_vectors, std::vector<MathStructure> &x_vectors, std::vector<PlotDataParameters*> &pdps) { TQListViewItemIterator it(seriesView); if(!it.current()) { return false; @@ -736,9 +738,9 @@ void QalculatePlotDialog::savePlot() { } } } - vector<MathStructure> y_vectors; - vector<MathStructure> x_vectors; - vector<PlotDataParameters*> pdps; + std::vector<MathStructure> y_vectors; + std::vector<MathStructure> x_vectors; + std::vector<PlotDataParameters*> pdps; PlotParameters pp; if(generatePlot(pp, y_vectors, x_vectors, pdps)) { pp.filename = filename.ascii(); @@ -750,9 +752,9 @@ void QalculatePlotDialog::savePlot() { } } void QalculatePlotDialog::updatePlot() { - vector<MathStructure> y_vectors; - vector<MathStructure> x_vectors; - vector<PlotDataParameters*> pdps; + std::vector<MathStructure> y_vectors; + std::vector<MathStructure> x_vectors; + std::vector<PlotDataParameters*> pdps; PlotParameters pp; if(!generatePlot(pp, y_vectors, x_vectors, pdps)) { CALCULATOR->closeGnuplot(); @@ -765,7 +767,7 @@ void QalculatePlotDialog::updatePlot() { if(pdps[i]) delete pdps[i]; } } -void QalculatePlotDialog::generatePlotSeries(MathStructure **x_vector, MathStructure **y_vector, int type, string str, string str_x) { +void QalculatePlotDialog::generatePlotSeries(MathStructure **x_vector, MathStructure **y_vector, int type, std::string str, std::string str_x) { EvaluationOptions eo; eo.approximation = APPROXIMATION_APPROXIMATE; eo.parse_options = evalops.parse_options; |