From 9227ac62164bbbc1a9c0ae7c39e838d883453d0b Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Thu, 6 Apr 2023 09:20:52 +0600 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D0=BF=D0=B8=D1=81=D0=B0=D0=BD?= =?UTF-8?q?=D0=B0=20=D1=83=D0=BD=D0=B8=D0=B2=D0=B5=D1=80=D1=81=D0=B0=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D0=B0=D1=8F=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE?= =?UTF-8?q?=D1=82=D0=B5=D0=BA=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=BE?= =?UTF-8?q?=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B8=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/CMakeLists.txt | 10 ++++++++-- source/my_process.cc | 5 ++--- source/my_process.h | 6 +++--- source/save.cc | 6 +++--- source/save.h | 6 +++--- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index ec3f582..c4a700b 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -16,12 +16,18 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissin -fstack-clash-protection -fcf-protection -g") set(SOURCE_FILES + ubl-settings-quotas.h + ubl-settings-quotas.cc + save.h + save.cc + load.h + load.cc + my_process.h + my_process.cc util.h util.cc ubl-util-standard.h ubl-util-standard.c - ubl-settings-quotas.h - ubl-settings-quotas.cc main.cc) set(LIBRARIES diff --git a/source/my_process.cc b/source/my_process.cc index 43d37c3..79dad92 100644 --- a/source/my_process.cc +++ b/source/my_process.cc @@ -2,7 +2,7 @@ #include "util.h" namespace My_Process{ - +#define debug false struct Utils::Result My_Process_call::call(string cmd) { this->i_error_old = this->i_error; struct Utils::Result obj_result; @@ -59,8 +59,7 @@ void My_Process::set_count_error(int count_error) { this->str_cmd_error = ""; } -void My_Process::log_mess_error(string cmd) { - +void My_Process::log_mess_error(string) { } string My_Process::get_cmd_error() { diff --git a/source/my_process.h b/source/my_process.h index 7f271c9..809afe5 100644 --- a/source/my_process.h +++ b/source/my_process.h @@ -11,12 +11,12 @@ class My_Process { int get_count_error(); void set_count_error(int count_error); void set_back_count_error(); - void log_mess_error(string cmd); + void log_mess_error(string); string get_cmd_error(); }; -class My_Process_call: My_Process { +class My_Process_call: public My_Process { public: My_Process_call(); struct Utils::Result call(string cmd); @@ -24,7 +24,7 @@ class My_Process_call: My_Process { }; -class My_Process_system: My_Process { +class My_Process_system: public My_Process { public: My_Process_system(); void call(string cmd, string thread_str); diff --git a/source/save.cc b/source/save.cc index c36d9c5..3c155db 100644 --- a/source/save.cc +++ b/source/save.cc @@ -10,7 +10,7 @@ bool Save::get_state_save() { return this->flag_no_save; } -void Save::set_data_local(std::map &map_global) { +void Save::set_data_global(std::map &map_global) { this->map_global = &map_global; } @@ -18,7 +18,7 @@ void Save::set_data_local(std::map &map_local) { this->map_local = &map_local; } -void Save::set_data_local(std::map &map_gui) { +void Save::set_data_gui(std::map &map_gui) { this->map_gui = &map_gui; } @@ -52,7 +52,7 @@ bool Save::check_save(string flag_save, string key_name) { return true; } -void Save::save(std::map &map_gui, std::map &map_temp,string sections, string str_flag_save) { +void Save::save(std::map &map_gui, string sections, string str_flag_save) { string key = ""; string value = ""; string cmd = ""; diff --git a/source/save.h b/source/save.h index 1f5f194..8a9e90e 100644 --- a/source/save.h +++ b/source/save.h @@ -15,12 +15,12 @@ private: public: Save(/* args */); ~Save(); - void set_data_local(std::map &map_global); + void set_data_global(std::map &map_global); void set_data_local(std::map &map_local); - void set_data_local(std::map &map_gui); + void set_data_gui(std::map &map_gui); bool check_save(string flag_save, string key_name); bool get_state_save(); - void save(std::map &map_gui, std::map &map_temp,string sections, string str_flag_save) ; + void save(std::map &map_gui, string sections, string str_flag_save) ; vector get_error(); }; }