Jabber: massive options code cleaning

1 files changed, 54 insertions, 57 deletions

diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h
index 5ae2686229..bb18313b0f 100755
--- a/protocols/JabberG/src/jabber_proto.h
+++ b/protocols/JabberG/src/jabber_proto.h
@@ -170,62 +170,60 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface
 

 	ThreadData* m_ThreadInfo;

 

-	CMOption<BYTE> m_bAllowVersionRequests;

-	CMOption<BYTE> m_bAcceptHttpAuth;

-	CMOption<BYTE> m_bAddRoster2Bookmarks;

-	CMOption<BYTE> m_bAutoAcceptAuthorization;

-	CMOption<BYTE> m_bAutoAcceptMUC;

-	CMOption<BYTE> m_bAutoAdd;

-	CMOption<BYTE> m_bAutoJoinBookmarks;

-	CMOption<BYTE> m_bAutoJoinConferences;

-	CMOption<BYTE> m_bAutoJoinHidden;

-	CMOption<BYTE> m_bAvatarType;

-	CMOption<BYTE> m_bBsDirect;

-	CMOption<BYTE> m_bBsDirectManual;

-	CMOption<BYTE> m_bBsOnlyIBB;

-	CMOption<BYTE> m_bBsProxyManual;

-	CMOption<BYTE> m_bDisable3920auth;

-	CMOption<BYTE> m_bDisableFrame;

-	CMOption<BYTE> m_bEnableAvatars;

-	CMOption<BYTE> m_bEnableRemoteControl;

-	CMOption<BYTE> m_bEnableUserActivity;

-	CMOption<BYTE> m_bEnableUserMood;

-	CMOption<BYTE> m_bEnableUserTune;

-	CMOption<BYTE> m_bEnableZlib;

-	CMOption<BYTE> m_bExtendedSearch;

-	CMOption<BYTE> m_bFixIncorrectTimestamps;

-	CMOption<BYTE> m_bGcLogAffiliations;

-	CMOption<BYTE> m_bGcLogBans;

-	CMOption<BYTE> m_bGcLogConfig;

-	CMOption<BYTE> m_bGcLogRoles;

-	CMOption<BYTE> m_bGcLogStatuses;

-	CMOption<BYTE> m_bGcLogChatHistory;

-	CMOption<BYTE> m_bHostNameAsResource;

-	CMOption<BYTE> m_bIgnoreMUCInvites;

-	CMOption<BYTE> m_bKeepAlive;

-	CMOption<BYTE> m_bLogChatstates;

-	CMOption<BYTE> m_bLogPresence;

-	CMOption<BYTE> m_bLogPresenceErrors;

-	CMOption<BYTE> m_bManualConnect;

-	CMOption<BYTE> m_bMsgAck;

-	CMOption<BYTE> m_bRosterSync;

-	CMOption<BYTE> m_bSavePassword;

-	CMOption<BYTE> m_bUseDomainLogin;

-	CMOption<BYTE> m_bShowForeignResourceInMirVer;

-	CMOption<BYTE> m_bShowOSVersion;

-	CMOption<BYTE> m_bShowTransport;

-	CMOption<BYTE> m_bUseSSL;

-	CMOption<BYTE> m_bUseTLS;

-	CMOption<BYTE> m_bAcceptNotes;

-	CMOption<BYTE> m_bAutosaveNotes;

-	CMOption<BYTE> m_bEnableMsgArchive;

-	CMOption<BYTE> m_bRcMarkMessagesAsRead;

-	CMOption<BYTE> m_bProcessXMPPLinks;

-	CMOption<BYTE> m_bIgnoreRosterGroups;

-	CMOption<BYTE> m_bEnableCarbons;

-	CMOption<BYTE> m_bUseHttpUpload;

-	CMOption<BYTE> m_bUseOMEMO;

-	CMOption<BYTE> m_bEnableStreamMgmt;

+	CMOption<bool> m_bAcceptHttpAuth;

+	CMOption<bool> m_bAcceptNotes;

+	CMOption<bool> m_bAllowVersionRequests;

+	CMOption<bool> m_bAutoAcceptAuthorization;

+	CMOption<bool> m_bAutoAcceptMUC;

+	CMOption<bool> m_bAutoAdd;

+	CMOption<bool> m_bAutoJoinBookmarks;

+	CMOption<bool> m_bAutoJoinConferences;

+	CMOption<bool> m_bAutoJoinHidden;

+	CMOption<bool> m_bAutosaveNotes;

+	CMOption<bool> m_bBsDirect;

+	CMOption<bool> m_bBsDirectManual;

+	CMOption<bool> m_bBsOnlyIBB;

+	CMOption<bool> m_bBsProxyManual;

+	CMOption<bool> m_bDisable3920auth;

+	CMOption<bool> m_bDisableFrame;

+	CMOption<bool> m_bEnableAvatars;

+	CMOption<bool> m_bEnableCarbons;

+	CMOption<bool> m_bEnableMsgArchive;

+	CMOption<bool> m_bEnableRemoteControl;

+	CMOption<bool> m_bEnableStreamMgmt;

+	CMOption<bool> m_bEnableUserActivity;

+	CMOption<bool> m_bEnableUserMood;

+	CMOption<bool> m_bEnableUserTune;

+	CMOption<bool> m_bEnableZlib;

+	CMOption<bool> m_bFixIncorrectTimestamps;

+	CMOption<bool> m_bGcLogAffiliations;

+	CMOption<bool> m_bGcLogBans;

+	CMOption<bool> m_bGcLogChatHistory;

+	CMOption<bool> m_bGcLogConfig;

+	CMOption<bool> m_bGcLogRoles;

+	CMOption<bool> m_bGcLogStatuses;

+	CMOption<bool> m_bHostNameAsResource;

+	CMOption<bool> m_bIgnoreMUCInvites;

+	CMOption<bool> m_bIgnoreRosterGroups;

+	CMOption<bool> m_bInlinePictures;

+	CMOption<bool> m_bKeepAlive;

+	CMOption<bool> m_bLogChatstates;

+	CMOption<bool> m_bLogPresence;

+	CMOption<bool> m_bLogPresenceErrors;

+	CMOption<bool> m_bManualConnect;

+	CMOption<bool> m_bMsgAck;

+	CMOption<bool> m_bProcessXMPPLinks;

+	CMOption<bool> m_bRcMarkMessagesAsRead;

+	CMOption<bool> m_bRosterSync;

+	CMOption<bool> m_bSavePassword;

+	CMOption<bool> m_bShowForeignResourceInMirVer;

+	CMOption<bool> m_bShowOSVersion;

+	CMOption<bool> m_bShowTransport;

+	CMOption<bool> m_bUseDomainLogin;

+	CMOption<bool> m_bUseHttpUpload;

+	CMOption<bool> m_bUseOMEMO;

+	CMOption<bool> m_bUseSSL;

+	CMOption<bool> m_bUseTLS;

 

 	CMOption<DWORD> m_iConnectionKeepAliveInterval;

 	CMOption<DWORD> m_iConnectionKeepAliveTimeout;

@@ -646,7 +644,6 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface
 

 	//---- jabber_menu.cpp ---------------------------------------------------------------

 

-	INT_PTR    __cdecl OnMenuRosterAdd(WPARAM wParam, LPARAM lParam);

 	INT_PTR    __cdecl OnMenuHandleRequestAuth(WPARAM wParam, LPARAM lParam);

 	INT_PTR    __cdecl OnMenuHandleGrantAuth(WPARAM wParam, LPARAM lParam);

 	INT_PTR    __cdecl OnMenuOptions(WPARAM wParam, LPARAM lParam);