Commit 41cd6259 authored by Hauke Goldhammer's avatar Hauke Goldhammer

Integrate review feedback

parent c4e5c987
...@@ -29,7 +29,7 @@ void ChatWidget::init(actor_system& system) { ...@@ -29,7 +29,7 @@ void ChatWidget::init(actor_system& system) {
return { return {
[=](join_atom, const group& what) { [=](join_atom, const group& what) {
auto groups = self->joined_groups(); auto groups = self->joined_groups();
for (auto&& grp : groups) { for (const auto& grp : groups) {
print(("*** leave " + to_string(grp)).c_str()); print(("*** leave " + to_string(grp)).c_str());
self->send(grp, name_ + " has left the chatroom"); self->send(grp, name_ + " has left the chatroom");
self->leave(grp); self->leave(grp);
...@@ -56,7 +56,7 @@ void ChatWidget::init(actor_system& system) { ...@@ -56,7 +56,7 @@ void ChatWidget::init(actor_system& system) {
}, },
[=](leave_atom) { [=](leave_atom) {
auto groups = self->joined_groups(); auto groups = self->joined_groups();
for (auto&& grp : groups) { for (const auto& grp : groups) {
std::cout << "*** leave " << to_string(grp) << std::endl; std::cout << "*** leave " << to_string(grp) << std::endl;
self->send(grp, name_ + " has left the chatroom"); self->send(grp, name_ + " has left the chatroom");
self->leave(grp); self->leave(grp);
...@@ -75,14 +75,13 @@ void ChatWidget::sendChatMessage() { ...@@ -75,14 +75,13 @@ void ChatWidget::sendChatMessage() {
vector<string> words; vector<string> words;
split(words, line.midRef(1).toUtf8().constData(), is_any_of(" ")); split(words, line.midRef(1).toUtf8().constData(), is_any_of(" "));
if (words.size() > 1) { if (words.size() > 1) {
if (words.front() == "join" && words.size() == 3) { if (words[0] == "join" && words.size() == 3) {
auto x = system().groups().get(words[1], words[2]); if (auto x = system().groups().get(words[1], words[2]))
if (!x) self()->send(self(), join_atom_v, std::move(*x));
else
print("*** error: " print("*** error: "
+ QString::fromUtf8(to_string(x.error()).c_str())); + QString::fromUtf8(to_string(x.error()).c_str()));
else } else if (words[0] == "setName" && words.size() == 2)
self()->send(self(), join_atom_v, std::move(*x));
} else if (words.front() == "setName" && words.size() == 2)
send_as(as_actor(), as_actor(), set_name_atom_v, std::move(words[1])); send_as(as_actor(), as_actor(), set_name_atom_v, std::move(words[1]));
} else { } else {
print("*** list of commands:\n" print("*** list of commands:\n"
......
...@@ -11,12 +11,12 @@ CAF_PUSH_WARNINGS ...@@ -11,12 +11,12 @@ CAF_PUSH_WARNINGS
#include <QTextEdit> #include <QTextEdit>
CAF_POP_WARNINGS CAF_POP_WARNINGS
CAF_BEGIN_TYPE_ID_BLOCK(qt_support, first_custom_type_id) CAF_BEGIN_TYPE_ID_BLOCK(qtsupport, first_custom_type_id)
CAF_ADD_ATOM(qt_support, set_name_atom) CAF_ADD_ATOM(qtsupport, set_name_atom)
CAF_ADD_ATOM(qt_support, quit_atom) CAF_ADD_ATOM(qtsupport, quit_atom)
CAF_END_TYPE_ID_BLOCK(qt_support) CAF_END_TYPE_ID_BLOCK(qtsupport)
class ChatWidget : public caf::mixin::actor_widget<QWidget> { class ChatWidget : public caf::mixin::actor_widget<QWidget> {
private: private:
......
...@@ -41,7 +41,7 @@ public: ...@@ -41,7 +41,7 @@ public:
}; };
int main(int argc, char** argv) { int main(int argc, char** argv) {
init_global_meta_objects<id_block::qt_support>(); init_global_meta_objects<id_block::qtsupport>();
core::init_global_meta_objects(); core::init_global_meta_objects();
io::middleman::init_global_meta_objects(); io::middleman::init_global_meta_objects();
config cfg{}; config cfg{};
...@@ -63,11 +63,11 @@ int main(int argc, char** argv) { ...@@ -63,11 +63,11 @@ int main(int argc, char** argv) {
group grp; group grp;
// evaluate group parameters // evaluate group parameters
if (auto locator = get_if<std::string>(&cfg, "group")) { if (auto locator = get_if<std::string>(&cfg, "group")) {
if (auto grp_p = sys.groups().get(*locator)) { if (auto maybe_grp = sys.groups().get(*locator)) {
grp = std::move(*grp_p); grp = std::move(*maybe_grp);
} else { } else {
std::cerr << R"(*** failed to parse ")" << *locator std::cerr << R"(*** failed to parse ")" << *locator
<< R"(" as group locator: )" << to_string(grp_p.error()) << R"(" as group locator: )" << to_string(maybe_grp.error())
<< std::endl; << std::endl;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment