diff options
| author | Goraf <22941576+Goraf@users.noreply.github.com> | 2018-02-24 21:19:31 +0100 | 
|---|---|---|
| committer | Alex <aunsane@gmail.com> | 2018-02-24 23:19:31 +0300 | 
| commit | 38d88688d8c10388139bf5a50f8dce3f9b0a9e45 (patch) | |
| tree | 7b683999482cc47cf915d399648fb50087adf5d3 /plugins | |
| parent | 26e217dad6f940e3795973fcee48e7e4e7567ee1 (diff) | |
CloudFile: small corrections  (#1168)
* CloudFile: remove double 'const'
* CloudFile: add missing 'override'
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/CloudFile/src/Services/dropbox_service.h | 12 | ||||
| -rw-r--r-- | plugins/CloudFile/src/Services/google_service.h | 12 | ||||
| -rw-r--r-- | plugins/CloudFile/src/Services/microsoft_service.h | 12 | ||||
| -rw-r--r-- | plugins/CloudFile/src/Services/yandex_service.h | 12 | ||||
| -rw-r--r-- | plugins/CloudFile/src/cloud_file.h | 6 | ||||
| -rw-r--r-- | plugins/CloudFile/src/file_transfer.h | 2 | 
6 files changed, 28 insertions, 28 deletions
| diff --git a/plugins/CloudFile/src/Services/dropbox_service.h b/plugins/CloudFile/src/Services/dropbox_service.h index d65db25034..9c7d781fcd 100644 --- a/plugins/CloudFile/src/Services/dropbox_service.h +++ b/plugins/CloudFile/src/Services/dropbox_service.h @@ -7,7 +7,7 @@ private:  	static unsigned RequestAccessTokenThread(void *owner, void *param);  	static unsigned __stdcall RevokeAccessTokenThread(void *param); -	void HandleJsonError(JSONNode &node); +	void HandleJsonError(JSONNode &node) override;  	void UploadFile(const char *data, size_t size, char *path);  	void CreateUploadSession(const char *chunk, size_t chunkSize, char *sessionId); @@ -24,13 +24,13 @@ public:  	const char* GetModuleName() const override; -	int GetIconId() const; +	int GetIconId() const override; -	bool IsLoggedIn(); -	void Login(); -	void Logout(); +	bool IsLoggedIn() override; +	void Login() override; +	void Logout() override; -	UINT Upload(FileTransferParam *ftp); +	UINT Upload(FileTransferParam *ftp) override;  	static INT_PTR UploadToDropbox(void*, WPARAM wParam, LPARAM lParam);  }; diff --git a/plugins/CloudFile/src/Services/google_service.h b/plugins/CloudFile/src/Services/google_service.h index 3fb4634c4b..cef71c8a45 100644 --- a/plugins/CloudFile/src/Services/google_service.h +++ b/plugins/CloudFile/src/Services/google_service.h @@ -7,7 +7,7 @@ private:  	static unsigned RequestAccessTokenThread(void *owner, void *param);  	static unsigned __stdcall RevokeAccessTokenThread(void *param); -	void HandleJsonError(JSONNode &node); +	void HandleJsonError(JSONNode &node) override;  	void UploadFile(const char *parentId, const char *name, const char *data, size_t size, char *fileId);  	void CreateUploadSession(const char *parentId, const char *name, char *uploadUri); @@ -23,13 +23,13 @@ public:  	const char* GetModuleName() const override; -	int GetIconId() const; +	int GetIconId() const override; -	bool IsLoggedIn(); -	void Login(); -	void Logout(); +	bool IsLoggedIn() override; +	void Login() override; +	void Logout() override; -	UINT Upload(FileTransferParam *ftp); +	UINT Upload(FileTransferParam *ftp) override;  };  #endif //_CLOUDFILE_GDRIVE_H_
\ No newline at end of file diff --git a/plugins/CloudFile/src/Services/microsoft_service.h b/plugins/CloudFile/src/Services/microsoft_service.h index c58bb4e07c..32df62c451 100644 --- a/plugins/CloudFile/src/Services/microsoft_service.h +++ b/plugins/CloudFile/src/Services/microsoft_service.h @@ -6,7 +6,7 @@ class COneDriveService : public CCloudService  private:  	static unsigned RequestAccessTokenThread(void *owner, void *param); -	void HandleJsonError(JSONNode &node); +	void HandleJsonError(JSONNode &node) override;  	void UploadFile(const char *parentId, const char *name, const char *data, size_t size, char *fileId);  	void CreateUploadSession(const char *parentId, const char *name, char *uploadUri); @@ -22,13 +22,13 @@ public:  	const char* GetModuleName() const override; -	int GetIconId() const; +	int GetIconId() const override; -	bool IsLoggedIn(); -	void Login(); -	void Logout(); +	bool IsLoggedIn() override; +	void Login() override; +	void Logout() override; -	UINT Upload(FileTransferParam *ftp); +	UINT Upload(FileTransferParam *ftp) override;  };  #endif //_CLOUDFILE_ONEDRIVE_H_
\ No newline at end of file diff --git a/plugins/CloudFile/src/Services/yandex_service.h b/plugins/CloudFile/src/Services/yandex_service.h index 09c06d9a24..9c40408d5b 100644 --- a/plugins/CloudFile/src/Services/yandex_service.h +++ b/plugins/CloudFile/src/Services/yandex_service.h @@ -7,7 +7,7 @@ private:  	static unsigned RequestAccessTokenThread(void *owner, void *param);  	static unsigned __stdcall RevokeAccessTokenThread(void *param); -	void HandleJsonError(JSONNode &node); +	void HandleJsonError(JSONNode &node) override;  	void CreateUploadSession(const char *path, char *uploadUri);  	void UploadFile(const char *uploadUri, const char *data, size_t size); @@ -23,13 +23,13 @@ public:  	const char* GetModuleName() const override; -	int GetIconId() const; +	int GetIconId() const override; -	bool IsLoggedIn(); -	void Login(); -	void Logout(); +	bool IsLoggedIn() override; +	void Login() override; +	void Logout() override; -	UINT Upload(FileTransferParam *ftp); +	UINT Upload(FileTransferParam *ftp) override;  };  #endif //_CLOUDFILE_YANDEX_H_
\ No newline at end of file diff --git a/plugins/CloudFile/src/cloud_file.h b/plugins/CloudFile/src/cloud_file.h index 0d4f3def32..678aabc86f 100644 --- a/plugins/CloudFile/src/cloud_file.h +++ b/plugins/CloudFile/src/cloud_file.h @@ -31,7 +31,7 @@ public:  	virtual ~CCloudService();  	DWORD_PTR __cdecl GetCaps(int type, MCONTACT) override; -	int __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer); +	int __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer) override;  	HANDLE __cdecl SendFile(MCONTACT hContact, const wchar_t *msg, wchar_t **ppszFiles) override;  	static INT_PTR SendFileInterceptor(WPARAM wParam, LPARAM lParam); @@ -56,7 +56,7 @@ public:  class CCloudServiceSearch : public CCloudService  {  protected: -	void HandleJsonError(JSONNode&) { } +	void HandleJsonError(JSONNode&) override { }  public:  	CCloudServiceSearch(const char *search) @@ -70,7 +70,7 @@ public:  	void Login() override { }  	void Logout() override { } -	UINT Upload(FileTransferParam*) { return 0; } +	UINT Upload(FileTransferParam*) override { return 0; }  };  #endif //_CLOUD_SERVICE_H_
\ No newline at end of file diff --git a/plugins/CloudFile/src/file_transfer.h b/plugins/CloudFile/src/file_transfer.h index ced06a2f04..601933e3dc 100644 --- a/plugins/CloudFile/src/file_transfer.h +++ b/plugins/CloudFile/src/file_transfer.h @@ -91,7 +91,7 @@ public:  		return m_description.GetString();  	} -	const const char** GetSharedLinks(size_t &count) const +	const char** GetSharedLinks(size_t &count) const  	{  		count = m_links.getCount();  		return (const char**)m_links.getArray(); | 
