Removed Connection state from the class,

as we have it now in INetwork. The connection state
from the shimblib should not be used in the client
code (abstraction from "drivers"), and in the past the
corresponding client state was declared here, but is now
one level deeper in INetwork.

A second change applied here is to use the signature
connectionStatusChanged(from, to), which allows the GUI
to better detect whether we login or logout without keeping
its own state.
This commit is contained in:
Klaus Basan
2014-01-13 14:05:13 +01:00
parent cf47b670a6
commit 92276eb5bf
4 changed files with 38 additions and 77 deletions

View File

@@ -8,14 +8,13 @@
#include "blackcore/dbus_server.h"
#include "blackcore/network_vatlib.h"
#include "blackcore/coreruntime.h"
#include "blackcore/context_network_interface.h"
#include "blackmisc/avallclasses.h"
#include "blackmisc/statusmessage.h"
#include "blackmisc/statusmessagelist.h"
#include "blackcore/coreruntime.h"
class QNetworkAccessManager;
class QNetworkReply;
#include <QTimer>
#include <QNetworkAccessManager>
#define BLACKCORE_CONTEXTNETWORK_INTERFACENAME "blackcore.contextnetwork"
@@ -32,12 +31,11 @@ namespace BlackCore
Q_OBJECT
public:
/*!
* \brief With link to server
* \param server
*/
CContextNetwork(CCoreRuntime *parent);
CContextNetwork(CCoreRuntime *runtime);
/*!
* \brief Destructor
@@ -240,7 +238,7 @@ namespace BlackCore
* \param from
* \param to
*/
void psFsdConnectionStatusChanged(Cvatlib_Network::connStatus from, Cvatlib_Network::connStatus to);
void psFsdConnectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to);
/*!
* \brief ATC position update
@@ -331,7 +329,4 @@ namespace BlackCore
};
}
// Declaring BlackCore::CContextNetwork * crashed when reading data
Q_DECLARE_METATYPE(BlackCore::CContextNetwork::ConnectionStatus)
#endif // guard