[four-in-a-row: 49/72] moved some global vars to classes



commit 1ce1c7618cfee2fee6a6e942dcfd7d036bc6a18e
Author: Jacob Humphrey <jacob ryan humphrey gmail com>
Date:   Sat Dec 15 01:14:25 2018 -0600

    moved some global vars to classes

 src/four-in-a-row.vala | 11 +++++++++++
 src/main.vala          |  2 --
 src/prefs.vala         | 15 ---------------
 3 files changed, 11 insertions(+), 17 deletions(-)
---
diff --git a/src/four-in-a-row.vala b/src/four-in-a-row.vala
index 4c806a8..81339be 100644
--- a/src/four-in-a-row.vala
+++ b/src/four-in-a-row.vala
@@ -27,6 +27,7 @@ class FourInARow : Gtk.Application {
     PlayerID player;
     PlayerID winner;
     public PlayerID who_starts;
+    PrefsBox? prefsbox = null;
     /**
      * socre:
      *
@@ -775,4 +776,14 @@ class FourInARow : Gtk.Application {
         }
         return true;
     }
+
+    public void prefsbox_open() {
+        if (prefsbox != null) {
+            prefsbox.present();
+            return;
+        }
+
+        prefsbox = new PrefsBox(window);
+        prefsbox.show_all();
+    }
 }
diff --git a/src/main.vala b/src/main.vala
index 7fd7a2a..7081ce7 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -80,9 +80,7 @@ SimpleAction new_game_action;
 
 FourInARow? application;
 Gtk.ApplicationWindow window;
-//Scorebox? scorebox = null;
 Settings settings;
-PrefsBox? prefsbox = null;
 Prefs p;
 
 
diff --git a/src/prefs.vala b/src/prefs.vala
index 97008b8..f2fe654 100644
--- a/src/prefs.vala
+++ b/src/prefs.vala
@@ -122,19 +122,4 @@ public Level sane_player_level(Level val) {
     return val;
 }
 
-public void prefsbox_open() {
-    Gtk.Grid grid;
-    GamesControlsList controls_list;
-    Gtk.Label label;
-    Gtk.CellRendererText renderer;
-    Gtk.ListStore model;
-    Gtk.TreeIter iter;
-
-    if (prefsbox != null) {
-        prefsbox.present();
-        return;
-    }
 
-    prefsbox = new PrefsBox(window);
-    prefsbox.show_all();
-}


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