smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix typos Recieve in methods

Browse source 
...Recieve... =>
...Receive...

Signed-off-by: Kentaro Hayashi <kenhys@xdump.org>
This commit is contained in:
Kentaro Hayashi 2025-03-17 21:27:29 +09:00 committed by Chris Rizzitello
parent 7771dcd04c
commit dd895ed99f
9 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/base/EventTypes.cpp
View file

@ -160,7 +160,7 @@ REGISTER_EVENT(Clipboard, clipboardSending)
// //
REGISTER_EVENT(File, fileChunkSending) REGISTER_EVENT(File, fileChunkSending)
REGISTER_EVENT(File, fileRecieveCompleted) REGISTER_EVENT(File, fileReceiveCompleted)
REGISTER_EVENT(File, keepAlive) REGISTER_EVENT(File, keepAlive)
// //

6
src/lib/base/EventTypes.h
View file

@ -673,7 +673,7 @@ class FileEvents : public EventTypes
public: public:
FileEvents() FileEvents()
: m_fileChunkSending(Event::kUnknown), : m_fileChunkSending(Event::kUnknown),
m_fileRecieveCompleted(Event::kUnknown), m_fileReceiveCompleted(Event::kUnknown),
m_keepAlive(Event::kUnknown) m_keepAlive(Event::kUnknown)
{ {
} }
@ -685,7 +685,7 @@ public:
Event::Type fileChunkSending(); Event::Type fileChunkSending();
//! Completed receiving a file //! Completed receiving a file
Event::Type fileRecieveCompleted(); Event::Type fileReceiveCompleted();
//! Send a keep alive //! Send a keep alive
Event::Type keepAlive(); Event::Type keepAlive();
@ -694,7 +694,7 @@ public:
private: private:
Event::Type m_fileChunkSending; Event::Type m_fileChunkSending;
Event::Type m_fileRecieveCompleted; Event::Type m_fileReceiveCompleted;
Event::Type m_keepAlive; Event::Type m_keepAlive;
}; };

10
src/lib/client/Client.cpp
View file

@ -86,8 +86,8 @@ Client::Client(
m_events->forFile().fileChunkSending(), this, new TMethodEventJob<Client>(this, &Client::handleFileChunkSending) m_events->forFile().fileChunkSending(), this, new TMethodEventJob<Client>(this, &Client::handleFileChunkSending)
); );
m_events->adoptHandler( m_events->adoptHandler(
m_events->forFile().fileRecieveCompleted(), this, m_events->forFile().fileReceiveCompleted(), this,
new TMethodEventJob<Client>(this, &Client::handleFileRecieveCompleted) new TMethodEventJob<Client>(this, &Client::handleFileReceiveCompleted)
); );
} }
@ -702,12 +702,12 @@ void Client::handleFileChunkSending(const Event &event, void *)
sendFileChunk(event.getDataObject()); 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()) { if (isReceivedFileSizeValid()) {
auto method = new TMethodJob<Client>(this, &Client::writeToDropDirThread); auto method = new TMethodJob<Client>(this, &Client::writeToDropDirThread);

4
src/lib/client/Client.h
View file

@ -212,9 +212,9 @@ private:
void handleSuspend(const Event &event, void *); void handleSuspend(const Event &event, void *);
void handleResume(const Event &event, void *); void handleResume(const Event &event, void *);
void handleFileChunkSending(const Event &, void *); void handleFileChunkSending(const Event &, void *);
void handleFileRecieveCompleted(const Event &, void *); void handleFileReceiveCompleted(const Event &, void *);
void handleStopRetry(const Event &, void *); void handleStopRetry(const Event &, void *);
void onFileRecieveCompleted(); void onFileReceiveCompleted();
void sendClipboardThread(void *); void sendClipboardThread(void *);
void bindNetworkInterface(IDataSocket *socket) const; void bindNetworkInterface(IDataSocket *socket) const;

2
src/lib/client/ServerProxy.cpp
View file

@ -822,7 +822,7 @@ void ServerProxy::fileChunkReceived()
int result = FileChunk::assemble(m_stream, m_client->getReceivedFileData(), m_client->getExpectedFileSize()); int result = FileChunk::assemble(m_stream, m_client->getReceivedFileData(), m_client->getExpectedFileSize());
if (result == kFinish) { 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) { } else if (result == kStart) {
if (m_client->getDragFileList().size() > 0) { if (m_client->getDragFileList().size() > 0) {
std::string filename = m_client->getDragFileList().at(0).getFilename(); std::string filename = m_client->getDragFileList().at(0).getFilename();

2
src/lib/server/ClientProxy1_5.cpp
View file

@ -67,7 +67,7 @@ void ClientProxy1_5::fileChunkReceived()
int result = FileChunk::assemble(getStream(), server->getReceivedFileData(), server->getExpectedFileSize()); int result = FileChunk::assemble(getStream(), server->getReceivedFileData(), server->getExpectedFileSize());
if (result == kFinish) { 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) { } else if (result == kStart) {
if (server->getFakeDragFileList().size() > 0) { if (server->getFakeDragFileList().size() > 0) {
std::string filename = server->getFakeDragFileList().at(0).getFilename(); std::string filename = server->getFakeDragFileList().at(0).getFilename();

10
src/lib/server/Server.cpp
View file

@ -173,8 +173,8 @@ Server::Server(
new TMethodEventJob<Server>(this, &Server::handleFileChunkSendingEvent) new TMethodEventJob<Server>(this, &Server::handleFileChunkSendingEvent)
); );
m_events->adoptHandler( m_events->adoptHandler(
m_events->forFile().fileRecieveCompleted(), this, m_events->forFile().fileReceiveCompleted(), this,
new TMethodEventJob<Server>(this, &Server::handleFileRecieveCompletedEvent) new TMethodEventJob<Server>(this, &Server::handleFileReceiveCompletedEvent)
); );
} }
@ -1453,9 +1453,9 @@ void Server::handleFileChunkSendingEvent(const Event &event, void *)
onFileChunkSending(event.getDataObject()); 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) 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); m_active->fileChunkSending(chunk->m_chunk[0], &chunk->m_chunk[1], chunk->m_dataSize);
} }
void Server::onFileRecieveCompleted() void Server::onFileReceiveCompleted()
{ {
if (isReceivedFileSizeValid()) { if (isReceivedFileSizeValid()) {
auto method = new TMethodJob<Server>(this, &Server::writeToDropDirThread); auto method = new TMethodJob<Server>(this, &Server::writeToDropDirThread);

6
src/lib/server/Server.h
View file

@ -200,7 +200,7 @@ public:
*/ */
void getClients(std::vector<std::string> &list) const; void getClients(std::vector<std::string> &list) const;
//! Return true if recieved file size is valid //! Return true if received file size is valid
bool isReceivedFileSizeValid(); bool isReceivedFileSizeValid();
//! Return expected file data size //! Return expected file data size
@ -351,7 +351,7 @@ private:
void handleFakeInputBeginEvent(const Event &, void *); void handleFakeInputBeginEvent(const Event &, void *);
void handleFakeInputEndEvent(const Event &, void *); void handleFakeInputEndEvent(const Event &, void *);
void handleFileChunkSendingEvent(const Event &, void *); void handleFileChunkSendingEvent(const Event &, void *);
void handleFileRecieveCompletedEvent(const Event &, void *); void handleFileReceiveCompletedEvent(const Event &, void *);
// event processing // event processing
void onClipboardChanged(BaseClientProxy *sender, ClipboardID id, uint32_t seqNum); void onClipboardChanged(BaseClientProxy *sender, ClipboardID id, uint32_t seqNum);
@ -365,7 +365,7 @@ private:
void onMouseMoveSecondary(int32_t dx, int32_t dy); void onMouseMoveSecondary(int32_t dx, int32_t dy);
void onMouseWheel(int32_t xDelta, int32_t yDelta); void onMouseWheel(int32_t xDelta, int32_t yDelta);
void onFileChunkSending(const void *data); void onFileChunkSending(const void *data);
void onFileRecieveCompleted(); void onFileReceiveCompleted();
// add client to list and attach event handlers for client // add client to list and attach event handlers for client
bool addClient(BaseClientProxy *); bool addClient(BaseClientProxy *);

40
src/test/integtests/net/NetworkTests.cpp
View file

@ -70,19 +70,19 @@ public:
void void
sendToClient_mockData_handleClientConnected(const Event &, void *vlistener); sendToClient_mockData_handleClientConnected(const Event &, void *vlistener);
void sendToClient_mockData_fileRecieveCompleted(const Event &, void *); void sendToClient_mockData_fileReceiveCompleted(const Event &, void *);
void void
sendToClient_mockFile_handleClientConnected(const Event &, void *vlistener); sendToClient_mockFile_handleClientConnected(const Event &, void *vlistener);
void sendToClient_mockFile_fileRecieveCompleted(const Event &event, void *); void sendToClient_mockFile_fileReceiveCompleted(const Event &event, void *);
void void
sendToServer_mockData_handleClientConnected(const Event &, void *vlistener); sendToServer_mockData_handleClientConnected(const Event &, void *vlistener);
void sendToServer_mockData_fileRecieveCompleted(const Event &event, void *); void sendToServer_mockData_fileReceiveCompleted(const Event &event, void *);
void void
sendToServer_mockFile_handleClientConnected(const Event &, void *vlistener); sendToServer_mockFile_handleClientConnected(const Event &, void *vlistener);
void sendToServer_mockFile_fileRecieveCompleted(const Event &event, void *); void sendToServer_mockFile_fileReceiveCompleted(const Event &event, void *);
public: public:
TestEventQueue m_events; TestEventQueue m_events;
@ -143,16 +143,16 @@ TEST_F(NetworkTests, sendToClient_mockData) {
clientArgs); clientArgs);
m_events.adoptHandler( m_events.adoptHandler(
m_events.forFile().fileRecieveCompleted(), &client, m_events.forFile().fileReceiveCompleted(), &client,
new TMethodEventJob<NetworkTests>( new TMethodEventJob<NetworkTests>(
this, &NetworkTests::sendToClient_mockData_fileRecieveCompleted)); this, &NetworkTests::sendToClient_mockData_fileReceiveCompleted));
client.connect(); client.connect();
m_events.initQuitTimeout(10); m_events.initQuitTimeout(10);
m_events.loop(); m_events.loop();
m_events.removeHandler(m_events.forClientListener().connected(), &listener); 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(); m_events.cleanupQuitTimeout();
} }
@ -207,16 +207,16 @@ TEST_F(NetworkTests, sendToClient_mockFile) {
clientArgs); clientArgs);
m_events.adoptHandler( m_events.adoptHandler(
m_events.forFile().fileRecieveCompleted(), &client, m_events.forFile().fileReceiveCompleted(), &client,
new TMethodEventJob<NetworkTests>( new TMethodEventJob<NetworkTests>(
this, &NetworkTests::sendToClient_mockFile_fileRecieveCompleted)); this, &NetworkTests::sendToClient_mockFile_fileReceiveCompleted));
client.connect(); client.connect();
m_events.initQuitTimeout(10); m_events.initQuitTimeout(10);
m_events.loop(); m_events.loop();
m_events.removeHandler(m_events.forClientListener().connected(), &listener); 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(); m_events.cleanupQuitTimeout();
} }
@ -270,16 +270,16 @@ TEST_F(NetworkTests, sendToServer_mockData) {
&client)); &client));
m_events.adoptHandler( m_events.adoptHandler(
m_events.forFile().fileRecieveCompleted(), &server, m_events.forFile().fileReceiveCompleted(), &server,
new TMethodEventJob<NetworkTests>( new TMethodEventJob<NetworkTests>(
this, &NetworkTests::sendToServer_mockData_fileRecieveCompleted)); this, &NetworkTests::sendToServer_mockData_fileReceiveCompleted));
client.connect(); client.connect();
m_events.initQuitTimeout(10); m_events.initQuitTimeout(10);
m_events.loop(); m_events.loop();
m_events.removeHandler(m_events.forClientListener().connected(), &listener); 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(); m_events.cleanupQuitTimeout();
} }
@ -334,16 +334,16 @@ TEST_F(NetworkTests, sendToServer_mockFile) {
&client)); &client));
m_events.adoptHandler( m_events.adoptHandler(
m_events.forFile().fileRecieveCompleted(), &server, m_events.forFile().fileReceiveCompleted(), &server,
new TMethodEventJob<NetworkTests>( new TMethodEventJob<NetworkTests>(
this, &NetworkTests::sendToServer_mockFile_fileRecieveCompleted)); this, &NetworkTests::sendToServer_mockFile_fileReceiveCompleted));
client.connect(); client.connect();
m_events.initQuitTimeout(10); m_events.initQuitTimeout(10);
m_events.loop(); m_events.loop();
m_events.removeHandler(m_events.forClientListener().connected(), &listener); 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(); m_events.cleanupQuitTimeout();
} }
@ -364,7 +364,7 @@ void NetworkTests::sendToClient_mockData_handleClientConnected(
sendMockData(server); sendMockData(server);
} }
void NetworkTests::sendToClient_mockData_fileRecieveCompleted( void NetworkTests::sendToClient_mockData_fileReceiveCompleted(
const Event &event, void *) { const Event &event, void *) {
Client *client = static_cast<Client *>(event.getTarget()); Client *client = static_cast<Client *>(event.getTarget());
EXPECT_TRUE(client->isReceivedFileSizeValid()); EXPECT_TRUE(client->isReceivedFileSizeValid());
@ -389,7 +389,7 @@ void NetworkTests::sendToClient_mockFile_handleClientConnected(
server->sendFileToClient(kMockFilename); server->sendFileToClient(kMockFilename);
} }
void NetworkTests::sendToClient_mockFile_fileRecieveCompleted( void NetworkTests::sendToClient_mockFile_fileReceiveCompleted(
const Event &event, void *) { const Event &event, void *) {
Client *client = static_cast<Client *>(event.getTarget()); Client *client = static_cast<Client *>(event.getTarget());
EXPECT_TRUE(client->isReceivedFileSizeValid()); EXPECT_TRUE(client->isReceivedFileSizeValid());
@ -403,7 +403,7 @@ void NetworkTests::sendToServer_mockData_handleClientConnected(
sendMockData(client); sendMockData(client);
} }
void NetworkTests::sendToServer_mockData_fileRecieveCompleted( void NetworkTests::sendToServer_mockData_fileReceiveCompleted(
const Event &event, void *) { const Event &event, void *) {
Server *server = static_cast<Server *>(event.getTarget()); Server *server = static_cast<Server *>(event.getTarget());
EXPECT_TRUE(server->isReceivedFileSizeValid()); EXPECT_TRUE(server->isReceivedFileSizeValid());
@ -417,7 +417,7 @@ void NetworkTests::sendToServer_mockFile_handleClientConnected(
client->sendFileToServer(kMockFilename); client->sendFileToServer(kMockFilename);
} }
void NetworkTests::sendToServer_mockFile_fileRecieveCompleted( void NetworkTests::sendToServer_mockFile_fileReceiveCompleted(
const Event &event, void *) { const Event &event, void *) {
Server *server = static_cast<Server *>(event.getTarget()); Server *server = static_cast<Server *>(event.getTarget());
EXPECT_TRUE(server->isReceivedFileSizeValid()); EXPECT_TRUE(server->isReceivedFileSizeValid());