From 038e15a19cb06c1113e6ff5c52647ba8338f14f0 Mon Sep 17 00:00:00 2001 From: Julian Hinxlage Date: Tue, 19 Nov 2019 12:41:56 +0100 Subject: [PATCH] updated to new library version --- src/Block.cpp | 6 +++--- src/Block.h | 8 ++++---- src/Config.h | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Block.cpp b/src/Block.cpp index ee07787..08dcfe3 100644 --- a/src/Block.cpp +++ b/src/Block.cpp @@ -20,15 +20,15 @@ void Block::newLine() { } -void Block::setBackgroundWithSingleColor(Color color) { +void Block::setBackgroundWithSingleColor(vkvm::Color color) { } -void Block::setBackground(Color *) { +void Block::setBackground(vkvm::Color *) { } -void Block::setBackgroundWithSlowChangedColor(Color color1, Color color2, int modul) { +void Block::setBackgroundWithSlowChangedColor(vkvm::Color color1, vkvm::Color color2, int modul) { } diff --git a/src/Block.h b/src/Block.h index c0c9fc3..94a130d 100644 --- a/src/Block.h +++ b/src/Block.h @@ -6,7 +6,7 @@ #define TRE_BLOCK_H #include -#include +#include "Color.hpp" #include "Font.h" class Block { @@ -19,9 +19,9 @@ public: virtual unsigned char * getDisplayColor(); - virtual void setBackgroundWithSingleColor(Color color); - virtual void setBackground(Color[]); - virtual void setBackgroundWithSlowChangedColor(Color color1, Color color2, int modul); + virtual void setBackgroundWithSingleColor(vkvm::Color color); + virtual void setBackground(vkvm::Color[]); + virtual void setBackgroundWithSlowChangedColor(vkvm::Color color1, vkvm::Color color2, int modul); virtual void setNowX(); diff --git a/src/Config.h b/src/Config.h index a890ae4..e4f9920 100644 --- a/src/Config.h +++ b/src/Config.h @@ -8,7 +8,7 @@ #include #include #include -#include "Color.h" +#include "Color.hpp" #define CONFIG_FILE_PATH "../res/font4.config" #define BORDER_COLOR_STARTPOSITION 13 @@ -21,9 +21,9 @@ class Config { public: - Color border_color = Color(0, 0, 0); - Color background_color = Color(0, 0, 0); - Color font_color = Color(0, 0, 0); + vkvm::Color border_color = vkvm::Color(0, 0, 0); + vkvm::Color background_color = vkvm::Color(0, 0, 0); + vkvm::Color font_color = vkvm::Color(0, 0, 0); int border_width; int row; int column; @@ -34,7 +34,7 @@ public: private: void init(); - Color readColor(std::string line); + vkvm::Color readColor(std::string line); int readInteger(std::string line); };