From 53ba7febf46e8a71fa5d074e83052f588548292e Mon Sep 17 00:00:00 2001 From: King_DuckZ Date: Mon, 10 Aug 2020 02:47:55 +0100 Subject: [PATCH] This stuff doesn't need to be in oro --- src/{oro => }/base64.cpp | 4 ++-- src/{oro => }/base64.hpp | 4 ++-- src/meson.build | 2 +- src/oro/originsdb.cpp | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-) rename src/{oro => }/base64.cpp (94%) rename src/{oro => }/base64.hpp (76%) diff --git a/src/oro/base64.cpp b/src/base64.cpp similarity index 94% rename from src/oro/base64.cpp rename to src/base64.cpp index 71e0043..dc29a47 100644 --- a/src/oro/base64.cpp +++ b/src/base64.cpp @@ -9,7 +9,7 @@ # undef base64_decode #endif -namespace oro { +namespace duck { std::vector base64_decode (std::string_view text) { base64_decode_context ctx; @@ -26,6 +26,6 @@ std::vector base64_decode (std::string_view text) { return retval; } -} //namespace oro +} //namespace duck #undef restrict diff --git a/src/oro/base64.hpp b/src/base64.hpp similarity index 76% rename from src/oro/base64.hpp rename to src/base64.hpp index 7b78626..1d7bbf2 100644 --- a/src/oro/base64.hpp +++ b/src/base64.hpp @@ -3,8 +3,8 @@ #include #include -namespace oro { +namespace duck { std::vector base64_decode (std::string_view text); -} //namespace oro +} //namespace duck diff --git a/src/meson.build b/src/meson.build index eafcb60..aaccec7 100644 --- a/src/meson.build +++ b/src/meson.build @@ -52,7 +52,7 @@ executable(meson.project_name(), 'timer_icons.cpp', 'oro/originsdb.cpp', 'gnulib/lib/base64.c', - 'oro/base64.cpp', + 'base64.cpp', project_config_file, install: true, dependencies: lib_deps, diff --git a/src/oro/originsdb.cpp b/src/oro/originsdb.cpp index 7c41926..21b30db 100644 --- a/src/oro/originsdb.cpp +++ b/src/oro/originsdb.cpp @@ -6,7 +6,6 @@ #include "SQLiteCpp/SQLiteCpp.h" #include "oro/items.hpp" #include "oro/icons.hpp" -#include "oro/base64.hpp" #include namespace oro { @@ -82,7 +81,7 @@ void OriginsDB::update (const Icons& icons) { query.exec(); query.reset(); - base64_decode(std::string_view(ico.icon).substr(std::string_view("data:image/png;base64,").size())); + //base64_decode(std::string_view(ico.icon).substr(std::string_view("data:image/png;base64,").size())); } transaction.commit();