[gnome-calculator] GCalc: rename GMultiply to Multiply



commit bb364b9369c3af7ddc76d529389be2a0568e819a
Author: Daniel Espinosa <esodan gmail com>
Date:   Thu Oct 17 12:20:22 2019 -0500

    GCalc: rename GMultiply to Multiply

 gcalc/gcalc-math-multiply.vala                      | 2 +-
 gcalc/{gcalc-gmultiply.vala => gcalc-multiply.vala} | 4 ++--
 gcalc/gcalc-parser.vala                             | 2 +-
 gcalc/meson.build                                   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gcalc/gcalc-math-multiply.vala b/gcalc/gcalc-math-multiply.vala
index 6603bc26..77caef8a 100644
--- a/gcalc/gcalc-math-multiply.vala
+++ b/gcalc/gcalc-math-multiply.vala
@@ -1,4 +1,4 @@
-/* gcalc-multiply.vala
+/* gcalc-math-multiply.vala
  *
  * Copyright (C) 2018  Daniel Espinosa <esodan gmail com>
  *
diff --git a/gcalc/gcalc-gmultiply.vala b/gcalc/gcalc-multiply.vala
similarity index 88%
rename from gcalc/gcalc-gmultiply.vala
rename to gcalc/gcalc-multiply.vala
index ca4f8475..fdbe039f 100644
--- a/gcalc/gcalc-gmultiply.vala
+++ b/gcalc/gcalc-multiply.vala
@@ -1,4 +1,4 @@
-/* gcalc-gmultiply.vala
+/* gcalc-multiply.vala
  *
  * Copyright (C) 2018  Daniel Espinosa <esodan gmail com>
  *
@@ -18,7 +18,7 @@
  * Authors:
  *      Daniel Espinosa <esodan gmail com>
  */
-public class GCalc.GMultiply : Expression, MathOperator, MathBinaryOperator, MathMultiply {
+public class GCalc.Multiply : Expression, MathOperator, MathBinaryOperator, MathMultiply {
   internal override string to_string () {
     return "*";
   }
diff --git a/gcalc/gcalc-parser.vala b/gcalc/gcalc-parser.vala
index a8f61bb0..b34ea988 100644
--- a/gcalc/gcalc-parser.vala
+++ b/gcalc/gcalc-parser.vala
@@ -166,7 +166,7 @@ public class GCalc.Parser : Object {
           }
           break;
         case TokenType.STAR:
-          var op = new GMultiply ();
+          var op = new Multiply ();
           process_term_operator (op, eq);
           break;
         case TokenType.PLUS:
diff --git a/gcalc/meson.build b/gcalc/meson.build
index 202af2aa..21d3af77 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-gmultiply.vala',
        'gcalc-gplus.vala',
        'gcalc-gpow.vala',
        'gcalc-gresult.vala',
@@ -106,6 +105,7 @@ gcalc_sources = files([
        'gcalc-math-parameter.vala',
        'gcalc-math-polynomial.vala',
        'gcalc-minus.vala',
+       'gcalc-multiply.vala',
        'gcalc-parameter.vala',
        'gcalc-parser.vala',
        'gcalc-plus.vala',


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