code cleaning

4 files changed, 27 insertions, 110 deletions

diff --git a/plugins/New_GPG/new_gpg.vcxproj b/plugins/New_GPG/new_gpg.vcxproj
index e920bfe3b0..db25c0d049 100644
--- a/plugins/New_GPG/new_gpg.vcxproj
+++ b/plugins/New_GPG/new_gpg.vcxproj
@@ -29,7 +29,6 @@
     <ClCompile Include="src\gpg_wrapper.cpp" />

     <ClCompile Include="src\icons.cpp" />

     <ClCompile Include="src\init.cpp" />

-    <ClCompile Include="src\jabber_account.cpp" />

     <ClCompile Include="src\log.cpp" />

     <ClCompile Include="src\main.cpp" />

     <ClCompile Include="src\messages.cpp" />

diff --git a/plugins/New_GPG/new_gpg.vcxproj.filters b/plugins/New_GPG/new_gpg.vcxproj.filters
index f0c56b7a7c..fdc162bafd 100644
--- a/plugins/New_GPG/new_gpg.vcxproj.filters
+++ b/plugins/New_GPG/new_gpg.vcxproj.filters
@@ -11,9 +11,6 @@
     <ClCompile Include="src\init.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\jabber_account.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="src\log.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

diff --git a/plugins/New_GPG/src/jabber_account.cpp b/plugins/New_GPG/src/jabber_account.cpp
deleted file mode 100644
index 493585f6a0..0000000000
--- a/plugins/New_GPG/src/jabber_account.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright © 2010-20 sss
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "stdafx.h"
-
-void JabberAccount::setAccountName(wchar_t *Name)
-{
-	AccountName = Name;
-}
-
-void JabberAccount::setAccountNumber(int Number)
-{
-	AccountNumber = Number;
-}
-
-void JabberAccount::setJabberInterface(IJabberInterface *JIf)
-{
-	JabberInterface = JIf;
-}
-
-void JabberAccount::setSendHandler(HJHANDLER hHandler)
-{
-	hSendHandler = hHandler;
-}
-
-void JabberAccount::setPresenceHandler(HJHANDLER hHandler)
-{
-	hPresenceHandler = hHandler;
-}
-
-void JabberAccount::setMessageHandler(HJHANDLER hHandler)
-{
-	hMessageHandler = hHandler;
-}
-
-wchar_t* JabberAccount::getAccountName()
-{
-	return AccountName;
-}
-
-int JabberAccount::getAccountNumber()
-{
-	return AccountNumber;
-}
-
-IJabberInterface* JabberAccount::getJabberInterface()
-{
-	return JabberInterface;
-}
-
-HJHANDLER JabberAccount::getSendHandler()
-{
-	return hSendHandler;
-}
-
-HJHANDLER JabberAccount::getPresenceHandler()
-{
-	return hPresenceHandler;
-}
-
-HJHANDLER JabberAccount::getMessageHandler()
-{
-	return hMessageHandler;
-}
-
-JabberAccount::JabberAccount()
-{
-}
-
-JabberAccount::~JabberAccount()
-{
-	mir_free(AccountName);
-}
diff --git a/plugins/New_GPG/src/jabber_account.h b/plugins/New_GPG/src/jabber_account.h
index 106de9ea6b..f80fb72102 100644
--- a/plugins/New_GPG/src/jabber_account.h
+++ b/plugins/New_GPG/src/jabber_account.h
@@ -13,33 +13,40 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef JABBER_ACCOUNT_H
 #define JABBER_ACCOUNT_H
+
 class JabberAccount 
 {
-public:
-	void setAccountName(wchar_t *Name);
-	void setAccountNumber(int Number);
-	void setJabberInterface(IJabberInterface *JIf);
-	void setSendHandler(HJHANDLER hHandler);
-	void setPresenceHandler(HJHANDLER hHandler);
-	void setMessageHandler(HJHANDLER hHandler);
-
-	wchar_t* getAccountName();
-	int getAccountNumber();
-	IJabberInterface* getJabberInterface();
-	HJHANDLER getSendHandler();
-	HJHANDLER getPresenceHandler();
-	HJHANDLER getMessageHandler();
-
-	JabberAccount();
-	~JabberAccount();
-
-private:
 	wchar_t *AccountName = nullptr;
 	int AccountNumber = -1;
 	IJabberInterface *JabberInterface = nullptr;
 	HJHANDLER hSendHandler = INVALID_HANDLE_VALUE, hPresenceHandler = INVALID_HANDLE_VALUE, hMessageHandler = INVALID_HANDLE_VALUE;
+
+public:
+	__forceinline JabberAccount()
+	{
+	}
+
+	__forceinline ~JabberAccount()
+	{
+		mir_free(AccountName);
+	}
+
+	__forceinline void setAccountName(wchar_t *Name) { AccountName = Name; }
+	__forceinline void setAccountNumber(int Number) { AccountNumber = Number; }
+	__forceinline void setJabberInterface(IJabberInterface *JIf) { JabberInterface = JIf; }
+	__forceinline void setSendHandler(HJHANDLER hHandler) { hSendHandler = hHandler; }
+	__forceinline void setPresenceHandler(HJHANDLER hHandler) { hPresenceHandler = hHandler; }
+	__forceinline void setMessageHandler(HJHANDLER hHandler) { hMessageHandler = hHandler; }
+
+	__forceinline wchar_t*          getAccountName() const {	return AccountName; }
+	__forceinline int               getAccountNumber() const {	return AccountNumber; }
+	__forceinline IJabberInterface* getJabberInterface() const { return JabberInterface; }
+	__forceinline HJHANDLER         getSendHandler() const { return hSendHandler; }
+	__forceinline HJHANDLER         getPresenceHandler() const { return hPresenceHandler; }
+	__forceinline HJHANDLER         getMessageHandler() const { return hMessageHandler; }
 };
 
-#endif
\ No newline at end of file
+#endif