IN and OUT may be reserved words.

diff --git a/events.cpp b/events.cpp
index cc7a909cb90f7627e219dbbdd90dfcffaee46a0b..4fd7ff6321ea5050a08e6721adf99d033fe45bb5 100644 (file)
--- a/events.cpp
+++ b/events.cpp
@@ -29,7 +29,7 @@ static string event_type_to_string(EventType type)
                return "drop";
        case EventType::GOAL:
                return "goal";
-       case EventType::IN:
+       case EventType::SWAP_IN:
                return "in";
        case EventType::INTERCEPTION:
                return "interception";
@@ -37,7 +37,7 @@ static string event_type_to_string(EventType type)
                return "offensive_soft_minus";
        case EventType::OFFENSIVE_SOFT_PLUS:
                return "offensive_soft_plus";
-       case EventType::OUT:
+       case EventType::SWAP_OUT:
                return "out";
        case EventType::PULL:
                return "pull";
@@ -90,7 +90,7 @@ static EventType string_to_event_type(const string &type)
        } else if (type == "goal") {
                return EventType::GOAL;
        } else if (type == "in") {
-               return EventType::IN;
+               return EventType::SWAP_IN;
        } else if (type == "interception") {
                return EventType::INTERCEPTION;
        } else if (type == "offensive_soft_minus") {
@@ -98,7 +98,7 @@ static EventType string_to_event_type(const string &type)
        } else if (type == "offensive_soft_plus") {
                return EventType::OFFENSIVE_SOFT_PLUS;
        } else if (type == "out") {
-               return EventType::OUT;
+               return EventType::SWAP_OUT;
        } else if (type == "pull") {
                return EventType::PULL;
        } else if (type == "pull_landed") {
@@ -486,7 +486,7 @@ EventsModel::Status EventsModel::get_status_at(uint64_t t)
 
                if (e.type == EventType::GOAL || e.type == EventType::THEIR_GOAL) {
                        s.pull_state = Status::SHOULD_PULL;
-               } else if (e.type == EventType::IN || e.type == EventType::OUT || e.type == EventType::STOPPAGE || e.type == EventType::RESTART || e.type == EventType::UNKNOWN || e.type == EventType::SET_DEFENSE || e.type == EventType::SET_OFFENSE) {
+               } else if (e.type == EventType::SWAP_IN || e.type == EventType::SWAP_OUT || e.type == EventType::STOPPAGE || e.type == EventType::RESTART || e.type == EventType::UNKNOWN || e.type == EventType::SET_DEFENSE || e.type == EventType::SET_OFFENSE) {
                        // No effect on pull status.
                } else if (e.type == EventType::PULL) {
                        s.pull_state = Status::PULL_IN_AIR;
@@ -575,10 +575,10 @@ set<int> EventsModel::get_team_at(uint64_t t)
                if (e.t > t) {
                        break;
                }
-               if (e.type == EventType::IN) {
+               if (e.type == EventType::SWAP_IN) {
                        team.insert(*e.player_id);
                }
-               if (e.type == EventType::OUT) {
+               if (e.type == EventType::SWAP_OUT) {
                        team.erase(*e.player_id);
                }
        }
@@ -609,7 +609,7 @@ void EventsModel::set_team_at(uint64_t t, const set<int> &new_team)
                if (events[i].t > backdate_point) {
                        break;
                }
-               if (events[i].t == backdate_point && (events[i].type == EventType::IN || events[i].type == EventType::OUT)) {
+               if (events[i].t == backdate_point && (events[i].type == EventType::SWAP_IN || events[i].type == EventType::SWAP_OUT)) {
                        delete_event(i);
                } else {
                        ++i;
@@ -642,7 +642,7 @@ void EventsModel::set_formation_at(uint64_t t, bool offense, unsigned formation)
                        break;
                }
                if (e.type == EventType::GOAL || e.type == EventType::THEIR_GOAL ||
-                   e.type == EventType::IN || e.type == EventType::OUT ||
+                   e.type == EventType::SWAP_IN || e.type == EventType::SWAP_OUT ||
                    e.type == EventType::STOPPAGE ||
                    e.type == EventType::SET_DEFENSE || e.type == EventType::SET_OFFENSE ||
                    e.type == EventType::THROWAWAY || e.type == EventType::THEIR_THROWAWAY ||

diff --git a/events.h b/events.h
index f522734261e5334a675cade7c965dae806f1e4e8..903c107beb89dbd30570a74ea881f8a6dc439cd8 100644 (file)
--- a/events.h
+++ b/events.h
@@ -18,11 +18,11 @@ enum class EventType {
        FORMATION_OFFENSE,
        DROP,
        GOAL,
-       IN,
+       SWAP_IN,
        INTERCEPTION,
        OFFENSIVE_SOFT_MINUS,
        OFFENSIVE_SOFT_PLUS,
-       OUT,
+       SWAP_OUT,
        PULL,
        PULL_LANDED,
        PULL_OOB,

diff --git a/mainwindow.cpp b/mainwindow.cpp
index fa29c954713b8b2e60fe5857a4c7eef61fcb11f0..bf0ec2bcc80addab23e00ab393feabb49ba0567c 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -782,10 +782,10 @@ void MainWindow::update_gender_ratio(uint64_t t)
                        EventType type = events->get_event_type(row);
                        if (type == EventType::GOAL || type == EventType::THEIR_GOAL) {
                                historical_gender_counts.push_back(current_gender_count);
-                       } else if (type == EventType::IN) {
+                       } else if (type == EventType::SWAP_IN) {
                                string gender = players->get_player_gender_by_id(*events->get_player_id(row));
                                ++current_gender_count[gender];
-                       } else if (type == EventType::OUT) {
+                       } else if (type == EventType::SWAP_OUT) {
                                string gender = players->get_player_gender_by_id(*events->get_player_id(row));
                                --current_gender_count[gender];
                        }