From 55be7b2dc4f1db394efdce39b3f0aad82c646314 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 5 Jun 2022 16:18:34 +0300 Subject: code cleaning --- plugins/TabSRMM/src/contactcache.h | 10 +++++----- plugins/TabSRMM/src/globals.h | 8 ++++---- plugins/TabSRMM/src/msgs.h | 14 +++++++------- plugins/TabSRMM/src/muchighlight.h | 2 +- plugins/TabSRMM/src/sendlater.cpp | 4 ++-- plugins/TabSRMM/src/sidebar.h | 4 ++-- plugins/TabSRMM/src/stdafx.h | 8 ++++---- plugins/TabSRMM/src/themes.cpp | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) (limited to 'plugins/TabSRMM/src') diff --git a/plugins/TabSRMM/src/contactcache.h b/plugins/TabSRMM/src/contactcache.h index 6c68e31f2f..80a7ff18b2 100644 --- a/plugins/TabSRMM/src/contactcache.h +++ b/plugins/TabSRMM/src/contactcache.h @@ -59,8 +59,8 @@ class CContactCache : public MZeroedObject wchar_t *m_szAccount; wchar_t m_szNick[80], m_szUIN[80]; wchar_t *m_szStatusMsg, *m_xStatusMsg, *m_ListeningInfo; - uint8_t m_xStatus; - uint32_t m_idleTS; + uint8_t m_xStatus; + uint32_t m_idleTS; bool m_isMeta; bool m_isValid; int m_nMax; @@ -89,7 +89,7 @@ public: __forceinline LPCWSTR getNick() const { return m_szNick; } __forceinline MCONTACT getContact() const { return m_hContact; } __forceinline MCONTACT getActiveContact() const { return (m_isMeta) ? m_hSub : m_hContact; } - __forceinline uint32_t getIdleTS() const { return m_idleTS; } + __forceinline uint32_t getIdleTS() const { return m_idleTS; } __forceinline LPCSTR getProto() const { return cc->szProto; } __forceinline LPCSTR getActiveProto() const { return m_isMeta ? (m_szMetaProto ? m_szMetaProto : cc->szProto) : cc->szProto; } @@ -101,9 +101,9 @@ public: __forceinline LPCWSTR getStatusMsg() const { return m_szStatusMsg; } __forceinline LPCWSTR getXStatusMsg() const { return m_xStatusMsg; } __forceinline LPCWSTR getListeningInfo() const { return m_ListeningInfo; } - __forceinline uint8_t getXStatusId() const { return m_xStatus; } + __forceinline uint8_t getXStatusId() const { return m_xStatus; } - __forceinline uint32_t getSessionStart() const { return m_stats->started; } + __forceinline uint32_t getSessionStart() const { return m_stats->started; } __forceinline int getSessionMsgCount() const { return (int)m_stats->messageCount; } __forceinline CMsgDialog* getDat() const { return m_dat; } diff --git a/plugins/TabSRMM/src/globals.h b/plugins/TabSRMM/src/globals.h index 1b68521a53..e9c91009e7 100644 --- a/plugins/TabSRMM/src/globals.h +++ b/plugins/TabSRMM/src/globals.h @@ -111,20 +111,20 @@ public: COLORREF crIncoming, crOutgoing, crOldIncoming, crOldOutgoing, crStatus; BOOL bUnicodeBuild; HFONT hFontCaption; - uint32_t m_LangPackCP; - uint8_t m_SmileyButtonOverride; + uint32_t m_LangPackCP; + uint8_t m_SmileyButtonOverride; HICON m_AnimTrayIcons[4]; BOOL m_visualMessageSizeIndicator; BOOL m_autoSplit; BOOL m_FlashOnMTN; - uint32_t dwThreadID; + uint32_t dwThreadID; MWindowList m_hMessageWindowList, hUserPrefsWindowList; HMENU m_MenuBar; COLORREF m_ipBackgroundGradient; COLORREF m_ipBackgroundGradientHigh; COLORREF m_tbBackgroundHigh, m_tbBackgroundLow, m_fillColor, m_cRichBorders, m_genericTxtColor; HGENMENU m_hMenuItem; - uint8_t m_useAeroPeek; + uint8_t m_useAeroPeek; WINDOWPLACEMENT m_GlobalContainerWpos; NONCLIENTMETRICS m_ncm; diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h index 7eb3272da4..7c18a6a61b 100644 --- a/plugins/TabSRMM/src/msgs.h +++ b/plugins/TabSRMM/src/msgs.h @@ -189,8 +189,8 @@ struct TLogTheme COLORREF inbg, outbg, bg, oldinbg, oldoutbg, statbg, inputbg; COLORREF hgrid; COLORREF custom_colors[5]; - uint32_t dwFlags; - uint32_t left_indent, right_indent; + uint32_t dwFlags; + uint32_t left_indent, right_indent; LOGFONTW *logFonts; COLORREF *fontColors; char *rtfFonts; @@ -301,10 +301,10 @@ struct TContainerData : public MZeroedObject BOOL m_isCloned; HWND m_hwndStatus; int m_statusBarHeight; - uint32_t m_dwLastActivity; + uint32_t m_dwLastActivity; int m_hIcon; // current window icon stick indicator HICON m_hIconTaskbarOverlay; // contains a "sticky" taskbar overlay (e.g. new message icon) - uint32_t m_dwFlashingStarted; + uint32_t m_dwFlashingStarted; HWND m_hWndOptions; BOOL m_bSizingLoop; HDC m_cachedDC; @@ -317,15 +317,15 @@ struct TContainerData : public MZeroedObject HWND m_hwndSaved; RECT m_rcSaved, m_rcLogSaved; POINT m_ptLogSaved; - uint32_t m_exFlags; + uint32_t m_exFlags; BOOL m_fPrivateThemeChanged; MARGINS m_mOld; HDC m_cachedToolbarDC; HBITMAP m_hbmToolbarBG, m_oldhbmToolbarBG; SIZE m_szOldToolbarSize; SIZE m_oldSize, m_preSIZE; - uint16_t m_avatarMode, m_ownAvatarMode; - uint8_t m_bTBRenderingMode; + uint16_t m_avatarMode, m_ownAvatarMode; + uint8_t m_bTBRenderingMode; TLogTheme m_theme; CMenuBar *m_pMenuBar; CSideBar *m_pSideBar; diff --git a/plugins/TabSRMM/src/muchighlight.h b/plugins/TabSRMM/src/muchighlight.h index 42164a4998..197e130859 100644 --- a/plugins/TabSRMM/src/muchighlight.h +++ b/plugins/TabSRMM/src/muchighlight.h @@ -55,7 +55,7 @@ public: private: void tokenize(wchar_t *tszString, wchar_t** &patterns, UINT &nr); - uint32_t m_iMode = 0; // combination of MATCH_* masks + uint32_t m_iMode = 0; // combination of MATCH_* masks UINT m_iNickPatterns = 0; UINT m_iTextPatterns = 0; bool m_fInitialized = false; diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp index fd5a80d6cc..15a4d3e4b9 100644 --- a/plugins/TabSRMM/src/sendlater.cpp +++ b/plugins/TabSRMM/src/sendlater.cpp @@ -59,10 +59,10 @@ struct CSendLaterJob : public MZeroedObject time_t lastSent; // time at which the delivery was initiated. used to handle timeouts char *sendBuffer; // utf-8 send buffer uint8_t *pBuf; // conventional send buffer (for non-utf8 protocols) - uint32_t dwFlags; + uint32_t dwFlags; int iSendCount; // # of times we tried to send it... bool fSuccess, fFailed; - uint8_t bCode; // error/progress code (for the UI) + uint8_t bCode; // error/progress code (for the UI) // returns true if this job is persistent (saved to the database). // such a job will survive a restart of Miranda diff --git a/plugins/TabSRMM/src/sidebar.h b/plugins/TabSRMM/src/sidebar.h index 82920cc253..b02e742d37 100644 --- a/plugins/TabSRMM/src/sidebar.h +++ b/plugins/TabSRMM/src/sidebar.h @@ -144,7 +144,7 @@ public: void showAll(int showCmd); const LONG getWidth() const { return(m_isVisible ? m_width + SIDEBAR_GAP : 0); } - const uint32_t getFlags() const { return(m_dwFlags); } + const uint32_t getFlags() const { return(m_dwFlags); } const TContainerData* getContainer() const { return(m_pContainer); } const UINT getLayoutId() const { return(m_uLayout); } const bool isVisible() const { return(m_isVisible); } @@ -191,7 +191,7 @@ private: OBJLIST m_buttonlist; // our list of buttons TContainerData* m_pContainer; // our master and commander... LONG m_width; // required width of the bar (m_elementWidth + padding) - uint32_t m_dwFlags; + uint32_t m_dwFlags; CSideBarButton* m_up, *m_down; // the scroller buttons (up down) CSideBarButton* m_activeItem; // active button item (for highlighting) const CSideBarButton* m_hoveredClose; // item which must display an active close button diff --git a/plugins/TabSRMM/src/stdafx.h b/plugins/TabSRMM/src/stdafx.h index db3fac0491..41f5fede3a 100644 --- a/plugins/TabSRMM/src/stdafx.h +++ b/plugins/TabSRMM/src/stdafx.h @@ -179,10 +179,10 @@ typedef enum _BP_BUFFERFORMAT typedef struct _BP_PAINTPARAMS { - uint32_t cbSize; - uint32_t dwFlags; // BPPF_ flags - const RECT * prcExclude; - const BLENDFUNCTION * pBlendFunction; + uint32_t cbSize; + uint32_t dwFlags; // BPPF_ flags + const RECT *prcExclude; + const BLENDFUNCTION *pBlendFunction; } BP_PAINTPARAMS, *PBP_PAINTPARAMS; #define BPPF_ERASE 1 diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp index d347604e4e..7e6eaba5eb 100644 --- a/plugins/TabSRMM/src/themes.cpp +++ b/plugins/TabSRMM/src/themes.cpp @@ -95,7 +95,7 @@ HPEN CSkin::m_SkinLightShadowPen = nullptr, CSkin::m_SkinDarkShadowPen = nul HICON CSkin::m_closeIcon = nullptr, CSkin::m_maxIcon = nullptr, CSkin::m_minIcon = nullptr; UINT CSkin::m_aeroEffect = 0; -uint32_t CSkin::m_glowSize = 0; +uint32_t CSkin::m_glowSize = 0; HBRUSH CSkin::m_BrushBack = nullptr, CSkin::m_BrushFill = nullptr; HBITMAP CSkin::m_tabCloseBitmap = nullptr, CSkin::m_tabCloseOldBitmap = nullptr; -- cgit v1.2.3