Commit 3393ef6e authored by Hauke Goldhammer's avatar Hauke Goldhammer

Port to 0.18 message types

parent 8f4112be
......@@ -81,10 +81,10 @@ void ChatWidget::sendChatMessage() {
print("*** error: "
+ QString::fromUtf8(to_string(x.error()).c_str()));
else
self()->send(self(), atom("join"), std::move(*x));
self()->send(self(), join_atom_v, std::move(*x));
},
[=](set_name_atom atm, string& name) {
send_as(as_actor(), as_actor(), atm, std::move(name));
[=](set_name_atom, string& name) {
send_as(as_actor(), as_actor(), set_name_atom_v, std::move(name));
}
});
if (! res)
......@@ -130,12 +130,12 @@ void ChatWidget::joinGroup() {
if (! x)
QMessageBox::critical(this, "Error", to_string(x.error()).c_str());
else
self()->send(self(), join_atom::value, std::move(*x));
self()->send(self(), join_atom_v, std::move(*x));
}
void ChatWidget::changeName() {
auto name = QInputDialog::getText(this, "Change Name",
"Please enter a new name");
if (! name.isEmpty())
send_as(as_actor(), as_actor(), atom("setName"), name.toUtf8().constData());
send_as(as_actor(), as_actor(), set_name_atom_v, name.toUtf8().constData());
}
......@@ -11,6 +11,13 @@ CAF_PUSH_WARNINGS
#include <QTextEdit>
CAF_POP_WARNINGS
CAF_BEGIN_TYPE_ID_BLOCK(qt_support, first_custom_type_id)
CAF_ADD_ATOM(qt_support, set_name_atom)
CAF_ADD_ATOM(qt_support, quit_atom)
CAF_END_TYPE_ID_BLOCK(qt_support)
class ChatWidget : public caf::mixin::actor_widget<QWidget> {
private:
// -- Qt boilerplate code ----------------------------------------------------
......@@ -22,10 +29,6 @@ public:
using super = caf::mixin::actor_widget<QWidget>;
using set_name_atom = caf::atom_constant<caf::atom("setName")>;
using quit_atom = caf::atom_constant<caf::atom("quit")>;
ChatWidget(QWidget* parent = nullptr, Qt::WindowFlags f = 0);
~ChatWidget();
......
......@@ -40,6 +40,7 @@ public:
.add(group_id, "group,g", "join group (format: <module>:<id>");
parse(argc, argv);
load<io::middleman>();
io::middleman::init_global_meta_objects();
}
};
......@@ -74,9 +75,9 @@ int main(int argc, char** argv) {
helper.chatwidget->init(system);
auto client = helper.chatwidget->as_actor();
if (! name.empty())
send_as(client, client, atom("setName"), move(name));
send_as(client, client, set_name_atom_v, move(name));
if (grp)
send_as(client, client, atom("join"), std::move(grp));
send_as(client, client, join_atom_v, std::move(grp));
mw.show();
return app.exec();
}
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