From ff42afc36c36733746098f4ff3021182b408fe5f Mon Sep 17 00:00:00 2001 From: jerry Date: Thu, 1 May 2014 13:56:07 +0000 Subject: [PATCH] made drag info function name more consistent --- src/lib/client/Client.cpp | 4 ++-- src/lib/client/Client.h | 2 +- src/lib/client/ServerProxy.cpp | 2 +- src/lib/client/ServerProxy.h | 2 +- src/lib/platform/MSWindowsScreen.cpp | 2 +- src/lib/platform/OSXScreen.cpp | 2 +- src/lib/server/BaseClientProxy.h | 2 +- src/lib/server/ClientProxy.h | 2 +- src/lib/server/ClientProxy1_0.cpp | 2 +- src/lib/server/ClientProxy1_0.h | 2 +- src/lib/server/ClientProxy1_5.cpp | 2 +- src/lib/server/ClientProxy1_5.h | 2 +- src/lib/server/PrimaryClient.cpp | 2 +- src/lib/server/PrimaryClient.h | 2 +- src/lib/server/Server.cpp | 8 +------- src/lib/server/Server.h | 3 --- 16 files changed, 16 insertions(+), 25 deletions(-) diff --git a/src/lib/client/Client.cpp b/src/lib/client/Client.cpp index 141f916c..61c2d030 100644 --- a/src/lib/client/Client.cpp +++ b/src/lib/client/Client.cpp @@ -833,7 +833,7 @@ CClient::sendFileThread(void* filename) } void -CClient::draggingInfoSending(UInt32 fileCount, CString& fileList, size_t size) +CClient::sendDragInfo(UInt32 fileCount, CString& fileList, size_t size) { - m_server->draggingInfoSending(fileCount, fileList.c_str(), size); + m_server->sendDragInfo(fileCount, fileList.c_str(), size); } diff --git a/src/lib/client/Client.h b/src/lib/client/Client.h index 817387cf..1f318be8 100644 --- a/src/lib/client/Client.h +++ b/src/lib/client/Client.h @@ -114,7 +114,7 @@ public: void setFileTransferDes(CString& des) { m_fileTransferDes = des; } //! Send dragging file information back to server - void draggingInfoSending(UInt32 fileCount, CString& fileList, size_t size); + void sendDragInfo(UInt32 fileCount, CString& fileList, size_t size); //@} //! @name accessors diff --git a/src/lib/client/ServerProxy.cpp b/src/lib/client/ServerProxy.cpp index fe6c0c87..6a91b432 100644 --- a/src/lib/client/ServerProxy.cpp +++ b/src/lib/client/ServerProxy.cpp @@ -949,7 +949,7 @@ CServerProxy::fileChunkSending(UInt8 mark, char* data, size_t dataSize) } void -CServerProxy::draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize) +CServerProxy::sendDragInfo(UInt32 fileCount, const char* data, size_t dataSize) { CString info(data, dataSize); CProtocolUtil::writef(m_stream, kMsgDDragInfo, fileCount, &info); diff --git a/src/lib/client/ServerProxy.h b/src/lib/client/ServerProxy.h index d03bae73..e0c7ebd9 100644 --- a/src/lib/client/ServerProxy.h +++ b/src/lib/client/ServerProxy.h @@ -58,7 +58,7 @@ public: void fileChunkSending(UInt8 mark, char* data, size_t dataSize); // sending dragging information to server - void draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize); + void sendDragInfo(UInt32 fileCount, const char* data, size_t dataSize); #ifdef TEST_ENV void handleDataForTest() { handleData(CEvent(), NULL); } diff --git a/src/lib/platform/MSWindowsScreen.cpp b/src/lib/platform/MSWindowsScreen.cpp index 793415dc..5dda3a4e 100644 --- a/src/lib/platform/MSWindowsScreen.cpp +++ b/src/lib/platform/MSWindowsScreen.cpp @@ -378,7 +378,7 @@ CMSWindowsScreen::sendDragThread(void*) CClient* client = app.getClientPtr(); UInt32 fileCount = 1; LOG((CLOG_DEBUG "send dragging info to server: %s", draggingFilename.c_str())); - client->draggingInfoSending(fileCount, draggingFilename, size); + client->sendDragInfo(fileCount, draggingFilename, size); LOG((CLOG_DEBUG "send dragging file to server")); client->sendFileToServer(draggingFilename.c_str()); } diff --git a/src/lib/platform/OSXScreen.cpp b/src/lib/platform/OSXScreen.cpp index 677f2184..25f52f5e 100644 --- a/src/lib/platform/OSXScreen.cpp +++ b/src/lib/platform/OSXScreen.cpp @@ -922,7 +922,7 @@ COSXScreen::leave() CClientApp& app = CClientApp::instance(); CClient* client = app.getClientPtr(); UInt32 fileCount = 1; - client->draggingInfoSending(fileCount, fileList, size); + client->sendDragInfo(fileCount, fileList, size); LOG((CLOG_DEBUG "send dragging file to server")); client->sendFileToServer(fileList.c_str()); } diff --git a/src/lib/server/BaseClientProxy.h b/src/lib/server/BaseClientProxy.h index 03ed2ce3..3aad1488 100644 --- a/src/lib/server/BaseClientProxy.h +++ b/src/lib/server/BaseClientProxy.h @@ -78,7 +78,7 @@ public: virtual void screensaver(bool activate) = 0; virtual void resetOptions() = 0; virtual void setOptions(const COptionsList& options) = 0; - virtual void draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize) = 0; + virtual void sendDragInfo(UInt32 fileCount, const char* data, size_t dataSize) = 0; virtual void fileChunkSending(UInt8 mark, char* data, size_t dataSize) = 0; virtual CString getName() const; diff --git a/src/lib/server/ClientProxy.h b/src/lib/server/ClientProxy.h index 25fb540c..f88c9a5e 100644 --- a/src/lib/server/ClientProxy.h +++ b/src/lib/server/ClientProxy.h @@ -83,7 +83,7 @@ public: virtual void screensaver(bool activate) = 0; virtual void resetOptions() = 0; virtual void setOptions(const COptionsList& options) = 0; - virtual void draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize) = 0; + virtual void sendDragInfo(UInt32 fileCount, const char* data, size_t dataSize) = 0; virtual void fileChunkSending(UInt8 mark, char* data, size_t dataSize) = 0; private: diff --git a/src/lib/server/ClientProxy1_0.cpp b/src/lib/server/ClientProxy1_0.cpp index b53ceed9..d5500b83 100644 --- a/src/lib/server/ClientProxy1_0.cpp +++ b/src/lib/server/ClientProxy1_0.cpp @@ -361,7 +361,7 @@ CClientProxy1_0::mouseWheel(SInt32, SInt32 yDelta) } void -CClientProxy1_0::draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize) +CClientProxy1_0::sendDragInfo(UInt32 fileCount, const char* data, size_t dataSize) { // ignore -- not supported in protocol 1.0 LOG((CLOG_DEBUG "draggingInfoSending not supported")); diff --git a/src/lib/server/ClientProxy1_0.h b/src/lib/server/ClientProxy1_0.h index a1f8fb38..c4c0674d 100644 --- a/src/lib/server/ClientProxy1_0.h +++ b/src/lib/server/ClientProxy1_0.h @@ -58,7 +58,7 @@ public: virtual void screensaver(bool activate); virtual void resetOptions(); virtual void setOptions(const COptionsList& options); - virtual void draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize); + virtual void sendDragInfo(UInt32 fileCount, const char* data, size_t dataSize); virtual void fileChunkSending(UInt8 mark, char* data, size_t dataSize); protected: diff --git a/src/lib/server/ClientProxy1_5.cpp b/src/lib/server/ClientProxy1_5.cpp index a204a4b1..13abe0ee 100644 --- a/src/lib/server/ClientProxy1_5.cpp +++ b/src/lib/server/ClientProxy1_5.cpp @@ -42,7 +42,7 @@ CClientProxy1_5::~CClientProxy1_5() } void -CClientProxy1_5::draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize) +CClientProxy1_5::sendDragInfo(UInt32 fileCount, const char* data, size_t dataSize) { CString info(data, dataSize); diff --git a/src/lib/server/ClientProxy1_5.h b/src/lib/server/ClientProxy1_5.h index f49272c5..821b8b1a 100644 --- a/src/lib/server/ClientProxy1_5.h +++ b/src/lib/server/ClientProxy1_5.h @@ -29,7 +29,7 @@ public: CClientProxy1_5(const CString& name, synergy::IStream* adoptedStream, CServer* server, IEventQueue* events); ~CClientProxy1_5(); - virtual void draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize); + virtual void sendDragInfo(UInt32 fileCount, const char* data, size_t dataSize); virtual void fileChunkSending(UInt8 mark, char* data, size_t dataSize); virtual bool parseMessage(const UInt8* code); void fileChunkReceived(); diff --git a/src/lib/server/PrimaryClient.cpp b/src/lib/server/PrimaryClient.cpp index ecf7e61b..a811974a 100644 --- a/src/lib/server/PrimaryClient.cpp +++ b/src/lib/server/PrimaryClient.cpp @@ -250,7 +250,7 @@ CPrimaryClient::screensaver(bool) } void -CPrimaryClient::draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize) +CPrimaryClient::sendDragInfo(UInt32 fileCount, const char* data, size_t dataSize) { // ignore } diff --git a/src/lib/server/PrimaryClient.h b/src/lib/server/PrimaryClient.h index 21a893b8..256d37fb 100644 --- a/src/lib/server/PrimaryClient.h +++ b/src/lib/server/PrimaryClient.h @@ -143,7 +143,7 @@ public: virtual void screensaver(bool activate); virtual void resetOptions(); virtual void setOptions(const COptionsList& options); - virtual void draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize); + virtual void sendDragInfo(UInt32 fileCount, const char* data, size_t dataSize); virtual void fileChunkSending(UInt8 mark, char* data, size_t dataSize); private: diff --git a/src/lib/server/Server.cpp b/src/lib/server/Server.cpp index cae89975..f8550672 100644 --- a/src/lib/server/Server.cpp +++ b/src/lib/server/Server.cpp @@ -1833,7 +1833,7 @@ CServer::sendDragInfo(CBaseClientProxy* newScreen) LOG((CLOG_DEBUG2 "sending drag information to client")); LOG((CLOG_DEBUG3 "dragging file list: %s", fileList)); LOG((CLOG_DEBUG3 "dragging file list string size: %i", size)); - newScreen->draggingInfoSending(fileCount, fileList, size); + newScreen->sendDragInfo(fileCount, fileList, size); } } @@ -2396,9 +2396,3 @@ CServer::dragInfoReceived(UInt32 fileNum, CString content) m_screen->startDraggingFiles(m_dragFileList); } - -void -CServer::draggingInfoSending(UInt32 fileCount, CString& fileList, size_t size) -{ - m_active->draggingInfoSending(fileCount, fileList.c_str(), size); -} diff --git a/src/lib/server/Server.h b/src/lib/server/Server.h index 925bdce8..a3cd1d0f 100644 --- a/src/lib/server/Server.h +++ b/src/lib/server/Server.h @@ -157,9 +157,6 @@ public: //! Received dragging information from client void dragInfoReceived(UInt32 fileNum, CString content); - //! Send dragging file information to client - void draggingInfoSending(UInt32 fileCount, CString& fileList, size_t size); - //@} //! @name accessors //@{