diff --git a/src/lib/base/EventTypes.cpp b/src/lib/base/EventTypes.cpp index e7fd2f246..6dfeae612 100644 --- a/src/lib/base/EventTypes.cpp +++ b/src/lib/base/EventTypes.cpp @@ -160,7 +160,7 @@ REGISTER_EVENT(Clipboard, clipboardSending) // REGISTER_EVENT(File, fileChunkSending) -REGISTER_EVENT(File, fileRecieveCompleted) +REGISTER_EVENT(File, fileReceiveCompleted) REGISTER_EVENT(File, keepAlive) // diff --git a/src/lib/base/EventTypes.h b/src/lib/base/EventTypes.h index f5eeafaf5..15f119d3d 100644 --- a/src/lib/base/EventTypes.h +++ b/src/lib/base/EventTypes.h @@ -673,7 +673,7 @@ class FileEvents : public EventTypes public: FileEvents() : m_fileChunkSending(Event::kUnknown), - m_fileRecieveCompleted(Event::kUnknown), + m_fileReceiveCompleted(Event::kUnknown), m_keepAlive(Event::kUnknown) { } @@ -685,7 +685,7 @@ public: Event::Type fileChunkSending(); //! Completed receiving a file - Event::Type fileRecieveCompleted(); + Event::Type fileReceiveCompleted(); //! Send a keep alive Event::Type keepAlive(); @@ -694,7 +694,7 @@ public: private: Event::Type m_fileChunkSending; - Event::Type m_fileRecieveCompleted; + Event::Type m_fileReceiveCompleted; Event::Type m_keepAlive; }; diff --git a/src/lib/client/Client.cpp b/src/lib/client/Client.cpp index dd6200fa0..2946e419e 100644 --- a/src/lib/client/Client.cpp +++ b/src/lib/client/Client.cpp @@ -86,8 +86,8 @@ Client::Client( m_events->forFile().fileChunkSending(), this, new TMethodEventJob(this, &Client::handleFileChunkSending) ); m_events->adoptHandler( - m_events->forFile().fileRecieveCompleted(), this, - new TMethodEventJob(this, &Client::handleFileRecieveCompleted) + m_events->forFile().fileReceiveCompleted(), this, + new TMethodEventJob(this, &Client::handleFileReceiveCompleted) ); } @@ -702,12 +702,12 @@ void Client::handleFileChunkSending(const Event &event, void *) sendFileChunk(event.getDataObject()); } -void Client::handleFileRecieveCompleted(const Event &event, void *) +void Client::handleFileReceiveCompleted(const Event &event, void *) { - onFileRecieveCompleted(); + onFileReceiveCompleted(); } -void Client::onFileRecieveCompleted() +void Client::onFileReceiveCompleted() { if (isReceivedFileSizeValid()) { auto method = new TMethodJob(this, &Client::writeToDropDirThread); diff --git a/src/lib/client/Client.h b/src/lib/client/Client.h index 23f3ebc4d..619b9c833 100644 --- a/src/lib/client/Client.h +++ b/src/lib/client/Client.h @@ -212,9 +212,9 @@ private: void handleSuspend(const Event &event, void *); void handleResume(const Event &event, void *); void handleFileChunkSending(const Event &, void *); - void handleFileRecieveCompleted(const Event &, void *); + void handleFileReceiveCompleted(const Event &, void *); void handleStopRetry(const Event &, void *); - void onFileRecieveCompleted(); + void onFileReceiveCompleted(); void sendClipboardThread(void *); void bindNetworkInterface(IDataSocket *socket) const; diff --git a/src/lib/client/ServerProxy.cpp b/src/lib/client/ServerProxy.cpp index 903fb8478..278d6abc1 100644 --- a/src/lib/client/ServerProxy.cpp +++ b/src/lib/client/ServerProxy.cpp @@ -822,7 +822,7 @@ void ServerProxy::fileChunkReceived() int result = FileChunk::assemble(m_stream, m_client->getReceivedFileData(), m_client->getExpectedFileSize()); if (result == kFinish) { - m_events->addEvent(Event(m_events->forFile().fileRecieveCompleted(), m_client)); + m_events->addEvent(Event(m_events->forFile().fileReceiveCompleted(), m_client)); } else if (result == kStart) { if (m_client->getDragFileList().size() > 0) { std::string filename = m_client->getDragFileList().at(0).getFilename(); diff --git a/src/lib/server/ClientProxy1_5.cpp b/src/lib/server/ClientProxy1_5.cpp index d1e7ad5df..295181fa4 100644 --- a/src/lib/server/ClientProxy1_5.cpp +++ b/src/lib/server/ClientProxy1_5.cpp @@ -67,7 +67,7 @@ void ClientProxy1_5::fileChunkReceived() int result = FileChunk::assemble(getStream(), server->getReceivedFileData(), server->getExpectedFileSize()); if (result == kFinish) { - m_events->addEvent(Event(m_events->forFile().fileRecieveCompleted(), server)); + m_events->addEvent(Event(m_events->forFile().fileReceiveCompleted(), server)); } else if (result == kStart) { if (server->getFakeDragFileList().size() > 0) { std::string filename = server->getFakeDragFileList().at(0).getFilename(); diff --git a/src/lib/server/Server.cpp b/src/lib/server/Server.cpp index 8ba26e9c5..21884dad7 100644 --- a/src/lib/server/Server.cpp +++ b/src/lib/server/Server.cpp @@ -173,8 +173,8 @@ Server::Server( new TMethodEventJob(this, &Server::handleFileChunkSendingEvent) ); m_events->adoptHandler( - m_events->forFile().fileRecieveCompleted(), this, - new TMethodEventJob(this, &Server::handleFileRecieveCompletedEvent) + m_events->forFile().fileReceiveCompleted(), this, + new TMethodEventJob(this, &Server::handleFileReceiveCompletedEvent) ); } @@ -1453,9 +1453,9 @@ void Server::handleFileChunkSendingEvent(const Event &event, void *) onFileChunkSending(event.getDataObject()); } -void Server::handleFileRecieveCompletedEvent(const Event &event, void *) +void Server::handleFileReceiveCompletedEvent(const Event &event, void *) { - onFileRecieveCompleted(); + onFileReceiveCompleted(); } void Server::onClipboardChanged(BaseClientProxy *sender, ClipboardID id, uint32_t seqNum) @@ -1986,7 +1986,7 @@ void Server::onFileChunkSending(const void *data) m_active->fileChunkSending(chunk->m_chunk[0], &chunk->m_chunk[1], chunk->m_dataSize); } -void Server::onFileRecieveCompleted() +void Server::onFileReceiveCompleted() { if (isReceivedFileSizeValid()) { auto method = new TMethodJob(this, &Server::writeToDropDirThread); diff --git a/src/lib/server/Server.h b/src/lib/server/Server.h index 666472bf9..579031792 100644 --- a/src/lib/server/Server.h +++ b/src/lib/server/Server.h @@ -200,7 +200,7 @@ public: */ void getClients(std::vector &list) const; - //! Return true if recieved file size is valid + //! Return true if received file size is valid bool isReceivedFileSizeValid(); //! Return expected file data size @@ -351,7 +351,7 @@ private: void handleFakeInputBeginEvent(const Event &, void *); void handleFakeInputEndEvent(const Event &, void *); void handleFileChunkSendingEvent(const Event &, void *); - void handleFileRecieveCompletedEvent(const Event &, void *); + void handleFileReceiveCompletedEvent(const Event &, void *); // event processing void onClipboardChanged(BaseClientProxy *sender, ClipboardID id, uint32_t seqNum); @@ -365,7 +365,7 @@ private: void onMouseMoveSecondary(int32_t dx, int32_t dy); void onMouseWheel(int32_t xDelta, int32_t yDelta); void onFileChunkSending(const void *data); - void onFileRecieveCompleted(); + void onFileReceiveCompleted(); // add client to list and attach event handlers for client bool addClient(BaseClientProxy *); diff --git a/src/test/integtests/net/NetworkTests.cpp b/src/test/integtests/net/NetworkTests.cpp index 1ba8962ff..928fede4b 100644 --- a/src/test/integtests/net/NetworkTests.cpp +++ b/src/test/integtests/net/NetworkTests.cpp @@ -70,19 +70,19 @@ public: void sendToClient_mockData_handleClientConnected(const Event &, void *vlistener); - void sendToClient_mockData_fileRecieveCompleted(const Event &, void *); + void sendToClient_mockData_fileReceiveCompleted(const Event &, void *); void sendToClient_mockFile_handleClientConnected(const Event &, void *vlistener); - void sendToClient_mockFile_fileRecieveCompleted(const Event &event, void *); + void sendToClient_mockFile_fileReceiveCompleted(const Event &event, void *); void sendToServer_mockData_handleClientConnected(const Event &, void *vlistener); - void sendToServer_mockData_fileRecieveCompleted(const Event &event, void *); + void sendToServer_mockData_fileReceiveCompleted(const Event &event, void *); void sendToServer_mockFile_handleClientConnected(const Event &, void *vlistener); - void sendToServer_mockFile_fileRecieveCompleted(const Event &event, void *); + void sendToServer_mockFile_fileReceiveCompleted(const Event &event, void *); public: TestEventQueue m_events; @@ -143,16 +143,16 @@ TEST_F(NetworkTests, sendToClient_mockData) { clientArgs); m_events.adoptHandler( - m_events.forFile().fileRecieveCompleted(), &client, + m_events.forFile().fileReceiveCompleted(), &client, new TMethodEventJob( - this, &NetworkTests::sendToClient_mockData_fileRecieveCompleted)); + this, &NetworkTests::sendToClient_mockData_fileReceiveCompleted)); client.connect(); m_events.initQuitTimeout(10); m_events.loop(); m_events.removeHandler(m_events.forClientListener().connected(), &listener); - m_events.removeHandler(m_events.forFile().fileRecieveCompleted(), &client); + m_events.removeHandler(m_events.forFile().fileReceiveCompleted(), &client); m_events.cleanupQuitTimeout(); } @@ -207,16 +207,16 @@ TEST_F(NetworkTests, sendToClient_mockFile) { clientArgs); m_events.adoptHandler( - m_events.forFile().fileRecieveCompleted(), &client, + m_events.forFile().fileReceiveCompleted(), &client, new TMethodEventJob( - this, &NetworkTests::sendToClient_mockFile_fileRecieveCompleted)); + this, &NetworkTests::sendToClient_mockFile_fileReceiveCompleted)); client.connect(); m_events.initQuitTimeout(10); m_events.loop(); m_events.removeHandler(m_events.forClientListener().connected(), &listener); - m_events.removeHandler(m_events.forFile().fileRecieveCompleted(), &client); + m_events.removeHandler(m_events.forFile().fileReceiveCompleted(), &client); m_events.cleanupQuitTimeout(); } @@ -270,16 +270,16 @@ TEST_F(NetworkTests, sendToServer_mockData) { &client)); m_events.adoptHandler( - m_events.forFile().fileRecieveCompleted(), &server, + m_events.forFile().fileReceiveCompleted(), &server, new TMethodEventJob( - this, &NetworkTests::sendToServer_mockData_fileRecieveCompleted)); + this, &NetworkTests::sendToServer_mockData_fileReceiveCompleted)); client.connect(); m_events.initQuitTimeout(10); m_events.loop(); m_events.removeHandler(m_events.forClientListener().connected(), &listener); - m_events.removeHandler(m_events.forFile().fileRecieveCompleted(), &server); + m_events.removeHandler(m_events.forFile().fileReceiveCompleted(), &server); m_events.cleanupQuitTimeout(); } @@ -334,16 +334,16 @@ TEST_F(NetworkTests, sendToServer_mockFile) { &client)); m_events.adoptHandler( - m_events.forFile().fileRecieveCompleted(), &server, + m_events.forFile().fileReceiveCompleted(), &server, new TMethodEventJob( - this, &NetworkTests::sendToServer_mockFile_fileRecieveCompleted)); + this, &NetworkTests::sendToServer_mockFile_fileReceiveCompleted)); client.connect(); m_events.initQuitTimeout(10); m_events.loop(); m_events.removeHandler(m_events.forClientListener().connected(), &listener); - m_events.removeHandler(m_events.forFile().fileRecieveCompleted(), &server); + m_events.removeHandler(m_events.forFile().fileReceiveCompleted(), &server); m_events.cleanupQuitTimeout(); } @@ -364,7 +364,7 @@ void NetworkTests::sendToClient_mockData_handleClientConnected( sendMockData(server); } -void NetworkTests::sendToClient_mockData_fileRecieveCompleted( +void NetworkTests::sendToClient_mockData_fileReceiveCompleted( const Event &event, void *) { Client *client = static_cast(event.getTarget()); EXPECT_TRUE(client->isReceivedFileSizeValid()); @@ -389,7 +389,7 @@ void NetworkTests::sendToClient_mockFile_handleClientConnected( server->sendFileToClient(kMockFilename); } -void NetworkTests::sendToClient_mockFile_fileRecieveCompleted( +void NetworkTests::sendToClient_mockFile_fileReceiveCompleted( const Event &event, void *) { Client *client = static_cast(event.getTarget()); EXPECT_TRUE(client->isReceivedFileSizeValid()); @@ -403,7 +403,7 @@ void NetworkTests::sendToServer_mockData_handleClientConnected( sendMockData(client); } -void NetworkTests::sendToServer_mockData_fileRecieveCompleted( +void NetworkTests::sendToServer_mockData_fileReceiveCompleted( const Event &event, void *) { Server *server = static_cast(event.getTarget()); EXPECT_TRUE(server->isReceivedFileSizeValid()); @@ -417,7 +417,7 @@ void NetworkTests::sendToServer_mockFile_handleClientConnected( client->sendFileToServer(kMockFilename); } -void NetworkTests::sendToServer_mockFile_fileRecieveCompleted( +void NetworkTests::sendToServer_mockFile_fileReceiveCompleted( const Event &event, void *) { Server *server = static_cast(event.getTarget()); EXPECT_TRUE(server->isReceivedFileSizeValid());