[gnome-sudoku] Fix miscellaneous warnings
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-sudoku] Fix miscellaneous warnings
- Date: Sun, 1 Jun 2014 00:19:24 +0000 (UTC)
commit 3187592ba86bace106033db2d44fb15d351520ed
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Sat May 31 19:04:52 2014 -0500
Fix miscellaneous warnings
src/sudoku-generator.vala | 2 +-
src/sudoku-printer.vala | 15 +++------------
src/sudoku-saver.vala | 11 ++++++++++-
src/sudoku-solver.vala | 27 +--------------------------
src/sudoku-store.vala | 6 ++----
src/sudoku-view.vala | 16 +---------------
6 files changed, 18 insertions(+), 59 deletions(-)
---
diff --git a/src/sudoku-generator.vala b/src/sudoku-generator.vala
index f906127..6d8648f 100644
--- a/src/sudoku-generator.vala
+++ b/src/sudoku-generator.vala
@@ -359,7 +359,7 @@ public class SudokuGenerator
for (int i = 0; i < solver.breadcrumbs.size; i++)
{
- Guess guess = solver.breadcrumbs[i];
+ //Guess guess = solver.breadcrumbs[i];
//stdout.printf("crumb (%d, %d) %d\n", guess.col, guess.row, guess.val);
}
diff --git a/src/sudoku-printer.vala b/src/sudoku-printer.vala
index 80ab3d3..b54fea5 100644
--- a/src/sudoku-printer.vala
+++ b/src/sudoku-printer.vala
@@ -284,21 +284,12 @@ public class GamePrinter: GLib.Object {
{"print-medium", "mediumCheckButton"},
{"print-hard", "hardCheckButton"},
{"print-very-hard", "very_hardCheckButton"}};
- CheckButton check_button;
- string setting0, setting1;
for (var i=0; i<6; i++)
{
- setting0 = settings_to_widgets[i,0];
- setting1 = settings_to_widgets[i,1];
- try
- {
- check_button = builder.get_object (setting1) as CheckButton;
- }
- catch (GLib.Error e)
- {
- GLib.warning ("Widget %s does not exist: %s", setting1, e.message);
- }
+ var setting0 = settings_to_widgets[i,0];
+ var setting1 = settings_to_widgets[i,1];
+ var check_button = builder.get_object (setting1) as CheckButton;
wrap_toggle (setting0, check_button);
options_map.set (setting1, check_button);
}
diff --git a/src/sudoku-saver.vala b/src/sudoku-saver.vala
index cba3396..749fd22 100644
--- a/src/sudoku-saver.vala
+++ b/src/sudoku-saver.vala
@@ -54,7 +54,16 @@ public class SudokuSaver
// Delete savegame file
var file = File.new_for_path (savegame_file);
if (file.query_exists ())
- file.delete ();
+ {
+ try
+ {
+ file.delete ();
+ }
+ catch (GLib.Error e)
+ {
+ warning ("Failed to delete %s: %s", file.get_uri (), e.message);
+ }
+ }
}
}
diff --git a/src/sudoku-solver.vala b/src/sudoku-solver.vala
index 4eadb73..d149db3 100644
--- a/src/sudoku-solver.vala
+++ b/src/sudoku-solver.vala
@@ -434,7 +434,6 @@ public class SudokuSolver
trailDetails.add ("+");
breadcrumbs.add (guess_obj);
- ArrayList<Cell?> fills = auto_fill ();
bool contains_empty = false;
@@ -553,10 +552,7 @@ class SudokuRater : SudokuSolver {
add_me_queue = fake_additions;
fake_additions = new ArrayList<Cell?> ();
- try {
- fill_deterministically();
- } catch (SudokuError e) {
- }
+ fill_deterministically();
elimination_fillables[tier] = new HashSet<Cell?> ((HashDataFunc<Coord>) Cell.hash,
(EqualDataFunc<Coord>) Cell.equal);
foreach (Cell cell in fake_additions) {
@@ -595,27 +591,6 @@ class SudokuRater : SudokuSolver {
numbers_added);
return rating;
}
-
- public static void gen_python_test () {
- stdout.printf("import sudoku\n\n");
-
- for (int repeat = 0; repeat < 20; repeat++)
- {
- SudokuGenerator gen = new SudokuGenerator();
- gen.clues = Random.int_range(17, 60);
-
- SudokuBoard board = gen.make_symmetric_puzzle (Random.int_range(0, 4));
-
- stdout.printf("diff = sudoku.SudokuRater(");
- board.get_string ();
- stdout.printf(").difficulty()\n");
-
- SudokuRater rater = new SudokuRater(ref board);
- DifficultyRating diff = rater.get_difficulty ();
-
- stdout.printf("print diff.value, %f\n\n", diff.rating);
- }
- }
}
public class Guess {
diff --git a/src/sudoku-store.vala b/src/sudoku-store.vala
index f0d2e59..f8731a4 100644
--- a/src/sudoku-store.vala
+++ b/src/sudoku-store.vala
@@ -126,15 +126,13 @@ public class SudokuStore
i++;
}
- CompareDataFunc<SudokuBoard> CompareDifficultyRatings = (a, b) => {
+ boards.sort ((a, b) => {
if (a.difficulty_rating > b.difficulty_rating)
return 1;
if (a.difficulty_rating == b.difficulty_rating)
return 0;
return -1;
- };
-
- boards.sort (CompareDifficultyRatings);
+ });
return boards;
}
}
diff --git a/src/sudoku-view.vala b/src/sudoku-view.vala
index 9a2962d..87ae89b 100644
--- a/src/sudoku-view.vala
+++ b/src/sudoku-view.vala
@@ -380,15 +380,6 @@ private class SudokuCellView : Gtk.DrawingArea
return false;
}
- private static string get_possibility_string (int[] possibilities) {
- var builder = new StringBuilder ();
- foreach (int a in possibilities) {
- builder.append (@"$a ");
- }
- builder.truncate ((possibilities.length * 2) - 1);
- return builder.str;
- }
-
public void cell_changed_cb (int row, int col, int old_val, int new_val)
{
if (row == this.row && col == this.col)
@@ -464,7 +455,7 @@ public class SudokuView : Gtk.AspectFrame
/* Use an EventBox to be able to set background */
box = new Gtk.EventBox ();
- box.modify_bg (Gtk.StateType.NORMAL, box.style.black);
+ box.override_background_color (Gtk.StateFlags.NORMAL, {0.0, 0.0, 0.0, 1.0});
add (box);
box.show ();
@@ -653,11 +644,6 @@ public class SudokuView : Gtk.AspectFrame
reset_cell_background_colors ();
}
- private RGBA get_next_color (RGBA color)
- {
- return dance_colors[Random.int_range(0, dance_colors.length)];
- }
-
public void cell_grab_focus(int row, int col)
{
cells[row, col].grab_focus ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]