From d0bd19eb73be0564c5c3ac5f9a759014a1211791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Mon, 2 Jan 2023 13:46:02 +0100 Subject: [PATCH] Clean: Mode::instance definition --- src/main.cpp | 2 +- src/mode/{Test => Border}/Border.h | 0 src/mode/Clock/Clock.cpp | 4 ---- src/mode/GameOfLife/GameOfLife.cpp | 4 ---- src/mode/Mode.h | 5 ++++- src/mode/NewYear/NewYear.cpp | 4 ---- src/mode/Pong/Pong.cpp | 4 ---- src/mode/SpaceInvaders/SpaceInvaders.cpp | 4 ---- src/mode/Test/Border.cpp | 4 ---- 9 files changed, 5 insertions(+), 26 deletions(-) rename src/mode/{Test => Border}/Border.h (100%) delete mode 100644 src/mode/Clock/Clock.cpp delete mode 100644 src/mode/GameOfLife/GameOfLife.cpp delete mode 100644 src/mode/NewYear/NewYear.cpp delete mode 100644 src/mode/Pong/Pong.cpp delete mode 100644 src/mode/SpaceInvaders/SpaceInvaders.cpp delete mode 100644 src/mode/Test/Border.cpp diff --git a/src/main.cpp b/src/main.cpp index 7009ca5..4760bfb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -9,10 +9,10 @@ #include "mode/GameOfLife/GameOfLife.h" #include "mode/Pong/Pong.h" -#include "mode/Test/Border.h" #include "mode/Clock/Clock.h" #include "mode/SpaceInvaders/SpaceInvaders.h" #include "mode/NewYear/NewYear.h" +#include "mode/Border/Border.h" enum ModeId { NONE, diff --git a/src/mode/Test/Border.h b/src/mode/Border/Border.h similarity index 100% rename from src/mode/Test/Border.h rename to src/mode/Border/Border.h diff --git a/src/mode/Clock/Clock.cpp b/src/mode/Clock/Clock.cpp deleted file mode 100644 index cb3d55b..0000000 --- a/src/mode/Clock/Clock.cpp +++ /dev/null @@ -1,4 +0,0 @@ -#include "Clock.h" - -template<> -Clock *Mode::instance = nullptr; \ No newline at end of file diff --git a/src/mode/GameOfLife/GameOfLife.cpp b/src/mode/GameOfLife/GameOfLife.cpp deleted file mode 100644 index 87d21d9..0000000 --- a/src/mode/GameOfLife/GameOfLife.cpp +++ /dev/null @@ -1,4 +0,0 @@ -#include "GameOfLife.h" - -template<> -GameOfLife *Mode::instance = nullptr; \ No newline at end of file diff --git a/src/mode/Mode.h b/src/mode/Mode.h index f217339..bdc7269 100644 --- a/src/mode/Mode.h +++ b/src/mode/Mode.h @@ -18,10 +18,13 @@ protected: public: explicit Mode(Display *display) : - ModeBase(display) { + ModeBase(display) { instance = (T *) this; } }; +template +T *Mode::instance = nullptr; + #endif diff --git a/src/mode/NewYear/NewYear.cpp b/src/mode/NewYear/NewYear.cpp deleted file mode 100644 index d2784f2..0000000 --- a/src/mode/NewYear/NewYear.cpp +++ /dev/null @@ -1,4 +0,0 @@ -#include "NewYear.h" - -template<> -NewYear *Mode::instance = nullptr; \ No newline at end of file diff --git a/src/mode/Pong/Pong.cpp b/src/mode/Pong/Pong.cpp deleted file mode 100644 index 5708197..0000000 --- a/src/mode/Pong/Pong.cpp +++ /dev/null @@ -1,4 +0,0 @@ -#include "Pong.h" - -template<> -Pong *Mode::instance = nullptr; \ No newline at end of file diff --git a/src/mode/SpaceInvaders/SpaceInvaders.cpp b/src/mode/SpaceInvaders/SpaceInvaders.cpp deleted file mode 100644 index fd8855c..0000000 --- a/src/mode/SpaceInvaders/SpaceInvaders.cpp +++ /dev/null @@ -1,4 +0,0 @@ -#include "SpaceInvaders.h" - -template<> -SpaceInvaders *Mode::instance = nullptr; \ No newline at end of file diff --git a/src/mode/Test/Border.cpp b/src/mode/Test/Border.cpp deleted file mode 100644 index 23638d7..0000000 --- a/src/mode/Test/Border.cpp +++ /dev/null @@ -1,4 +0,0 @@ -#include "Border.h" - -template<> -Border *Mode::instance = nullptr; \ No newline at end of file