[gnome-calculator] GCalc: renamed GMinus to Minus



commit 4cb40c6da5223ae92453ee251acdf9b862254ae4
Author: Daniel Espinosa <esodan gmail com>
Date:   Thu Oct 17 12:10:19 2019 -0500

    GCalc: renamed GMinus to Minus

 gcalc/gcalc-math-minus.vala                   | 2 +-
 gcalc/{gcalc-gminus.vala => gcalc-minus.vala} | 4 ++--
 gcalc/gcalc-parser.vala                       | 2 +-
 gcalc/meson.build                             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gcalc/gcalc-math-minus.vala b/gcalc/gcalc-math-minus.vala
index d6355fd4..1125ff0b 100644
--- a/gcalc/gcalc-math-minus.vala
+++ b/gcalc/gcalc-math-minus.vala
@@ -1,4 +1,4 @@
-/* gcalc-minus.vala
+/* gcalc-math-minus.vala
  *
  * Copyright (C) 2018  Daniel Espinosa <esodan gmail com>
  *
diff --git a/gcalc/gcalc-gminus.vala b/gcalc/gcalc-minus.vala
similarity index 88%
rename from gcalc/gcalc-gminus.vala
rename to gcalc/gcalc-minus.vala
index 9810eef6..bdf5ac87 100644
--- a/gcalc/gcalc-gminus.vala
+++ b/gcalc/gcalc-minus.vala
@@ -1,4 +1,4 @@
-/* gcalc-gminus.vala
+/* gcalc-minus.vala
  *
  * Copyright (C) 2018  Daniel Espinosa <esodan gmail com>
  *
@@ -18,7 +18,7 @@
  * Authors:
  *      Daniel Espinosa <esodan gmail com>
  */
-public class GCalc.GMinus : Expression, MathOperator, MathBinaryOperator, MathMinus {
+public class GCalc.Minus : Expression, MathOperator, MathBinaryOperator, MathMinus {
   internal override string to_string () {
     return "-";
   }
diff --git a/gcalc/gcalc-parser.vala b/gcalc/gcalc-parser.vala
index 068e9869..cec8b3c2 100644
--- a/gcalc/gcalc-parser.vala
+++ b/gcalc/gcalc-parser.vala
@@ -178,7 +178,7 @@ public class GCalc.Parser : Object {
           process_term_operator (op, eq);
           break;
         case TokenType.MINUS:
-          var opp = new GMinus ();
+          var opp = new Minus ();
           process_operator (opp, eq);
           break;
         case TokenType.ASSIGN:
diff --git a/gcalc/meson.build b/gcalc/meson.build
index 11cc2725..09dc22af 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-gminus.vala',
        'gcalc-gmultiply.vala',
        'gcalc-gparameter.vala',
        'gcalc-gplus.vala',
@@ -105,6 +104,7 @@ gcalc_sources = files([
        'gcalc-math-minus.vala',
        'gcalc-math-operator.vala',
        'gcalc-math-polynomial.vala',
+       'gcalc-minus.vala',
        'gcalc-multiply.vala',
        'gcalc-parameter.vala',
        'gcalc-parser.vala',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]