code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@4205 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 127 insertions, 124 deletions

diff --git a/plugins/TabSRMM/src/globals.h b/plugins/TabSRMM/src/globals.h
index 10a22aed0e..4e13942b16 100644
--- a/plugins/TabSRMM/src/globals.h
+++ b/plugins/TabSRMM/src/globals.h
@@ -96,135 +96,138 @@ public:
 			c = cTemp;

 		}

 	}

-	void		reloadAdv();

-	void		reloadSystemStartup();

-	void		reloadSystemModulesChanged();

-	void		reloadSettings(bool fReloadSkins = true);

-

-	void		hookSystemEvents();

-	bool		haveAutoSwitch();

-

-	const HMENU getMenuBar();

-

-	HWND        g_hwndHotkeyHandler;

-	HICON       g_iconIn, g_iconOut, g_iconErr, g_iconContainer, g_iconStatus;

-	HICON       g_iconOverlayDisabled, g_iconOverlayEnabled, g_iconClock;

-	HCURSOR     hCurSplitNS, hCurSplitWE, hCurHyperlinkHand;

-	HBITMAP     g_hbmUnknown;

-	int         g_MetaContactsAvail, g_SmileyAddAvail, g_WantIEView, g_PopupAvail, g_WantHPP;

-	int         g_FlashAvatarAvail;

-	HIMAGELIST  g_hImageList;

-	HICON       g_IconMsgEvent, g_IconTypingEvent, g_IconFileEvent, g_IconSend;

-	HICON       g_IconMsgEventBig, g_IconTypingEventBig;

-	HICON       g_IconFolder, g_IconChecked, g_IconUnchecked;

-	HMENU       g_hMenuContext, g_hMenuContainer, g_hMenuEncoding, g_hMenuTrayUnread;

-	HMENU       g_hMenuFavorites, g_hMenuRecent, g_hMenuTrayContext;

-	HICON       g_buttonBarIcons[NR_BUTTONBARICONS];

-	HICON       g_sideBarIcons[NR_SIDEBARICONS];

-	HANDLE      g_buttonBarIconHandles[23];

+	void        reloadAdv();

+   void        reloadSystemStartup();

+   void        reloadSystemModulesChanged();

+   void        reloadSettings(bool fReloadSkins = true);

+

+   void        hookSystemEvents();

+   bool        haveAutoSwitch();

+

+   const HMENU getMenuBar();

+

+   HWND        g_hwndHotkeyHandler;

+   HICON       g_iconIn, g_iconOut, g_iconErr, g_iconContainer, g_iconStatus;

+   HICON       g_iconOverlayDisabled, g_iconOverlayEnabled, g_iconClock;

+   HCURSOR     hCurSplitNS, hCurSplitWE, hCurHyperlinkHand;

+   HBITMAP     g_hbmUnknown;

+   int         g_MetaContactsAvail, g_SmileyAddAvail, g_WantIEView, g_PopupAvail, g_WantHPP;

+   int         g_FlashAvatarAvail;

+   HIMAGELIST  g_hImageList;

+   HICON       g_IconMsgEvent, g_IconTypingEvent, g_IconFileEvent, g_IconSend;

+   HICON       g_IconMsgEventBig, g_IconTypingEventBig;

+   HICON       g_IconFolder, g_IconChecked, g_IconUnchecked;

+   HMENU       g_hMenuContext, g_hMenuContainer, g_hMenuEncoding, g_hMenuTrayUnread;

+   HMENU       g_hMenuFavorites, g_hMenuRecent, g_hMenuTrayContext;

+   HICON       g_buttonBarIcons[NR_BUTTONBARICONS];

+   HICON       g_sideBarIcons[NR_SIDEBARICONS];

+   HANDLE      g_buttonBarIconHandles[23];

+   

 	// dynamic options, need reload when options change

-	int         m_SendOnShiftEnter;

-	int         m_SendOnEnter;

-	int         m_SendOnDblEnter;

-	int         m_AutoLocaleSupport;

-	int         m_AutoSwitchTabs;

-	int         m_CutContactNameOnTabs;

-	int         m_CutContactNameTo;

-	int         m_StatusOnTabs;

-	int         m_LogStatusChanges;

-	int         m_UseDividers;

-	int         m_DividersUsePopupConfig;

-	int         m_MsgTimeout;

-	int         m_EscapeCloses;

-	int         m_FlashOnClist;

-	int         m_AlwaysFullToolbarWidth;

-	int         m_LimitStaticAvatarHeight;

-	int         m_SendFormat;

-	int         m_FormatWholeWordsOnly;

-	int         m_RTLDefault;

-	int         m_MathModAvail;

-	TCHAR       m_MathModStartDelimiter[40];

-	int         m_UnreadInTray;

-	int         m_TrayFlashes;

-	int         m_TrayFlashState;

-	BOOL        m_SuperQuiet;

-	HANDLE      m_UserMenuItem;

-	double		g_DPIscaleX;

-	double		g_DPIscaleY;

-	BOOL		m_HideOnClose;

-	BOOL		g_bSoundOnTyping;

-	BOOL		m_AllowTab;

-	BYTE		m_AllowOfflineMultisend;

-	BOOL		g_bDisableAniAvatars;

-	HBITMAP     m_hbmMsgArea;

-	BYTE		g_iButtonsBarGap;

-	BYTE        m_WinVerMajor;

-	BYTE        m_WinVerMinor;

-	bool		m_bIsXP, m_bIsVista, m_bIsWin7;

-	HWND        m_hwndClist;

-	int         m_TabAppearance;

-	struct      myTabCtrl tabConfig;

-	int         m_panelHeight, m_MUCpanelHeight;

-	WINDOWPLACEMENT m_GlobalContainerWpos;

-	int         m_IdleDetect;

-	int         m_smcxicon, m_smcyicon;

-	int         m_PasteAndSend;

-	TCHAR       *m_szNoStatus;

-	COLORREF    crIncoming, crOutgoing, crOldIncoming, crOldOutgoing, crStatus;

-	BOOL        bUnicodeBuild;

-	HFONT       hFontCaption;

-	DWORD       m_LangPackCP;

-	BYTE        m_SmileyButtonOverride;

-	NONCLIENTMETRICS m_ncm;

-	HICON       m_AnimTrayIcons[4];

-	BOOL        m_visualMessageSizeIndicator;

-	BOOL        m_autoSplit;

-	BOOL		m_FlashOnMTN;

-	DWORD       dwThreadID;

-	char        szMetaName[256];

-	BYTE		bMetaEnabled;

-	HANDLE 		m_hMessageWindowList, hUserPrefsWindowList;

-	bool		m_chat_enabled;

-	HMENU		m_MenuBar;

-	COLORREF	m_ipBackgroundGradient;

-	COLORREF	m_ipBackgroundGradientHigh;

-	COLORREF	m_tbBackgroundHigh, m_tbBackgroundLow, m_fillColor, m_cRichBorders, m_genericTxtColor;

-	BYTE		g_bClientInStatusBar;

-	BYTE		m_dontUseDefaultKbd;

-	HANDLE		hSvc[SERVICE_LAST];

-	HANDLE		m_event_MsgWin, m_event_MsgPopup;

-	HANDLE		m_hMenuItem;

-	BYTE		m_useAeroPeek;

-

-	TSplitterBroadCast 		lastSPlitterPos;

-	TContainerSettings		globalContainerSettings;

-

-	static TCHAR*					m_default_container_name;

-	static	void					cacheUpdateMetaChanged();

-	static  void 					logStatusChange(WPARAM wParam, const CContactCache *c);

-

-	static  void 			 		Ex_CopyEditToClipboard(HWND hWnd);

-	static  void 			 		Ex_Handler();

-	static 	int				 		Ex_ShowDialog(EXCEPTION_POINTERS *ep, const char *szFile, int line, wchar_t* szReason, bool fAllowContinue);

-	static  INT_PTR CALLBACK 		Ex_DlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

+   int         m_SendOnShiftEnter;

+   int         m_SendOnEnter;

+   int         m_SendOnDblEnter;

+   int         m_AutoLocaleSupport;

+   int         m_AutoSwitchTabs;

+   int         m_CutContactNameOnTabs;

+   int         m_CutContactNameTo;

+   int         m_StatusOnTabs;

+   int         m_LogStatusChanges;

+   int         m_UseDividers;

+   int         m_DividersUsePopupConfig;

+   int         m_MsgTimeout;

+   int         m_EscapeCloses;

+   int         m_FlashOnClist;

+   int         m_AlwaysFullToolbarWidth;

+   int         m_LimitStaticAvatarHeight;

+   int         m_SendFormat;

+   int         m_FormatWholeWordsOnly;

+   int         m_RTLDefault;

+   int         m_MathModAvail;

+   TCHAR       m_MathModStartDelimiter[40];

+   int         m_UnreadInTray;

+   int         m_TrayFlashes;

+   int         m_TrayFlashState;

+   BOOL        m_SuperQuiet;

+   HANDLE      m_UserMenuItem;

+   double      g_DPIscaleX;

+   double      g_DPIscaleY;

+   BOOL        m_HideOnClose;

+   BOOL        g_bSoundOnTyping;

+   BOOL        m_AllowTab;

+   BYTE        m_AllowOfflineMultisend;

+   BOOL        g_bDisableAniAvatars;

+   HBITMAP     m_hbmMsgArea;

+   BYTE        g_iButtonsBarGap;

+   BYTE        m_WinVerMajor;

+   BYTE        m_WinVerMinor;

+   bool        m_bIsXP, m_bIsVista, m_bIsWin7;

+   HWND        m_hwndClist;

+   int         m_TabAppearance;

+   myTabCtrl   tabConfig;

+   int         m_panelHeight, m_MUCpanelHeight;

+   int         m_IdleDetect;

+   int         m_smcxicon, m_smcyicon;

+   int         m_PasteAndSend;

+   TCHAR      *m_szNoStatus;

+   COLORREF    crIncoming, crOutgoing, crOldIncoming, crOldOutgoing, crStatus;

+   BOOL        bUnicodeBuild;

+   HFONT       hFontCaption;

+   DWORD       m_LangPackCP;

+   BYTE        m_SmileyButtonOverride;

+   HICON       m_AnimTrayIcons[4];

+   BOOL        m_visualMessageSizeIndicator;

+   BOOL        m_autoSplit;

+   BOOL        m_FlashOnMTN;

+   DWORD       dwThreadID;

+   char        szMetaName[256];

+   BYTE        bMetaEnabled;

+   HANDLE      m_hMessageWindowList, hUserPrefsWindowList;

+   bool        m_chat_enabled;

+   HMENU       m_MenuBar;

+   COLORREF    m_ipBackgroundGradient;

+   COLORREF    m_ipBackgroundGradientHigh;

+   COLORREF    m_tbBackgroundHigh, m_tbBackgroundLow, m_fillColor, m_cRichBorders, m_genericTxtColor;

+   BYTE        g_bClientInStatusBar;

+   BYTE        m_dontUseDefaultKbd;

+   HANDLE      hSvc[SERVICE_LAST];

+   HANDLE      m_event_MsgWin, m_event_MsgPopup;

+   HANDLE      m_hMenuItem;

+   BYTE        m_useAeroPeek;

+

+   WINDOWPLACEMENT    m_GlobalContainerWpos;

+   NONCLIENTMETRICS   m_ncm;

+

+	TSplitterBroadCast lastSPlitterPos;

+	TContainerSettings globalContainerSettings;

+

+	static TCHAR* m_default_container_name;

+	

+	static void cacheUpdateMetaChanged();

+	static void logStatusChange(WPARAM wParam, const CContactCache *c);

+

+	static void Ex_CopyEditToClipboard(HWND hWnd);

+	static void Ex_Handler();

+	static int  Ex_ShowDialog(EXCEPTION_POINTERS *ep, const char *szFile, int line, wchar_t* szReason, bool fAllowContinue);

+	static INT_PTR CALLBACK Ex_DlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

 private:

-	bool				m_TypingSoundAdded;

+	bool m_TypingSoundAdded;

 

 	static EXCEPTION_RECORD m_exRecord;

-	static CONTEXT			m_exCtx;

-	static LRESULT			m_exLastResult;

-	static char				m_exSzFile[MAX_PATH];

-	static wchar_t			m_exReason[256];

-	static int				m_exLine;

-	static bool				m_exAllowContinue;

+	static CONTEXT m_exCtx;

+	static LRESULT m_exLastResult;

+	static char    m_exSzFile[MAX_PATH];

+	static wchar_t m_exReason[256];

+	static int     m_exLine;

+	static bool    m_exAllowContinue;

 private:

-	static	int		ModulesLoaded(WPARAM wParam, LPARAM lParam);

-	static	int 	DBSettingChanged(WPARAM wParam, LPARAM lParam);

-	static  int 	DBContactDeleted(WPARAM wParam, LPARAM lParam);

-	static	int 	PreshutdownSendRecv(WPARAM wParam, LPARAM lParam);

-	static 	int		MetaContactEvent(WPARAM wParam, LPARAM lParam);

-	static	int 	OkToExit(WPARAM wParam, LPARAM lParam);

-	static  void 	RestoreUnreadMessageAlerts(void);

+	static int     ModulesLoaded(WPARAM wParam, LPARAM lParam);

+	static int     DBSettingChanged(WPARAM wParam, LPARAM lParam);

+	static int     DBContactDeleted(WPARAM wParam, LPARAM lParam);

+	static int     PreshutdownSendRecv(WPARAM wParam, LPARAM lParam);

+	static int     MetaContactEvent(WPARAM wParam, LPARAM lParam);

+	static int     OkToExit(WPARAM wParam, LPARAM lParam);

+	static void    RestoreUnreadMessageAlerts(void);

 };

 

 extern	CGlobals	PluginConfig;