summaryrefslogtreecommitdiff
path: root/client-qt/udm-client-qt/udm_main.cpp
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss@sss.chaoslab.ru>2015-08-06 04:30:27 +0300
committerGluzskiy Alexandr <sss@sss.chaoslab.ru>2015-08-06 04:30:27 +0300
commit1461988ab8387f86d929cbba70bc4839447693f6 (patch)
tree1142409a754415abc965f2bf8563596beb4b108b /client-qt/udm-client-qt/udm_main.cpp
parenta1a9b18e23e222e324bdcc2eccb9e8b6d9c6d00f (diff)
protocol:
removed login field in auth_info added password hash algorithm selection support to auth_info client-qt: basic implementation of connect widget (working)
Diffstat (limited to 'client-qt/udm-client-qt/udm_main.cpp')
-rw-r--r--client-qt/udm-client-qt/udm_main.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/client-qt/udm-client-qt/udm_main.cpp b/client-qt/udm-client-qt/udm_main.cpp
index 103f8b7..02c0f9a 100644
--- a/client-qt/udm-client-qt/udm_main.cpp
+++ b/client-qt/udm-client-qt/udm_main.cpp
@@ -42,20 +42,22 @@ udm_main::~udm_main()
void udm_main::show_connect_widget()
{
connect_widget *w = new connect_widget;
+ connect(w, SIGNAL(client_connect(QString&,QString&,int)), this, SLOT(client_connect(QString&,QString&,int)));
//TODO: make connection to other slots related to connection
//TODO: destroy widget on close
w->show();
}
-void udm_main::client_connect(QString &host, int port)
+void udm_main::client_connect(QString &host, QString &password, int port)
{
thread_client_session = new QThread(this);
io_service_ = new boost::asio::io_service;
session = new client_session(0, io_service_); //parent must be 0 here
- connect(this, SIGNAL(connect_signal(QString,int)), session, SLOT(client_connect(QString,int)));
+ connect(this, SIGNAL(connect_signal(QString,QString,int)), session, SLOT(client_connect(QString,QString,int)));
connect(this, SIGNAL(run_client_io_loop()), session, SLOT(run_io_service()));
+ connect(session, SIGNAL(terminate_thread()), thread_client_session, SLOT(terminate()));
session->moveToThread(thread_client_session);
thread_client_session->start();
- emit connect_signal(host, port);
+ emit connect_signal(host, password, port);
emit run_client_io_loop();
}