task update

Author: sinev-valentine

keychain_linux/passentry_gui/include/cmd.hpp

@@ -13,7 +13,7 @@
 #include <boost/hana/range.hpp>
 #include <boost/hana/for_each.hpp>
 #include <boost/hana/size.hpp>
-#include "widget.hpp"
+#include "keychain_gui_win.h"
 
 namespace  slave {
     enum struct cmds {unknown = 0, rawtrx, close, modify, length, last }; // to gui
@@ -26,7 +26,7 @@ namespace  slave {
     struct cmd_base {
         cmd_base(cmds cmd_) : cmd(cmd_) {};
         cmds cmd;
-        virtual void operator()(Widget* w, const fc_light::variant&) const = 0;
+        virtual void operator()(keychain_gui_win* w, const fc_light::variant&) const = 0;
         virtual ~cmd_base() {};
     };
     struct cmd_list_singletone

keychain_linux/passentry_gui/src/cmd.cpp

@@ -11,7 +11,7 @@ namespace slave
     struct cmd : cmd_base {
         cmd() : cmd_base(cmd_) {};
         virtual ~cmd() {};
-        virtual void operator()(Widget* w, const fc_light::variant& v) const override {
+        virtual void operator()(keychain_gui_win* w, const fc_light::variant& v) const override {
             throw std::runtime_error("operation is not implemented");
         };
         using params_t = void;
@@ -24,10 +24,10 @@ namespace slave
         virtual ~cmd() {};
         struct params {std::string rawtrx;};
         using params_t = params;
-        virtual void operator()(Widget * w, const fc_light::variant& v) const override {
+        virtual void operator()(keychain_gui_win * w, const fc_light::variant& v) const override {
             try {
                 auto a = v.as<params_t>();
-                w->pte->setText(QString(a.rawtrx.c_str()));
+               // w->pte->setText(QString(a.rawtrx.c_str()));
             }
             catch (const std::exception &e) {throw std::runtime_error(e.what());}
             catch (const fc_light::exception &e) {throw std::runtime_error(e.what());}
@@ -39,7 +39,7 @@ namespace slave
         cmd() : cmd_base(cmds::close) {};
         virtual ~cmd() {};
         using params_t = void;
-        virtual void operator()(Widget* w, const fc_light::variant& v) const override {
+        virtual void operator()(keychain_gui_win* w, const fc_light::variant& v) const override {
             try { w->close(); }
             catch (const std::exception &e) {throw std::runtime_error(e.what());}
             catch (const fc_light::exception &e) {throw std::runtime_error(e.what());}
@@ -52,12 +52,12 @@ namespace slave
         virtual ~cmd() {};
         struct params { bool caps, num, shift; };
         using params_t = params;
-        virtual void operator()(Widget* w, const fc_light::variant& v) const override {
+        virtual void operator()(keychain_gui_win* w, const fc_light::variant& v) const override {
             try {
                 auto a = v.as<params_t>();
-                a.caps  ? w->caps->setText("caps: on")   : w->caps->setText("caps: off");
-                a.num   ? w->num->setText("num: on")     : w->num->setText("num: off");
-                a.shift ? w->shift->setText("shift: on")    : w->shift->setText("shift: off");
+                //a.caps  ? w->caps->setText("caps: on")   : w->caps->setText("caps: off");
+                //a.num   ? w->num->setText("num: on")     : w->num->setText("num: off");
+                //a.shift ? w->shift->setText("shift: on")    : w->shift->setText("shift: off");
             }
             catch (const std::exception &e) {throw std::runtime_error(e.what());}
             catch (const fc_light::exception &e) {throw std::runtime_error(e.what());}
@@ -70,10 +70,10 @@ namespace slave
         virtual ~cmd() {};
         struct params {int len;};
         using params_t = params;
-        virtual void operator()(Widget* w, const fc_light::variant& v) const override {
+        virtual void operator()(keychain_gui_win* w, const fc_light::variant& v) const override {
             try {
                 auto a = v.as<params_t>();
-                w->ple->setText(QString (a.len, '*'));
+               // w->ple->setText(QString (a.len, '*'));
             }
             catch (const std::exception &e) {throw std::runtime_error(e.what());}
             catch (const fc_light::exception &e) {throw std::runtime_error(e.what());}

keychain_linux/passentry_gui/src/keychain_gui_win.cpp

@@ -271,11 +271,12 @@ void keychain_gui_win::keyPressEvent(QKeyEvent *event)
 void keychain_gui_win::parse(const std::string s)
 {
 	auto a = fc_light::json::from_string(s);
+	using namespace slave;
 	try {
 		auto cmd = a.as<slave::cmd_common>();
 		auto cmd_map = slave::cmd_list_singletone::instance();
 		auto p_func = cmd_map[cmd.cmd];
-//		(*p_func)(this, cmd.params);
+		(*p_func)(this, cmd.params);
 	}
 	catch (const std::exception &e) {throw std::runtime_error(e.what());}
 	catch (const fc_light::exception &e) {throw std::runtime_error(e.what());}