From: APTX Date: Thu, 30 May 2013 14:07:57 +0000 (+0200) Subject: Fix spelling recieve => receive. X-Git-Url: https://gitweb.aptx.org/?a=commitdiff_plain;h=8637b20aac349249e03e80a07d11ec11c7a890e9;p=anidbudpclient.git Fix spelling recieve => receive. --- diff --git a/client.cpp b/client.cpp index 125e9ed..634e2bc 100644 --- a/client.cpp +++ b/client.cpp @@ -74,16 +74,16 @@ qDebug() << "Api instance init!"; idleTimeoutState = new QState(connectedState); sendState = new QState(connectedState); waitState = new QState(connectedState); - recieveState = new QState; - recieveFailState = new QState; + receiveState = new QState; + receiveFailState = new QState; connectedHistoryState = new QHistoryState(connectedState); stateMachine->addState(errorState); stateMachine->addState(disconnectedState); stateMachine->addState(connectingState); stateMachine->addState(connectedState); - stateMachine->addState(recieveState); - stateMachine->addState(recieveFailState); + stateMachine->addState(receiveState); + stateMachine->addState(receiveFailState); stateMachine->setInitialState(disconnectedState); connectedState->setInitialState(sendState); @@ -93,8 +93,8 @@ qDebug() << "Api instance init!"; errorState->addTransition(this, SIGNAL(clearErrorsRequested()), disconnectedState); connectedState->addTransition(this, SIGNAL(startDisconnecting()), disconnectedState); - connectedState->addTransition(socket, SIGNAL(readyRead()), recieveState); - connectedState->addTransition(this, SIGNAL(sendFailed()), recieveFailState); + connectedState->addTransition(socket, SIGNAL(readyRead()), receiveState); + connectedState->addTransition(this, SIGNAL(sendFailed()), receiveFailState); disconnectedState->addTransition(this, SIGNAL(startConnecting()), connectingState); @@ -119,12 +119,12 @@ qDebug() << "Api instance init!"; idleTimeoutState->addTransition(this, SIGNAL(startSending()), sendState); - recieveState->addTransition(this, SIGNAL(authenticated()), authenticatingState); - recieveState->addTransition(this, SIGNAL(connectionError()), errorState); - recieveState->addTransition(this, SIGNAL(replyRecieved()), connectedHistoryState); + receiveState->addTransition(this, SIGNAL(authenticated()), authenticatingState); + receiveState->addTransition(this, SIGNAL(connectionError()), errorState); + receiveState->addTransition(this, SIGNAL(replyReceived()), connectedHistoryState); - recieveFailState->addTransition(this, SIGNAL(connectionError()), errorState); - recieveFailState->addTransition(sendState); + receiveFailState->addTransition(this, SIGNAL(connectionError()), errorState); + receiveFailState->addTransition(sendState); // ------------ END Transitions ------------------- // ------------- Methods --------------------- @@ -141,8 +141,8 @@ qDebug() << "Api instance init!"; QObject::connect(idleState, SIGNAL(exited()), this, SLOT(exitIdleState())); QObject::connect(idleTimeoutState, SIGNAL(entered()), this, SLOT(enterIdleTiemoutState())); - QObject::connect(recieveState, SIGNAL(entered()), this, SLOT(enterRecieveState())); - QObject::connect(recieveFailState, SIGNAL(entered()), this, SLOT(enterRecieveFailState())); + QObject::connect(receiveState, SIGNAL(entered()), this, SLOT(enterReceiveState())); + QObject::connect(receiveFailState, SIGNAL(entered()), this, SLOT(enterReceiveFailState())); // ------------ END Methods ------------------- stateMachine->start(); @@ -555,10 +555,10 @@ qDebug() << "Entering IdleTiemout State"; } } -void Client::enterRecieveState() +void Client::enterReceiveState() { #ifdef ANIDBUDPCLIENT_CLIENT_STATE_MACHINE_DEBUG -qDebug() << "Entering Recieve State"; +qDebug() << "Entering Receive State"; #endif while (socket->hasPendingDatagrams()) { @@ -572,7 +572,7 @@ qDebug() << "Entering Recieve State"; if (sender != m_hostAddress) { - qWarning() << QString("Recieved datagram from unknown host: %1 port: %2\nRaw datagram contents:%3\nDiscarding datagram.") + qWarning() << QString("Received datagram from unknown host: %1 port: %2\nRaw datagram contents:%3\nDiscarding datagram.") .arg(sender.toString()) .arg(senderPort) .arg(tmp.constData()); @@ -605,7 +605,7 @@ qDebug() << "COMPRESSED DATAGRAM = " << tmp; QString reply = QString::fromUtf8(tmp); #ifdef ANIDBUDPCLIENT_CLIENT_COMMAND_DEBUG -qDebug() << QString("Recieved datagram from [%1]:%2\nRaw datagram contents:%3") +qDebug() << QString("Received datagram from [%1]:%2\nRaw datagram contents:%3") .arg(m_host) .arg(senderPort) .arg(reply); @@ -810,17 +810,17 @@ qDebug() << "LOGIN FIRST required, authing"; continueLoop: ; } - // replyRecieved() should be emitted on success - // all connection errors go directly to endLoops - emit replyRecieved(); + // replyReceived() should be emitted on success + // all connection errors go directly to endLoop + emit replyReceived(); endLoop: ; } -void Client::enterRecieveFailState() +void Client::enterReceiveFailState() { #ifdef ANIDBUDPCLIENT_CLIENT_STATE_MACHINE_DEBUG -qDebug() << "Entering RecieveFail State"; +qDebug() << "Entering ReceiveFail State"; #endif if (commandsTimedOut < 3) return; diff --git a/client.h b/client.h index 8eb1f34..09595c9 100644 --- a/client.h +++ b/client.h @@ -119,7 +119,7 @@ signals: void commandSent(); void queueEmpty(); - void replyRecieved(); + void replyReceived(); void sendFailed(); void clearErrorsRequested(); @@ -151,8 +151,8 @@ private slots: void exitIdleState(); void enterIdleTiemoutState(); - void enterRecieveState(); - void enterRecieveFailState(); + void enterReceiveState(); + void enterReceiveFailState(); void logout(); @@ -233,8 +233,8 @@ private: QState *sendState; QState *waitState; - QState *recieveState; - QState *recieveFailState; + QState *receiveState; + QState *receiveFailState; QHistoryState *connectedHistoryState; };