From 5f65ade1f13701372ece3ff5fcd7a57636f50ccc Mon Sep 17 00:00:00 2001 From: cxl Date: Sun, 12 Jun 2016 06:11:47 +0000 Subject: [PATCH] ScatterCtrl: Fixed << ambiguity issues git-svn-id: svn://ultimatepp.org/upp/trunk@9926 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ScatterCtrl/Properties.cpp | 4 ++-- uppsrc/ScatterDraw/Equation.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/uppsrc/ScatterCtrl/Properties.cpp b/uppsrc/ScatterCtrl/Properties.cpp index 080705db4..7c22208cb 100644 --- a/uppsrc/ScatterCtrl/Properties.cpp +++ b/uppsrc/ScatterCtrl/Properties.cpp @@ -101,8 +101,8 @@ void TextsTab::Change() { ScatterCtrl &scatter = *pscatter; - scatter.SetTitle(title); - scatter.SetLabels(xLabel, yLabel, yLabel2); + scatter.SetTitle(~title); + scatter.SetLabels(~xLabel, ~yLabel, ~yLabel2); scatter.SetPlotAreaMargin(~leftMargin, ~rightMargin, ~topMargin, ~bottomMargin); scatter.SetModify(); diff --git a/uppsrc/ScatterDraw/Equation.h b/uppsrc/ScatterDraw/Equation.h index 35310cd79..ccc8cb1e6 100644 --- a/uppsrc/ScatterDraw/Equation.h +++ b/uppsrc/ScatterDraw/Equation.h @@ -301,7 +301,7 @@ public: eval.SetVariable(i, coeff[i]); return eval.Eval(strEquation); } - String SetName(String _name) {name = _name;} + void SetName(String _name) {name = _name;} virtual String GetName() {return name;} virtual String GetEquation(int numDigits = 3) {return eval.EvalStr(strEquation, numDigits);} virtual void GuessCoeff(DataSource &series) {}