ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup comments from review

pull/135/head
Michael Zanetti 2017-10-29 21:21:01 +01:00
parent 2da8c937ab
commit 072e93cbfc
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libguh-core/cloudmanager.cpp
View File

@ -119,7 +119,6 @@ void CloudManager::pairDevice(const QString &idToken, const QString &userId)
void CloudManager::connect2aws()
{
m_awsConnector->connect2AWS(m_serverUrl,
// "1e10fb7e-d9d9-4145-88dd-2d3caf623c18", // micha's test id (needs micha's test certs) - remove that before merging
m_deviceId.toString().remove(QRegExp("[{}]*")),
m_deviceName,
m_caCertificate,

14
libguh-core/janusconnector.cpp
View File

@ -34,12 +34,6 @@ JanusConnector::JanusConnector(QObject *parent) : QObject(parent)
connect(m_socket, static_cast<errorSignal>(&QLocalSocket::error), this, &JanusConnector::onError);
connect(m_socket, &QLocalSocket::disconnected, this, &JanusConnector::onDisconnected);
connect(m_socket, &QLocalSocket::readyRead, this, &JanusConnector::onReadyRead);
connect(m_socket, &QLocalSocket::stateChanged, [&](QLocalSocket::LocalSocketState state) {
qCWarning(dcJanus()) << "state changed" << state;
});
connect(m_socket, &QLocalSocket::readChannelFinished, [&]() {
qCWarning(dcJanus()) << "readchannel finished";
});
connect(&m_socketTimeoutTimer, &QTimer::timeout, this, &JanusConnector::heartbeat);
m_socketTimeoutTimer.setInterval(5000);
@ -146,7 +140,7 @@ void JanusConnector::sendWebRtcHandshakeMessage(const QString &sessionId, const
void JanusConnector::processQueue()
{
if (!m_socket->isOpen()) {
qCWarning(dcJanus()) << "janus socket not open. Cannot process queue";
qCWarning(dcJanus()) << "Janus socket not open. Cannot process queue";
return;
}
@ -193,17 +187,17 @@ void JanusConnector::processQueue()
void JanusConnector::onDisconnected()
{
qCDebug(dcJanus) << "disconnected from Janus";
qCDebug(dcJanus) << "Disconnected from Janus";
}
void JanusConnector::onError(QLocalSocket::LocalSocketError socketError)
{
qCDebug(dcJanus) << "error in janus connection" << socketError << m_socket->errorString();
qCWarning(dcJanus) << "Error in janus connection" << socketError << m_socket->errorString();
}
void JanusConnector::onTextMessageReceived(const QString &message)
{
qCDebug(dcJanus) << "text message received from Janus" << message;
qCDebug(dcJanus) << "Text message received from Janus" << message;
}
void JanusConnector::onReadyRead()

2
libguh-core/libguh-core.pro
View File

@ -11,7 +11,7 @@ target.path = /usr/lib/$$system('dpkg-architecture -q DEB_HOST_MULTIARCH')
INSTALLS += target
exists("/usr/include/mbedtls/net_sockets.h") {
DEFINES += MBEDTLS_NEW_HEADERS
DEFINES += MBEDTLS_NEW_HEADERS
}
# icons for the webserver