Use common colors and style sheets for all windows and dialogs

[scorecard] / src / table-model.cpp

diff --git a/src/table-model.cpp b/src/table-model.cpp
index 2a8e3c0..6c490ed 100644 (file)
--- a/src/table-model.cpp
+++ b/src/table-model.cpp
@@ -12,6 +12,8 @@
 #include "table-model.h"
 #include "score-common.h"
 
+QString empty("");
+
 Qt::ItemFlags ScoreTableModel::flags (const QModelIndex &)
 {
   return 0;
@@ -207,8 +209,8 @@ QVariant ScoreTableModel::data(const QModelIndex &index, int role) const
     // Hole numbers 1-18. All hole nums, in, out and tot cell but not
     // the empty cell.
     if ((row == ROW_HOLE && col != 10) || row == ROW_HOLE_2) {
-       QBrush brush(colorHoleBg);
-       return brush;
+      QBrush brush(ScoreColor::holeBg());
+      return brush;
     }
     if (score && course && (row == ROW_SCORE || row == ROW_SCORE_2)) {
       int par;
@@ -224,38 +226,38 @@ QVariant ScoreTableModel::data(const QModelIndex &index, int role) const
 
       if (col == (COLS+1) && row == ROW_SCORE_2) {
        // Total score
-       QBrush brush(colorTotal);
+       QBrush brush(ScoreColor::total());
        return brush;
       }
       if (col == COLS) {
        // In and Out scores
-       QBrush brush(colorSubTotal);
+       QBrush brush(ScoreColor::subTotal());
        return brush;
       }
       if (col < COLS) {
        if (shots == par) {
          // Par
-         QBrush brush(colorPar);
+         QBrush brush(ScoreColor::par());
          return brush;
        }
        if (shots == (par-1)) {
          // Birdie
-         QBrush brush(colorBirdie);
+         QBrush brush(ScoreColor::birdie());
          return brush;
        }
        if (shots == (par+1)) {
          // Bogey
-         QBrush brush(colorBogey);
+         QBrush brush(ScoreColor::bogey());
          return brush;
        }
        if (shots == (par+2)) {
          // Double Bogey
-         QBrush brush(colorDoubleBogey);
+         QBrush brush(ScoreColor::doubleBogey());
          return brush;
        }
        if (shots > (par+2)) {
          // Very bad
-         QBrush brush(colorBad);
+         QBrush brush(ScoreColor::bad());
          return brush;
        }
       }