ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix typo in several places

Browse Source
This commit is contained in:
Simon Stürz 2021-08-16 07:57:34 +02:00 committed by Michael Zanetti
parent 8b09f26ac3
commit 106961557b
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnymea-core/hardware/modbus/modbusrtumasterimpl.cpp
View File

@ -79,7 +79,7 @@ ModbusRtuMasterImpl::ModbusRtuMasterImpl(const QUuid &modbusUuid, const QString
}); });
connect(m_modbus, &QModbusRtuSerialMaster::errorOccurred, this, [=](QModbusDevice::Error error){ connect(m_modbus, &QModbusRtuSerialMaster::errorOccurred, this, [=](QModbusDevice::Error error){
qCWarning(dcModbusRtu()) << "Error occured for modbus RTU master" << m_modbusUuid.toString() << m_serialPort << error << m_modbus->errorString(); qCWarning(dcModbusRtu()) << "Error occurred for modbus RTU master" << m_modbusUuid.toString() << m_serialPort << error << m_modbus->errorString();
if (error != QModbusDevice::NoError) { if (error != QModbusDevice::NoError) {
disconnectDevice(); disconnectDevice();
} }

14
libnymea-core/servers/tunnelproxyserver.cpp
View File

@ -55,8 +55,8 @@ TunnelProxyServer::TunnelProxyServer(const QString &serverName, const QUuid &ser
m_tunnelProxySocketServer = new TunnelProxySocketServer(m_serverUuid, m_serverName, this); m_tunnelProxySocketServer = new TunnelProxySocketServer(m_serverUuid, m_serverName, this);
connect(m_tunnelProxySocketServer, &TunnelProxySocketServer::stateChanged, this, &TunnelProxyServer::onStateChanged); connect(m_tunnelProxySocketServer, &TunnelProxySocketServer::stateChanged, this, &TunnelProxyServer::onStateChanged);
connect(m_tunnelProxySocketServer, &TunnelProxySocketServer::runningChanged, this, &TunnelProxyServer::onServerRunningChanged); connect(m_tunnelProxySocketServer, &TunnelProxySocketServer::runningChanged, this, &TunnelProxyServer::onServerRunningChanged);
connect(m_tunnelProxySocketServer, &TunnelProxySocketServer::errorOccured, this, &TunnelProxyServer::onErrorOccured); connect(m_tunnelProxySocketServer, &TunnelProxySocketServer::errorOccurred, this, &TunnelProxyServer::onErrorOccurred);
connect(m_tunnelProxySocketServer, &TunnelProxySocketServer::serverErrorOccured, this, &TunnelProxyServer::onServerErrorOccured); connect(m_tunnelProxySocketServer, &TunnelProxySocketServer::serverErrorOccurred, this, &TunnelProxyServer::onServerErrorOccurred);
connect(m_tunnelProxySocketServer, &TunnelProxySocketServer::sslErrors, this, &TunnelProxyServer::onSslErrors); connect(m_tunnelProxySocketServer, &TunnelProxySocketServer::sslErrors, this, &TunnelProxyServer::onSslErrors);
connect(m_tunnelProxySocketServer, &TunnelProxySocketServer::clientConnected, this, &TunnelProxyServer::onClientConnected); connect(m_tunnelProxySocketServer, &TunnelProxySocketServer::clientConnected, this, &TunnelProxyServer::onClientConnected);
connect(m_tunnelProxySocketServer, &TunnelProxySocketServer::clientDisconnected, this, &TunnelProxyServer::onClientDisconnected); connect(m_tunnelProxySocketServer, &TunnelProxySocketServer::clientDisconnected, this, &TunnelProxyServer::onClientDisconnected);
@ -128,19 +128,19 @@ void TunnelProxyServer::onServerRunningChanged(bool running)
emit runningChanged(running); emit runningChanged(running);
} }
void TunnelProxyServer::onErrorOccured(QAbstractSocket::SocketError error) void TunnelProxyServer::onErrorOccurred(QAbstractSocket::SocketError error)
{ {
qCDebug(dcTunnelProxyServer()) << "Remote proxy connection error occured" << error; qCDebug(dcTunnelProxyServer()) << "Remote proxy connection error occurred" << error;
} }
void TunnelProxyServer::onServerErrorOccured(TunnelProxySocketServer::Error error) void TunnelProxyServer::onServerErrorOccurred(TunnelProxySocketServer::Error error)
{ {
qCWarning(dcTunnelProxyServer()) << "Error occured on server" << m_serverUrl.toString() << error; qCWarning(dcTunnelProxyServer()) << "Error occurred on server" << m_serverUrl.toString() << error;
} }
void TunnelProxyServer::onSslErrors(const QList<QSslError> &errors) void TunnelProxyServer::onSslErrors(const QList<QSslError> &errors)
{ {
qCDebug(dcTunnelProxyServer()) << "Remote proxy connection SSL errors occured" << errors; qCDebug(dcTunnelProxyServer()) << "Remote proxy connection SSL errors occurred" << errors;
// FIXME: make this configurable // FIXME: make this configurable
m_tunnelProxySocketServer->ignoreSslErrors(); m_tunnelProxySocketServer->ignoreSslErrors();
} }

4
libnymea-core/servers/tunnelproxyserver.h
View File

@ -66,8 +66,8 @@ signals:
private slots: private slots:
void onStateChanged(TunnelProxySocketServer::State state); void onStateChanged(TunnelProxySocketServer::State state);
void onServerRunningChanged(bool running); void onServerRunningChanged(bool running);
void onErrorOccured(QAbstractSocket::SocketError error); void onErrorOccurred(QAbstractSocket::SocketError error);
void onServerErrorOccured(TunnelProxySocketServer::Error error); void onServerErrorOccurred(TunnelProxySocketServer::Error error);
void onSslErrors(const QList<QSslError> &errors); void onSslErrors(const QList<QSslError> &errors);
void onClientConnected(TunnelProxySocket *tunnelProxySocket); void onClientConnected(TunnelProxySocket *tunnelProxySocket);

1
libnymea-core/transportinterface.cpp
View File

@ -98,6 +98,7 @@ TransportInterface::TransportInterface(const ServerConfiguration &config, QObjec
QObject(parent), QObject(parent),
m_config(config) m_config(config)
{ {
} }
/*! Set the ServerConfiguration of this TransportInterface to the given \a config. */ /*! Set the ServerConfiguration of this TransportInterface to the given \a config. */

2
libnymea-core/zigbee/zigbeemanager.cpp
View File

@ -457,7 +457,7 @@ void ZigbeeManager::addNetwork(ZigbeeNetwork *network)
}); });
connect(network, &ZigbeeNetwork::errorOccured, this, [this, network](ZigbeeNetwork::Error error){ connect(network, &ZigbeeNetwork::errorOccured, this, [this, network](ZigbeeNetwork::Error error){
qCWarning(dcZigbee()) << "Network error occured for" << network << error; qCWarning(dcZigbee()) << "Network error occurred for" << network << error;
evaluateZigbeeAvailable(); evaluateZigbeeAvailable();
// TODO: handle error // TODO: handle error
}); });