diff --git a/pglab/crud/CrudModel.cpp b/pglab/crud/CrudModel.cpp index 90637bb..bf3016a 100644 --- a/pglab/crud/CrudModel.cpp +++ b/pglab/crud/CrudModel.cpp @@ -247,9 +247,9 @@ void CrudModel::initRowMapping() m_rowMapping.emplace_back(i); } -void CrudModel::connectionStateChanged(ASyncDBConnection::StateData state) +void CrudModel::connectionStateChanged() { - switch (state.State) { + switch (m_dbConn.state()) { case ASyncDBConnection::State::NotConnected: break; case ASyncDBConnection::State::Connecting: diff --git a/pglab/crud/CrudModel.h b/pglab/crud/CrudModel.h index 822c5fd..979580c 100644 --- a/pglab/crud/CrudModel.h +++ b/pglab/crud/CrudModel.h @@ -264,7 +264,7 @@ private: private slots: void loadIntoModel(std::shared_ptr data); - void connectionStateChanged(ASyncDBConnection::StateData state); + void connectionStateChanged(); }; #endif // CRUDMODEL_H diff --git a/pglab/querytool/QueryTool.cpp b/pglab/querytool/QueryTool.cpp index eaae545..153b19c 100644 --- a/pglab/querytool/QueryTool.cpp +++ b/pglab/querytool/QueryTool.cpp @@ -322,13 +322,14 @@ void QueryTool::queryTextChanged() setQueryTextChanged(true); } -void QueryTool::connectionStateChanged(ASyncDBConnection::StateData state) +void QueryTool::connectionStateChanged() { QString iconname; - switch (state.State) { + + switch (m_dbConnection.state()) { case ASyncDBConnection::State::NotConnected: QMessageBox::warning(this, "pglab", tr("Warning connection and any of its session state has been lost")); - startConnect(); + //startConnect(); iconname = "red.png"; break; case ASyncDBConnection::State::Connecting: diff --git a/pglab/querytool/QueryTool.h b/pglab/querytool/QueryTool.h index 35b833b..5cb98f0 100644 --- a/pglab/querytool/QueryTool.h +++ b/pglab/querytool/QueryTool.h @@ -113,7 +113,7 @@ private slots: void query_ready(std::shared_ptr, qint64 elapsedms); void queryTextChanged(); - void connectionStateChanged(ASyncDBConnection::StateData state); + void connectionStateChanged(); void receiveNotice(Pgsql::ErrorDetails notice); void startConnect(); diff --git a/pglablib/ASyncDBConnection.cpp b/pglablib/ASyncDBConnection.cpp index c85fcc6..1c27fb9 100644 --- a/pglablib/ASyncDBConnection.cpp +++ b/pglablib/ASyncDBConnection.cpp @@ -259,7 +259,7 @@ void ASyncDBConnectionThread::doStateCallback(ASyncDBConnection::StateData state { qDebug() << "State change " + state.Message; m_state = state.State; - Q_EMIT asyncConnObject->onStateChanged(state); + Q_EMIT asyncConnObject->onStateChanged(); } bool ASyncDBConnectionThread::waitForAndSendCommand() @@ -435,7 +435,7 @@ void ASyncDBConnection::doStateCallback(State state) m_connection.setNoticeReceiver( [this](const PGresult *result) { processNotice(result); }); } - Q_EMIT onStateChanged(state); + Q_EMIT onStateChanged(); } diff --git a/pglablib/ASyncDBConnection.h b/pglablib/ASyncDBConnection.h index df5789d..02f5310 100644 --- a/pglablib/ASyncDBConnection.h +++ b/pglablib/ASyncDBConnection.h @@ -63,7 +63,7 @@ public: bool cancel(); Q_SIGNALS: - void onStateChanged(ASyncDBConnection::StateData state); + void onStateChanged(); void onNotice(Pgsql::ErrorDetails notice); private: