[gnome-sudoku] Make SudokuGenerator methods static
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-sudoku] Make SudokuGenerator methods static
- Date: Mon, 11 Aug 2014 05:46:39 +0000 (UTC)
commit f659e9c8283e2e9a3e566ebf33075c1745724845
Author: Parin Porecha <parinporecha gmail com>
Date: Wed Aug 6 16:56:23 2014 +0200
Make SudokuGenerator methods static
lib/sudoku-generator.vala | 6 +++---
src/gnome-sudoku.vala | 10 ++++------
2 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/lib/sudoku-generator.vala b/lib/sudoku-generator.vala
index e5707f7..bde2107 100644
--- a/lib/sudoku-generator.vala
+++ b/lib/sudoku-generator.vala
@@ -2,10 +2,10 @@
public class SudokuGenerator : Object
{
- public SudokuGenerator () {
+ private SudokuGenerator () {
}
- public SudokuBoard generate_board (DifficultyCategory category)
+ public static SudokuBoard generate_board (DifficultyCategory category)
{
var board = new SudokuBoard ();
int[] puzzle = QQwing.generate_puzzle ((int) category);
@@ -22,7 +22,7 @@ public class SudokuGenerator : Object
return board;
}
- public void print_stats (SudokuBoard board)
+ public static void print_stats (SudokuBoard board)
{
var cells = board.get_cells ();
var puzzle = new int[board.rows * board.cols];
diff --git a/src/gnome-sudoku.vala b/src/gnome-sudoku.vala
index a5c8724..1cfdf4a 100644
--- a/src/gnome-sudoku.vala
+++ b/src/gnome-sudoku.vala
@@ -24,7 +24,6 @@ public class Sudoku : Gtk.Application
private Button back_button;
private SudokuStore sudoku_store;
- private SudokuGenerator generator;
private SudokuSaver saver;
private SimpleAction undo_action;
@@ -142,7 +141,6 @@ public class Sudoku : Gtk.Application
print_action = (SimpleAction) lookup_action ("print");
sudoku_store = new SudokuStore ();
- generator = new SudokuGenerator ();
saver = new SudokuSaver ();
var savegame = saver.get_savedgame ();
@@ -151,7 +149,7 @@ public class Sudoku : Gtk.Application
else
{
var random_difficulty = (DifficultyCategory) Random.int_range (0, 4);
- start_game (generator.generate_board (random_difficulty));
+ start_game (SudokuGenerator.generate_board (random_difficulty));
}
window.show ();
@@ -218,7 +216,7 @@ public class Sudoku : Gtk.Application
switch (response_id)
{
case 0:
- start_game (generator.generate_board (board.difficulty_category));
+ start_game (SudokuGenerator.generate_board (board.difficulty_category));
break;
case 1:
// FIXME - This looks hack-ish
@@ -227,7 +225,7 @@ public class Sudoku : Gtk.Application
if (i != (int) board.difficulty_category)
new_range += (DifficultyCategory) i;
- start_game (generator.generate_board (new_range[Random.int_range (0, 3)]));
+ start_game (SudokuGenerator.generate_board (new_range[Random.int_range (0, 3)]));
break;
}
dialog.destroy ();
@@ -254,7 +252,7 @@ public class Sudoku : Gtk.Application
// has been set to integers corresponding to the enums.
// Following line converts those ints to their DifficultyCategory
var selected_difficulty = (DifficultyCategory) difficulty.get_int32 ();
- start_game (generator.generate_board (selected_difficulty));
+ start_game (SudokuGenerator.generate_board (selected_difficulty));
}
private void reset_cb ()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]