[gnome-sudoku/vala-port] Fix compilation issues

[Christopher Baines <cbaines src gnome org>]

commit 7c99ff9ea2b6f11a88b74c8e93c7699aa8739711
Author: Christopher Baines <cbaines src gnome org>
Date:   Sat Jun 8 22:52:37 2013 +0100

    Fix compilation issues
    
    Remove the namespace from config.vapi, and adjust gnome-sudoku.vala
    and main.vala accordingly. Add a missing enum House to sudoku-board.vala
    and correct some Gee.List's to ArrayList's.

 src/config.vapi                |   12 ++++--------
 src/gnome-sudoku.vala          |    2 +-
 src/logical-sudoku-solver.vala |    1 -
 src/main.vala                  |    4 ++--
 src/sudoku-board.vala          |   12 +++++++++---
 5 files changed, 16 insertions(+), 15 deletions(-)
---
diff --git a/src/config.vapi b/src/config.vapi
index aae449c..a1787ca 100644
--- a/src/config.vapi
+++ b/src/config.vapi
@@ -1,8 +1,4 @@
-[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
-namespace Config
-{
-  public const string PKGDATADIR;
-  public const string LOCALEDIR;
-  public const string GETTEXT_PACKAGE;
-  public const string VERSION;
-}
+public const string PKGDATADIR;
+public const string LOCALEDIR;
+public const string GETTEXT_PACKAGE;
+public const string VERSION;
diff --git a/src/gnome-sudoku.vala b/src/gnome-sudoku.vala
index 233eb9e..e1c9f74 100644
--- a/src/gnome-sudoku.vala
+++ b/src/gnome-sudoku.vala
@@ -486,7 +486,7 @@ public class Sudoku : Gtk.Application
         show_about_dialog (window,
                                "program-name", _("Sudoku"),
                                "logo-icon-name", "gnome-sudoku",
-                               "version", Config.VERSION,
+                               "version", VERSION,
                                "comments", _("GNOME Sudoku is a simple Sudoku generator and player. Sudoku 
is a Japanese logic puzzle.\n\nGNOME Sudoku is a part of GNOME Games."),
                                "copyright", "Copyright 2010-2011 Robert Ancell <robert ancell gmail com>",
                                "license-type", License.GPL_2_0,
diff --git a/src/logical-sudoku-solver.vala b/src/logical-sudoku-solver.vala
index 2362af9..4edcbb4 100644
--- a/src/logical-sudoku-solver.vala
+++ b/src/logical-sudoku-solver.vala
@@ -243,4 +243,3 @@ public struct HiddenSingle
         this.block = block;
     }
 }
-
diff --git a/src/main.vala b/src/main.vala
index 7a0dfdd..0b50dfc 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -58,7 +58,7 @@ public static int main (string[] args)
 
     var c = new OptionContext (/* Arguments and description for --help text */
                                    _("[FILE] - Play Sudoku"));
-    c.add_main_entries (options, Config.GETTEXT_PACKAGE);
+    c.add_main_entries (options, GETTEXT_PACKAGE);
     c.add_group (Gtk.get_option_group (true));
     try
     {
@@ -75,7 +75,7 @@ public static int main (string[] args)
     if (show_version)
     {
         /* Note, not translated so can be easily parsed */
-        stderr.printf ("gnome-sudoku %s\n", Config.VERSION);
+        stderr.printf ("gnome-sudoku %s\n", VERSION);
         return Posix.EXIT_SUCCESS;
     }
 
diff --git a/src/sudoku-board.vala b/src/sudoku-board.vala
index 1a85260..e059651 100644
--- a/src/sudoku-board.vala
+++ b/src/sudoku-board.vala
@@ -107,7 +107,7 @@ public class SudokuBoard
 
         broken_coords = new HashSet<Coord?>((GLib.HashFunc) Coord.hash, (GLib.EqualFunc) Coord.equal);
 
-        coords_for_col = new ArrayList<Gee.List<Coord?>> ();
+        coords_for_col = new ArrayList<ArrayList<Coord?>> ();
         for (int col = 0; col < _cols; col++)
         {
             coords_for_col.add (new ArrayList<Coord?> ((GLib.EqualFunc) Coord.equal));
@@ -119,7 +119,7 @@ public class SudokuBoard
         }
         coords_for_col = coords_for_col.read_only_view;
 
-        coords_for_row = new ArrayList<Gee.List<Coord?>> ();
+        coords_for_row = new ArrayList<ArrayList<Coord?>> ();
         for (int row = 0; row < _rows; row++)
         {
             coords_for_row.add (new ArrayList<Coord?> ((GLib.EqualFunc) Coord.equal));
@@ -131,7 +131,7 @@ public class SudokuBoard
         }
         coords_for_row = coords_for_row.read_only_view;
 
-        coords_for_block = new HashMap<Coord?, Gee.List<Coord?>> ((GLib.HashFunc) Coord.hash, 
(GLib.EqualFunc) Coord.equal);
+        coords_for_block = new HashMap<Coord?, ArrayList<Coord?>> ((GLib.HashFunc) Coord.hash, 
(GLib.EqualFunc) Coord.equal);
         for (int col = 0; col < _block_cols; col++)
         {
             for (int row = 0; row < _block_rows; row++)
@@ -471,6 +471,12 @@ public class SudokuBoard
     }
 }
 
+public enum House {
+    ROW,
+    COLUMN,
+    BLOCK
+}
+
 public struct Coord
 {
     public int row;