it's senseless to declare GetName member for the descendants of PROTO

4 files changed, 0 insertions, 16 deletions

diff --git a/protocols/Discord/src/proto.cpp b/protocols/Discord/src/proto.cpp
index e124ffe57f..358f4e7bf6 100644
--- a/protocols/Discord/src/proto.cpp
+++ b/protocols/Discord/src/proto.cpp
@@ -36,7 +36,6 @@ CDiscordProto::CDiscordProto(const char *proto_name, const wchar_t *username) :
 	arUsers(50, compareUsers)
 {
 	// Services
-	CreateProtoService(PS_GETNAME, &CDiscordProto::GetName);
 	CreateProtoService(PS_GETSTATUS, &CDiscordProto::GetStatus);
 
 	// Events
@@ -94,12 +93,6 @@ DWORD_PTR CDiscordProto::GetCaps(int type, MCONTACT)
 	return 0;
 }
 
-INT_PTR CDiscordProto::GetName(WPARAM wParam, LPARAM lParam)
-{
-	mir_strncpy((char*)lParam, m_szModuleName, (int)wParam);
-	return 0;
-}
-
 INT_PTR CDiscordProto::GetStatus(WPARAM, LPARAM)
 {
 	return m_iStatus;
diff --git a/protocols/Discord/src/proto.h b/protocols/Discord/src/proto.h
index 83046a9c5c..ee9569781c 100644
--- a/protocols/Discord/src/proto.h
+++ b/protocols/Discord/src/proto.h
@@ -155,7 +155,6 @@ public:
 	virtual int __cdecl OnEvent(PROTOEVENTTYPE, WPARAM, LPARAM) override;
 
 	// Services
-	INT_PTR __cdecl GetName(WPARAM, LPARAM);
 	INT_PTR __cdecl GetStatus(WPARAM, LPARAM);
 
 	// Events
diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp
index 5f9aca161e..4d00afc349 100644
--- a/protocols/Twitter/src/proto.cpp
+++ b/protocols/Twitter/src/proto.cpp
@@ -30,7 +30,6 @@ TwitterProto::TwitterProto(const char *proto_name, const wchar_t *username) :
 	PROTO<TwitterProto>(proto_name, username)

 {

 	CreateProtoService(PS_CREATEACCMGRUI, &TwitterProto::SvcCreateAccMgrUI);

-	CreateProtoService(PS_GETNAME, &TwitterProto::GetName);

 	CreateProtoService(PS_GETSTATUS, &TwitterProto::GetStatus);

 

 	CreateProtoService(PS_JOINCHAT, &TwitterProto::OnJoinChat);

@@ -206,12 +205,6 @@ INT_PTR TwitterProto::SvcCreateAccMgrUI(WPARAM, LPARAM lParam)
 	return (INT_PTR)CreateDialogParam(g_hInstance, MAKEINTRESOURCE(IDD_TWITTERACCOUNT), (HWND)lParam, first_run_dialog, (LPARAM)this);

 }

 

-INT_PTR TwitterProto::GetName(WPARAM wParam, LPARAM lParam)

-{

-	mir_strncpy(reinterpret_cast<char*>(lParam), m_szModuleName, (int)wParam);

-	return 0;

-}

-

 INT_PTR TwitterProto::GetStatus(WPARAM, LPARAM)

 {

 	return m_iStatus;

diff --git a/protocols/Twitter/src/proto.h b/protocols/Twitter/src/proto.h
index c18ee3b6e5..a62c462045 100644
--- a/protocols/Twitter/src/proto.h
+++ b/protocols/Twitter/src/proto.h
@@ -49,7 +49,6 @@ public:
 

 	// Services

 	INT_PTR __cdecl SvcCreateAccMgrUI(WPARAM,LPARAM);

-	INT_PTR __cdecl GetName(WPARAM,LPARAM);

 	INT_PTR __cdecl GetStatus(WPARAM,LPARAM);

 	INT_PTR __cdecl ReplyToTweet(WPARAM,LPARAM);

 	INT_PTR __cdecl VisitHomepage(WPARAM,LPARAM);