From d83baeb842ea828eaee90a0cd6575872a95240e8 Mon Sep 17 00:00:00 2001
From: Alexey Kulakov <panda75@bk.ru>
Date: Sat, 8 Mar 2014 13:10:05 +0000
Subject: Pascal-style type correction Letter case correction small fixes
 Actman UA part dialog slightly changed

git-svn-id: http://svn.miranda-ng.org/main/trunk@8473 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 include/delphi/m_popup.inc | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

(limited to 'include/delphi/m_popup.inc')

diff --git a/include/delphi/m_popup.inc b/include/delphi/m_popup.inc
index 0008878eba..b73c884c1d 100644
--- a/include/delphi/m_popup.inc
+++ b/include/delphi/m_popup.inc
@@ -26,7 +26,8 @@ mi.pszPopupName = Translate("Popups");
 mi.position = 0; //You don't need it and it's better if you put it to zero.
 }
 
-const POPUP_VERSION = $02010003;
+const
+  POPUP_VERSION = $02010003;
 
 const
   MAX_CONTACTNAME = 2048;
@@ -48,7 +49,7 @@ type
     // Action title text. Please use module name as prefix
     // (e.g. "Popup Plus/Dismiss Popup") and don't translate
     lpzTitle:array [0..MAX_ACTIONTITLE-1] of AnsiChar;
-    flags   :DWORD;  // set of PAF_* flags
+    flags   :dword;  // set of PAF_* flags
     wParam  :WPARAM; // wParam for UM_POPUPACTION message
     lParam  :LPARAM; // lParam for UM_POPUPACTION message
   end;
@@ -56,49 +57,49 @@ type
 type
   PPOPUPDATA = ^TPOPUPDATA;
   TPOPUPDATA = record
-    lchContact      : MCONTACT;
+    lchContact      : TMCONTACT;
     lchIcon         : HICON;
     lpszContactName : array [0..MAX_CONTACTNAME-1] of AnsiChar;
     lpszText        : array [0..MAX_SECONDLINE -1] of AnsiChar;
     colorBack       : COLORREF;
     colorText       : COLORREF;
     PluginWindowProc: pointer;
-    PluginData      : Pointer;
-    iSeconds        : int;      // Custom delay time in seconds.
-                                // -1 means "forever", 0 means = 'default time".
+    PluginData      : pointer;
+    iSeconds        : int;          // Custom delay time in seconds.
+                                    // -1 means "forever", 0 means = 'default time".
 { Data prior $02010003 version
     lpzClass        : PAnsiChar;    // Popup class. Used with skinning. See Popup/AddClass for details
     skinBack        : COLORREF; // Background color for colorizable skins
     cZero: array [0..15-SizeOf(PAnsiChar)-SizeOf(COLORREF)] of byte;
 }
   // you *MUST* pass APT_NEWDATA flag for services to take care of this data
-    hReserved       : THANDLE;  // Reserved. Must be NULL
-    actionCount     : int;      // Amount of passed actions
+    hReserved       : THANDLE;      // Reserved. Must be NULL
+    actionCount     : int;          // Amount of passed actions
     lpActions       : PPOPUPACTION; // Popup Actions
-    icbSize         : int;      // struct size for future
+    icbSize         : int;          // struct size for future
   end;
 
 type
   PPOPUPDATAW = ^TPOPUPDATAW;
   TPOPUPDATAW = record
-    lchContact      : MCONTACT;
+    lchContact      : TMCONTACT;
     lchIcon         : HICON;
     lpwzContactName : array [0..MAX_CONTACTNAME-1] of WideChar;
     lpwzText        : array [0..MAX_SECONDLINE -1] of WideChar;
     colorBack       : COLORREF;
     colorText       : COLORREF;
-    PluginWindowProc: Pointer;  // must be a window procedure using stdcall
-    PluginData      : Pointer;
-    iSeconds        : int;      // Custom delay time in seconds.
-                                //  -1 means = 'forever", 0 means = 'default time".
+    PluginWindowProc: pointer;      // must be a window procedure using stdcall
+    PluginData      : pointer;
+    iSeconds        : int;          // Custom delay time in seconds.
+                                    //  -1 means = 'forever", 0 means = 'default time".
 { Data prior $02010003 version
     cZero: array [0..15] of AnsiChar; //16 unused bytes which may come useful in the future.
 }
   // you *MUST* pass APT_NEWDATA flag for services to take care of this data
-    hReserved       : THANDLE;  // Reserved. Must be NULL
-    actionCount     : int;      // Amount of passed actions
+    hReserved       : THANDLE;      // Reserved. Must be NULL
+    actionCount     : int;          // Amount of passed actions
     lpActions       : PPOPUPACTION; // Popup Actions
-    icbSize         : int;      // struct size for future
+    icbSize         : int;          // struct size for future
   end;
 
 {
@@ -284,7 +285,7 @@ type
   end;
 
 const
-   UM_POPUPMODIFYACTIONICON = WM_USER + $0205;
+  UM_POPUPMODIFYACTIONICON = WM_USER + $0205;
 
 const
   SM_WARNING      = $01; //Triangle icon.
@@ -329,7 +330,7 @@ type
   TPOPUPCLASS = record
     cbSize          :int;
     flags           :int;
-    pszName         :pAnsiChar;
+    pszName         :PAnsiChar;
     szDescription   :TChar;
     hIcon           :HICON;
     colorBack       :TCOLORREF;
@@ -337,7 +338,6 @@ type
     PluginWindowProc:pointer;
     iSeconds        :int;
   end;
-  POPUPCLASS = TPOPUPCLASS;
 
 const
   PCF_UNICODE = $0001;
@@ -350,13 +350,12 @@ const
 type
   TPOPUPDATACLASS = record
 	  cbSize      :int;
-  	pszClassName:pAnsiChar;
+  	pszClassName:PAnsiChar;
 		szTitle     :TChar;
 		szText      :TChar;
 	  PluginData  :pointer;
-	  hContact    :MCONTACT;
+	  hContact    :TMCONTACT;
   end;
-  POPUPDATACLASS = TPOPUPDATACLASS;
 
 const
 // wParam = 0
-- 
cgit v1.2.3