From 789aa2edb6337739caccbf0a5769d2419ffd4bb9 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 24 Jul 2019 17:13:02 +0300
Subject: code cleaning

---
 include/delphi/m_hotkeys.inc |  2 +-
 include/m_clistint.h         |  2 +-
 include/m_hotkeys.h          |  2 +-
 include/m_netlib.h           |  4 ++--
 include/m_popup.h            | 11 +++--------
 include/m_protosvc.h         |  2 +-
 6 files changed, 9 insertions(+), 14 deletions(-)

(limited to 'include')

diff --git a/include/delphi/m_hotkeys.inc b/include/delphi/m_hotkeys.inc
index 4fb0cfc659..e19a2585f3 100644
--- a/include/delphi/m_hotkeys.inc
+++ b/include/delphi/m_hotkeys.inc
@@ -35,8 +35,8 @@ type
     pszSection    :TChar;      // section name used to group sounds (NULL is acceptable)
     pszService    :PAnsiChar;  // Service to call when HotKey Pressed
     DefHotKey     :word;       // default hot key for action
-    lParam        :LPARAM;     // lParam to pass to service
     dwFlags       :dword;      // Miranda ver >=9.0
+    lParam        :LPARAM;     // lParam to pass to service
   end;
 
 
diff --git a/include/m_clistint.h b/include/m_clistint.h
index 91be4838a6..00e60f1568 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -297,9 +297,9 @@ EXTERN_C MIR_APP_DLL(int) Clist_GetAccountIndex(int iPos);
 struct ClcCacheEntryBase
 {
 	MCONTACT hContact;
+	int      bIsHidden;
 	wchar_t* tszName;
 	wchar_t* tszGroup;
-	int      bIsHidden;
 	char*    szProto;
 };
 
diff --git a/include/m_hotkeys.h b/include/m_hotkeys.h
index 7135cb35a1..b081256a6d 100644
--- a/include/m_hotkeys.h
+++ b/include/m_hotkeys.h
@@ -39,8 +39,8 @@ struct HOTKEYDESC
 	MAllStrings szSection;        // section name used to group sounds (NULL is acceptable)
 	const char *pszService;       // Service to call when HotKey Pressed
 	WORD DefHotKey;               // default hot key for action
+	DWORD dwFlags;                // one of HKD_* constants
 	LPARAM lParam;                // lParam to pass to service
-	DWORD dwFlags;
 };
 
 /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/include/m_netlib.h b/include/m_netlib.h
index 75191e5731..046f502706 100644
--- a/include/m_netlib.h
+++ b/include/m_netlib.h
@@ -343,10 +343,10 @@ EXTERN_C MIR_APP_DLL(HNETLIBCONN) Netlib_OpenConnection(HNETLIBUSER nlu, const N
 struct NETLIBHTTPPROXYINFO
 {
 	DWORD flags;
-	char *szHttpPostUrl;
-	char *szHttpGetUrl;
 	int firstGetSequence, firstPostSequence;
 	int combinePackets;
+	char *szHttpPostUrl;
+	char *szHttpGetUrl;
 };
 
 EXTERN_C MIR_APP_DLL(int) Netlib_SetHttpProxyInfo(HNETLIBCONN hConnection, const NETLIBHTTPPROXYINFO *nlhpi);
diff --git a/include/m_popup.h b/include/m_popup.h
index c8f77d27b5..6a0bf86fa3 100644
--- a/include/m_popup.h
+++ b/include/m_popup.h
@@ -399,17 +399,12 @@ struct POPUPCLASS
 {
 	int cbSize;
 	int flags;      // PCF_* constants
+	int iSeconds;
+	COLORREF colorBack, colorText;
 	char *pszName;
 	MAllStrings pszDescription;
-
 	HICON hIcon;
-
-	COLORREF colorBack;
-	COLORREF colorText;
-
 	WNDPROC PluginWindowProc;
-
-	int iSeconds;
 	LPARAM lParam; //APF_RETURN_HWND, APF_CUSTOM_POPUP  ... as above
 };
 
@@ -422,11 +417,11 @@ EXTERN_C MIR_APP_DLL(void) Popup_UnregisterClass(HANDLE ppc);
 struct POPUPDATACLASS 
 {
 	int cbSize;
+	MCONTACT hContact;
 	const char *pszClassName;
 	MAllCStrings szTitle;
 	MAllCStrings szText;
 	void *PluginData;
-	MCONTACT hContact;
 };
 
 EXTERN_C MIR_APP_DLL(HWND) Popup_AddClass(POPUPDATACLASS*);
diff --git a/include/m_protosvc.h b/include/m_protosvc.h
index f137982ebd..81da5718c3 100644
--- a/include/m_protosvc.h
+++ b/include/m_protosvc.h
@@ -325,12 +325,12 @@ static __inline unsigned long Proto_Status2Flag(int status)
 struct PROTOSEARCHRESULT
 {
 	int cbSize;
+	int flags;
 	MAllStrings nick;
 	MAllStrings firstName;
 	MAllStrings lastName;
 	MAllStrings email;
 	MAllStrings id;
-	int flags;
 };
 
 #define PS_BASICSEARCH  "/BasicSearch"
-- 
cgit v1.2.3