[gnome-calculator] GCalc: renamed GVariable to Variable



commit 68ca4f1539f3ccf03ad454ba9f6f6e301b1ceaaf
Author: Daniel Espinosa <esodan gmail com>
Date:   Thu Oct 17 12:56:43 2019 -0500

    GCalc: renamed GVariable to Variable

 gcalc/gcalc-parameter.vala                          | 2 +-
 gcalc/gcalc-parser.vala                             | 2 +-
 gcalc/{gcalc-gvariable.vala => gcalc-variable.vala} | 6 +++---
 gcalc/meson.build                                   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gcalc/gcalc-parameter.vala b/gcalc/gcalc-parameter.vala
index 028758a0..0a562576 100644
--- a/gcalc/gcalc-parameter.vala
+++ b/gcalc/gcalc-parameter.vala
@@ -18,7 +18,7 @@
  * Authors:
  *      Daniel Espinosa <esodan gmail com>
  */
-public class GCalc.Parameter : GCalc.GVariable, MathParameter {
+public class GCalc.Parameter : GCalc.Variable, MathParameter {
 
   public Parameter (string name) {
     base (name);
diff --git a/gcalc/gcalc-parser.vala b/gcalc/gcalc-parser.vala
index 20106652..1054b8a6 100644
--- a/gcalc/gcalc-parser.vala
+++ b/gcalc/gcalc-parser.vala
@@ -98,7 +98,7 @@ public class GCalc.Parser : Object {
           } else if (n.down () == "def" && current is MathFunction) {
             throw new ParserError.INVALID_TOKEN_ERROR ("Found an unexpected function definition expression");
           } else {
-            var v = new GVariable (n) as MathExpression;
+            var v = new Variable (n) as MathExpression;
             if (enable_parameter) {
               v = new Parameter (n) as MathExpression;
               enable_parameter = false;
diff --git a/gcalc/gcalc-gvariable.vala b/gcalc/gcalc-variable.vala
similarity index 90%
rename from gcalc/gcalc-gvariable.vala
rename to gcalc/gcalc-variable.vala
index b1a15f2d..f4ab289b 100644
--- a/gcalc/gcalc-gvariable.vala
+++ b/gcalc/gcalc-variable.vala
@@ -1,4 +1,4 @@
-/* gcalc-gvariable.vala
+/* gcalc-variable.vala
  *
  * Copyright (C) 2018  Daniel Espinosa <esodan gmail com>
  *
@@ -18,7 +18,7 @@
  * Authors:
  *      Daniel Espinosa <esodan gmail com>
  */
-public class GCalc.GVariable : Expression, MathVariable, Hashable {
+public class GCalc.Variable : Expression, MathVariable, Hashable {
 
   public string name { get; construct set; }
   internal MathConstant value { get; set; }
@@ -27,7 +27,7 @@ public class GCalc.GVariable : Expression, MathVariable, Hashable {
   construct {
     _value = new Constant.@double (0.0);
   }
-  internal GVariable (string name) {
+  internal Variable (string name) {
     this.name = name;
   }
   // Expression
diff --git a/gcalc/meson.build b/gcalc/meson.build
index af229a93..a5aab9ff 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-gvariable.vala',
        'gcalc-hashable.vala',
        'gcalc-math-assign.vala',
        'gcalc-math-binary-operator.vala',
@@ -115,6 +114,7 @@ gcalc_sources = files([
        '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]