[gnome-sudoku] Rename 'DifficultyCatagory' to 'DifficultyCategory'



commit a80920b127122f631330e1d8bc66a8e6c01d36c3
Author: Parin Porecha <parinporecha gmail com>
Date:   Mon Jun 9 21:18:08 2014 +0530

    Rename 'DifficultyCatagory' to 'DifficultyCategory'
    
    Also correct the typo 'catagory' in variable and method names to 'category'

 src/gnome-sudoku.vala   |   12 ++++++------
 src/sudoku-board.vala   |   12 ++++++------
 src/sudoku-printer.vala |   22 +++++++++++-----------
 src/sudoku-saver.vala   |    4 ++--
 src/sudoku-solver.vala  |   12 ++++++------
 src/sudoku-store.vala   |   12 ++++++------
 6 files changed, 37 insertions(+), 37 deletions(-)
---
diff --git a/src/gnome-sudoku.vala b/src/gnome-sudoku.vala
index aba8f24..cc94e15 100644
--- a/src/gnome-sudoku.vala
+++ b/src/gnome-sudoku.vala
@@ -216,7 +216,7 @@ public class Sudoku : Gtk.Application
             start_game (savegame.board);
         else
         {
-            var random_difficulty = (DifficultyCatagory) Random.int_range (0, 4);
+            var random_difficulty = (DifficultyCategory) Random.int_range (0, 4);
             start_game (sudoku_store.get_random_board (random_difficulty));
         }
 
@@ -244,7 +244,7 @@ public class Sudoku : Gtk.Application
             grid_box.remove (view);
         }
 
-        header_bar_subtitle = rating.get_catagory ().to_string ();
+        header_bar_subtitle = rating.get_category ().to_string ();
         back_cb ();
 
         game = new SudokuGame (board);
@@ -286,13 +286,13 @@ public class Sudoku : Gtk.Application
                 switch (response_id)
                 {
                     case 0:
-                        start_game (sudoku_store.get_random_board (rating.get_catagory ()));
+                        start_game (sudoku_store.get_random_board (rating.get_category ()));
                         break;
                     case 1:
-                        DifficultyCatagory[] new_range = {};
+                        DifficultyCategory[] new_range = {};
                         for (var i = 0; i < 4; i++)
-                            if (i != (int) rating.get_catagory ())
-                                new_range += (DifficultyCatagory) i;
+                            if (i != (int) rating.get_category ())
+                                new_range += (DifficultyCategory) i;
 
                         start_game (sudoku_store.get_random_board (new_range[Random.int_range (0, 3)]));
                         break;
diff --git a/src/sudoku-board.vala b/src/sudoku-board.vala
index 810bd40..301a15b 100644
--- a/src/sudoku-board.vala
+++ b/src/sudoku-board.vala
@@ -74,18 +74,18 @@ public class SudokuBoard
         return (difficulty_rating >= range[0] && difficulty_rating < range[1]);
     }
 
-    public DifficultyCatagory get_difficulty_catagory ()
+    public DifficultyCategory get_difficulty_category ()
     {
         if (in_range(DifficultyRating.EASY_RANGE))
-            return DifficultyCatagory.EASY;
+            return DifficultyCategory.EASY;
         else if (in_range(DifficultyRating.MEDIUM_RANGE))
-            return DifficultyCatagory.MEDIUM;
+            return DifficultyCategory.MEDIUM;
         else if (in_range(DifficultyRating.HARD_RANGE))
-            return DifficultyCatagory.HARD;
+            return DifficultyCategory.HARD;
         else if (in_range(DifficultyRating.VERY_HARD_RANGE))
-            return DifficultyCatagory.VERY_HARD;
+            return DifficultyCategory.VERY_HARD;
         else
-            return DifficultyCatagory.EASY;
+            return DifficultyCategory.EASY;
     }
 
     public signal void completed ();
diff --git a/src/sudoku-printer.vala b/src/sudoku-printer.vala
index b5b27c6..1b58745 100644
--- a/src/sudoku-printer.vala
+++ b/src/sudoku-printer.vala
@@ -76,7 +76,7 @@ public class SudokuPrinter : GLib.Object {
         foreach (SudokuBoard sudoku in sudokus_on_page)
         {
             if (n_sudokus > 1)
-                label = sudoku.get_difficulty_catagory ().to_string () + " (" + 
sudoku.difficulty_rating.to_string ()[0:4] + ")";
+                label = sudoku.get_difficulty_category ().to_string () + " (" + 
sudoku.difficulty_rating.to_string ()[0:4] + ")";
             else
                 label = "";
             cr.set_font_size (12);
@@ -297,15 +297,15 @@ public class GamePrinter: GLib.Object {
         very_hard_button = builder.get_object ("very_hardRadioButton") as RadioButton;
         very_hard_button.join_group (easy_button);
 
-        var saved_difficulty = (DifficultyCatagory) settings.get_enum (DIFFICULTY_KEY_NAME);
+        var saved_difficulty = (DifficultyCategory) settings.get_enum (DIFFICULTY_KEY_NAME);
 
-        if (saved_difficulty == DifficultyCatagory.EASY)
+        if (saved_difficulty == DifficultyCategory.EASY)
             easy_button.set_active (true);
-        else if (saved_difficulty == DifficultyCatagory.MEDIUM)
+        else if (saved_difficulty == DifficultyCategory.MEDIUM)
             medium_button.set_active (true);
-        else if (saved_difficulty == DifficultyCatagory.HARD)
+        else if (saved_difficulty == DifficultyCategory.HARD)
             hard_button.set_active (true);
-        else if (saved_difficulty == DifficultyCatagory.VERY_HARD)
+        else if (saved_difficulty == DifficultyCategory.VERY_HARD)
             very_hard_button.set_active (true);
 
         nsudokus_button = builder.get_object ("sudokusToPrintSpinButton") as SpinButton;
@@ -327,16 +327,16 @@ public class GamePrinter: GLib.Object {
         }
 
         var nsudokus = (int) nsudokus_button.get_adjustment ().get_value ();
-        DifficultyCatagory level;
+        DifficultyCategory level;
 
         if (easy_button.get_active ())
-            level = DifficultyCatagory.EASY;
+            level = DifficultyCategory.EASY;
         else if (medium_button.get_active ())
-            level = DifficultyCatagory.MEDIUM;
+            level = DifficultyCategory.MEDIUM;
         else if (hard_button.get_active ())
-            level = DifficultyCatagory.HARD;
+            level = DifficultyCategory.HARD;
         else if (very_hard_button.get_active ())
-            level = DifficultyCatagory.VERY_HARD;
+            level = DifficultyCategory.VERY_HARD;
         else
             assert_not_reached ();
 
diff --git a/src/sudoku-saver.vala b/src/sudoku-saver.vala
index 749fd22..b0d3002 100644
--- a/src/sudoku-saver.vala
+++ b/src/sudoku-saver.vala
@@ -87,8 +87,8 @@ public class SudokuSaver
         builder.begin_object ();
         builder.set_member_name ("difficulty_rating");
         builder.add_double_value (board.difficulty_rating);
-        builder.set_member_name ("difficulty_catagory");
-        builder.add_string_value (board.get_difficulty_catagory ().to_string ());
+        builder.set_member_name ("difficulty_category");
+        builder.add_string_value (board.get_difficulty_category ().to_string ());
         builder.set_member_name ("time_elapsed");
         builder.add_double_value (game.get_total_time_played ());
 
diff --git a/src/sudoku-solver.vala b/src/sudoku-solver.vala
index 59ef3a7..af8c3bc 100644
--- a/src/sudoku-solver.vala
+++ b/src/sudoku-solver.vala
@@ -728,7 +728,7 @@ public class ParallelDict {
     }
 }
 
-public enum DifficultyCatagory {
+public enum DifficultyCategory {
     EASY,
     MEDIUM,
     HARD,
@@ -830,16 +830,16 @@ public class DifficultyRating {
         return rating >= range[0] && rating < range[1];
     }
 
-    public DifficultyCatagory get_catagory ()
+    public DifficultyCategory get_category ()
     {
         if (in_range(EASY_RANGE))
-            return DifficultyCatagory.EASY;
+            return DifficultyCategory.EASY;
         else if (in_range(MEDIUM_RANGE))
-            return DifficultyCatagory.MEDIUM;
+            return DifficultyCategory.MEDIUM;
         else if (in_range(HARD_RANGE))
-            return DifficultyCatagory.HARD;
+            return DifficultyCategory.HARD;
         else if (in_range(VERY_HARD_RANGE))
-            return DifficultyCatagory.VERY_HARD;
+            return DifficultyCategory.VERY_HARD;
         else
             assert_not_reached();
     }
diff --git a/src/sudoku-store.vala b/src/sudoku-store.vala
index a493e4e..3d241a3 100644
--- a/src/sudoku-store.vala
+++ b/src/sudoku-store.vala
@@ -95,15 +95,15 @@ public class SudokuStore
         return very_hard_boards[Random.int_range(0, very_hard_boards.size)];
     }
 
-    public SudokuBoard get_random_board(DifficultyCatagory catagory)
+    public SudokuBoard get_random_board(DifficultyCategory category)
     {
-        if (catagory == DifficultyCatagory.EASY)
+        if (category == DifficultyCategory.EASY)
             return get_random_easy_board();
-        else if (catagory == DifficultyCatagory.MEDIUM)
+        else if (category == DifficultyCategory.MEDIUM)
             return get_random_medium_board();
-        else if (catagory == DifficultyCatagory.HARD)
+        else if (category == DifficultyCategory.HARD)
             return get_random_hard_board();
-        else if (catagory == DifficultyCatagory.VERY_HARD)
+        else if (category == DifficultyCategory.VERY_HARD)
             return get_random_very_hard_board();
         else
             assert_not_reached();
@@ -111,7 +111,7 @@ public class SudokuStore
 
     // Get boards sorted ascending based on difficulty rating
     // i.e. - the first board returned will be the easiest, and boards will become increasingly harder
-    public SudokuBoard[] get_boards_sorted (int number_of_boards, DifficultyCatagory level, bool 
exclude_finished = false)
+    public SudokuBoard[] get_boards_sorted (int number_of_boards, DifficultyCategory level, bool 
exclude_finished = false)
     {
         var boards = new ArrayList<SudokuBoard> ();
         SudokuBoard[] sorted_boards = {};


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