[gnome-calculator] GCalc: renamed GResult to Result
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calculator] GCalc: renamed GResult to Result
- Date: Thu, 17 Oct 2019 19:09:38 +0000 (UTC)
commit 6729111da0bf968022fed33771252707bb6991c9
Author: Daniel Espinosa <esodan gmail com>
Date: Thu Oct 17 12:38:31 2019 -0500
GCalc: renamed GResult to Result
gcalc/gcalc-assign.vala | 2 +-
gcalc/gcalc-constant.vala | 2 +-
gcalc/gcalc-gterm.vala | 2 +-
gcalc/gcalc-polynomial.vala | 2 +-
gcalc/{gcalc-gresult.vala => gcalc-result.vala} | 6 +++---
gcalc/meson.build | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/gcalc/gcalc-assign.vala b/gcalc/gcalc-assign.vala
index d1cf6ed1..d74d2f77 100644
--- a/gcalc/gcalc-assign.vala
+++ b/gcalc/gcalc-assign.vala
@@ -36,7 +36,7 @@ public class GCalc.Assign : Expression, MathOperator, MathBinaryOperator, MathAs
internal override MathResult solve () {
MathResult res = null;
try {
- res = new GResult (evaluate ());
+ res = new Result (evaluate ());
} catch (GLib.Error e) {
res = new ErrorResult ("Invalid expression in Assignment: %s".printf (e.message));
}
diff --git a/gcalc/gcalc-constant.vala b/gcalc/gcalc-constant.vala
index fd2199d4..0229d468 100644
--- a/gcalc/gcalc-constant.vala
+++ b/gcalc/gcalc-constant.vala
@@ -121,7 +121,7 @@ public class GCalc.Constant : Expression, MathConstant {
}
internal override MathResult solve () {
- return new GResult (this);
+ return new Result (this);
}
}
diff --git a/gcalc/gcalc-gterm.vala b/gcalc/gcalc-gterm.vala
index c5300092..ef113f31 100644
--- a/gcalc/gcalc-gterm.vala
+++ b/gcalc/gcalc-gterm.vala
@@ -23,7 +23,7 @@ public class GCalc.GTerm : Expression, Term {
MathResult res = null;
try {
var e = evaluate ();
- res = new GResult (e) as MathResult;
+ res = new Result (e) as MathResult;
} catch (GLib.Error err) {
res = new ErrorResult ("Term evaluation fails: %s".printf (err.message));
}
diff --git a/gcalc/gcalc-polynomial.vala b/gcalc/gcalc-polynomial.vala
index f7f6e2d3..e616ddcb 100644
--- a/gcalc/gcalc-polynomial.vala
+++ b/gcalc/gcalc-polynomial.vala
@@ -23,7 +23,7 @@ public class GCalc.Polynomial : Expression, MathPolynomial {
MathResult res = null;
try {
var e = evaluate ();
- res = new GResult (e) as MathResult;
+ res = new Result (e) as MathResult;
} catch (GLib.Error err) {
res = new ErrorResult ("Polynomial solving fails: %s".printf (err.message));
}
diff --git a/gcalc/gcalc-gresult.vala b/gcalc/gcalc-result.vala
similarity index 90%
rename from gcalc/gcalc-gresult.vala
rename to gcalc/gcalc-result.vala
index 2c1b2cc6..b1983bb0 100644
--- a/gcalc/gcalc-gresult.vala
+++ b/gcalc/gcalc-result.vala
@@ -1,4 +1,4 @@
-/* gcalc-gresult.vala
+/* gcalc-result.vala
*
* Copyright (C) 2018 Daniel Espinosa <esodan gmail com>
*
@@ -18,9 +18,9 @@
* Authors:
* Daniel Espinosa <esodan gmail com>
*/
-public class GCalc.GResult : Object, MathResult {
+public class GCalc.Result : Object, MathResult {
private MathExpression _expression;
- public GResult (MathExpression exp) {
+ public Result (MathExpression exp) {
_expression = exp;
}
// Result
diff --git a/gcalc/meson.build b/gcalc/meson.build
index 4f259035..f25adb80 100644
--- a/gcalc/meson.build
+++ b/gcalc/meson.build
@@ -82,7 +82,6 @@ gcalc_sources = files([
'gcalc-function-tan.vala',
'gcalc-function-tanh.vala',
'gcalc-group.vala',
- 'gcalc-gresult.vala',
'gcalc-gsolver.vala',
'gcalc-gterm.vala',
'gcalc-gvariable.vala',
@@ -112,6 +111,7 @@ gcalc_sources = files([
'gcalc-plus.vala',
'gcalc-polynomial.vala',
'gcalc-pow.vala',
+ 'gcalc-result.vala',
'gcalc-solver.vala',
'gcalc-term.vala',
'gcalc-variable.vala',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]