eelke/pgLab
1
0
Fork 0
Code Issues 28 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Decided to use signal slot mechanism

Browse source 
The automatic cross thread activation  is probably worth it.
This commit is contained in:
eelke 2018-01-08 20:54:03 +01:00
parent 14ab400ccb
commit abd4020ddf
3 changed files with 34 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

38
pglablib/ASyncDBConnection.cpp
View file

@ -4,19 +4,19 @@
using namespace boost::asio;
//namespace {
namespace {
// class registerMetaTypes {
// public:
// registerMetaTypes()
// {
// qRegisterMetaType<ASyncDBConnection::State>();
// qRegisterMetaType<Pgsql::ErrorDetails>();
// }
// } registerMetaTypes_instance;
class registerMetaTypes {
public:
registerMetaTypes()
{
qRegisterMetaType<ASyncDBConnection::State>();
qRegisterMetaType<Pgsql::ErrorDetails>();
}
} registerMetaTypes_instance;
//}
}
ASyncDBConnection::ASyncDBConnection(boost::asio::io_service &ios)
: m_asioSock(ios)
@ -87,8 +87,7 @@ void ASyncDBConnection::doStateCallback(State state)
m_connection.setNoticeReceiver(
[this](const PGresult *result) { processNotice(result); });
}
if (m_stateChangeReceiver)
m_stateChangeReceiver(state);
emit onStateChanged(state);
}
@ -137,7 +136,7 @@ void ASyncDBConnection::async_query_handler(boost::system::error_code ec, std::s
while ( ! finished && ! m_connection.isBusy()) {
auto res = m_connection.getResult();
qint64 ms = m_timer.restart();
on_result(res, ms); // do we really want to send null result to???
on_result(res, ms);
if (res == nullptr) {
m_timer.invalidate();
doStateCallback(State::Connected);
@ -170,16 +169,5 @@ bool ASyncDBConnection::cancel()
void ASyncDBConnection::processNotice(const PGresult *result)
{
Pgsql::ErrorDetails details = Pgsql::ErrorDetails::createErrorDetailsFromPGresult(result);
if (m_noticeReceiver)
m_noticeReceiver(details);
}
void ASyncDBConnection::setStateChangeReceiver(StateChangeReceiver state_change_receiver)
{
m_stateChangeReceiver = state_change_receiver;
}
void ASyncDBConnection::setNoticeReceiver(NoticeReceiver notice_receiver)
{
m_noticeReceiver = notice_receiver;
emit onNotice(details);
}