updated to new library version

This commit is contained in:
Julian Hinxlage 2019-11-19 12:41:56 +01:00
parent 4a08c433ad
commit 038e15a19c
3 changed files with 12 additions and 12 deletions

View File

@ -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) {
} }

View File

@ -6,7 +6,7 @@
#define TRE_BLOCK_H #define TRE_BLOCK_H
#include <string> #include <string>
#include <Color.h> #include "Color.hpp"
#include "Font.h" #include "Font.h"
class Block { class Block {
@ -19,9 +19,9 @@ public:
virtual unsigned char * getDisplayColor(); virtual unsigned char * getDisplayColor();
virtual void setBackgroundWithSingleColor(Color color); virtual void setBackgroundWithSingleColor(vkvm::Color color);
virtual void setBackground(Color[]); virtual void setBackground(vkvm::Color[]);
virtual void setBackgroundWithSlowChangedColor(Color color1, Color color2, int modul); virtual void setBackgroundWithSlowChangedColor(vkvm::Color color1, vkvm::Color color2, int modul);
virtual void setNowX(); virtual void setNowX();

View File

@ -8,7 +8,7 @@
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
#include <iostream> #include <iostream>
#include "Color.h" #include "Color.hpp"
#define CONFIG_FILE_PATH "../res/font4.config" #define CONFIG_FILE_PATH "../res/font4.config"
#define BORDER_COLOR_STARTPOSITION 13 #define BORDER_COLOR_STARTPOSITION 13
@ -21,9 +21,9 @@
class Config { class Config {
public: public:
Color border_color = Color(0, 0, 0); vkvm::Color border_color = vkvm::Color(0, 0, 0);
Color background_color = Color(0, 0, 0); vkvm::Color background_color = vkvm::Color(0, 0, 0);
Color font_color = Color(0, 0, 0); vkvm::Color font_color = vkvm::Color(0, 0, 0);
int border_width; int border_width;
int row; int row;
int column; int column;
@ -34,7 +34,7 @@ public:
private: private:
void init(); void init();
Color readColor(std::string line); vkvm::Color readColor(std::string line);
int readInteger(std::string line); int readInteger(std::string line);
}; };