From d83baeb842ea828eaee90a0cd6575872a95240e8 Mon Sep 17 00:00:00 2001 From: Alexey Kulakov 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 --- plugins/QuickSearch/i_ok.inc | 6 +++--- plugins/QuickSearch/quicksearch.dpr | 6 +++--- plugins/QuickSearch/sr_global.pas | 2 +- plugins/QuickSearch/sr_optdialog.pas | 36 +++++++++++++++++----------------- plugins/QuickSearch/sr_window.pas | 38 ++++++++++++++++++------------------ 5 files changed, 44 insertions(+), 44 deletions(-) (limited to 'plugins/QuickSearch') diff --git a/plugins/QuickSearch/i_ok.inc b/plugins/QuickSearch/i_ok.inc index da9f138b81..be7f046233 100644 --- a/plugins/QuickSearch/i_ok.inc +++ b/plugins/QuickSearch/i_ok.inc @@ -209,7 +209,7 @@ begin end; -function DoMeta(hContact:MCONTACT):pointer; +function DoMeta(hContact:TMCONTACT):pointer; var pw:pWideChar; i:integer; @@ -433,7 +433,7 @@ end; //----- Initial table filling ----- -procedure AddContact(num:integer;hContact:MCONTACT); +procedure AddContact(num:integer;hContact:TMCONTACT); var col:pcolumnitem; tmpstr:array [0..63] of AnsiChar; @@ -476,7 +476,7 @@ end; function PrepareToFill:boolean; var cnt,cnt1:integer; - hContact:MCONTACT; + hContact:TMCONTACT; i:integer; begin result:=false; diff --git a/plugins/QuickSearch/quicksearch.dpr b/plugins/QuickSearch/quicksearch.dpr index 4629676407..9494665bc2 100644 --- a/plugins/QuickSearch/quicksearch.dpr +++ b/plugins/QuickSearch/quicksearch.dpr @@ -19,7 +19,7 @@ uses mirutils, common; -function MirandaPluginInfoEx(mirandaVersion:DWORD):PPLUGININFOEX; cdecl; +function MirandaPluginInfoEx(mirandaVersion:dword):PPLUGININFOEX; cdecl; begin result:=@PluginInfo; PluginInfo.cbSize :=SizeOf(TPLUGININFOEX); @@ -174,7 +174,7 @@ begin Result:=0; end; -function Load():Integer;cdecl; +function Load():integer;cdecl; begin Result:=0; Langpack_register; @@ -183,7 +183,7 @@ begin qsopt.numcolumns:=loadopt_db(qsopt.columns); end; -function Unload:Integer;cdecl; +function Unload:integer;cdecl; begin result:=0; removetoolbar; //?? diff --git a/plugins/QuickSearch/sr_global.pas b/plugins/QuickSearch/sr_global.pas index 050fa3a3ee..41d8eaa368 100644 --- a/plugins/QuickSearch/sr_global.pas +++ b/plugins/QuickSearch/sr_global.pas @@ -193,7 +193,7 @@ const procedure reghotkeys; var - hkrec:HOTKEYDESC; + hkrec:THOTKEYDESC; begin FillChar(hkrec,SizeOf(hkrec),0); with hkrec do diff --git a/plugins/QuickSearch/sr_optdialog.pas b/plugins/QuickSearch/sr_optdialog.pas index 68ad05a322..ce85d12cfc 100644 --- a/plugins/QuickSearch/sr_optdialog.pas +++ b/plugins/QuickSearch/sr_optdialog.pas @@ -3,7 +3,7 @@ unit sr_optdialog; interface uses windows; -function DlgProcOptions(Dialog:HWnd;hMessage:UINT;wParam:WPARAM;lParam:LPARAM):lresult; stdcall; +function DlgProcOptions(Dialog:HWND;hMessage:uint;wParam:WPARAM;lParam:LPARAM):LRESULT; stdcall; implementation @@ -138,7 +138,7 @@ begin param); end; -procedure addsetcnftypes(list:hwnd); +procedure addsetcnftypes(list:HWND); begin AddCnf(list,CNF_FIRSTNAME); AddCnf(list,CNF_LASTNAME); @@ -183,7 +183,7 @@ begin end; -function GetSelectedItem(list:hwnd):integer; +function GetSelectedItem(list:HWND):integer; begin result:=SendMessage(list,LVM_GETNEXTITEM,-1,LVNI_FOCUSED); end; @@ -322,7 +322,7 @@ begin end; end; -function savecuritem(Dialog:hwnd):integer; +function savecuritem(Dialog:HWND):integer; var list:HWND; srvalue:tServiceValue; @@ -434,7 +434,7 @@ begin SendMessage(list,LVM_INSERTITEM,0,lparam(@li)); end; -procedure update_list(list:hwnd); +procedure update_list(list:HWND); var i,cnt:integer; begin @@ -459,7 +459,7 @@ end; // fill comboboxes lists -procedure adddbsettypes(list:hwnd); +procedure adddbsettypes(list:HWND); begin CB_AddStrDataW(list,TranslateW(stByte) ,QSTS_BYTE); CB_AddStrDataW(list,TranslateW(stWord) ,QSTS_WORD); @@ -473,7 +473,7 @@ begin SendMessage(list,CB_SETCURSEL,0,0); end; -procedure addothertypes(list:hwnd); +procedure addothertypes(list:HWND); begin CB_AddStrDataW(list,TranslateW(stLastSeen) ,QSTO_LASTSEEN); CB_AddStrDataW(list,TranslateW(stLastEvent) ,QSTO_LASTEVENT); @@ -483,7 +483,7 @@ begin SendMessage(list,CB_SETCURSEL,0,0); end; -procedure addsettypes(list:hwnd); +procedure addsettypes(list:HWND); begin CB_AddStrDataW(list,TranslateW(stSetting),QST_SETTING); @@ -496,7 +496,7 @@ begin SendMessage(list,CB_SETCURSEL,0,0); end; -procedure addcolumn(handle:hwnd;width:word;title:PWideChar); +procedure addcolumn(handle:HWND;width:word;title:PWideChar); var lvcol:LV_COLUMNW; begin @@ -506,7 +506,7 @@ begin SendMessageW(handle,LVM_INSERTCOLUMNW,0,lparam(@lvcol)); end; -function NewListProc(Dialog:HWnd;hMessage:UINT;wParam:WPARAM;lParam:LPARAM):integer; stdcall; +function NewListProc(Dialog:HWND;hMessage:uint;wParam:WPARAM;lParam:LPARAM):LRESULT; stdcall; begin result:=0; if hMessage=WM_KEYDOWN then @@ -617,12 +617,12 @@ procedure SetButtons(Dialog:HWND); var // ti:TTOOLINFOW; // hwndTooltip:HWND; - hNew :hwnd; - hUp :hwnd; - hDown :hwnd; - hDelete :hwnd; - hDefault:hwnd; - hReload :hwnd; + hNew :HWND; + hUp :HWND; + hDown :HWND; + hDelete :HWND; + hDefault:HWND; + hReload :HWND; begin { hwndTooltip:=CreateWindowW(TOOLTIPS_CLASS,nil,TTS_ALWAYSTIP, @@ -709,7 +709,7 @@ begin // Other end; -function DlgProcOptions(Dialog:HWnd;hMessage:UINT;wParam:WPARAM;lParam:LPARAM):lresult; stdcall; +function DlgProcOptions(Dialog:HWND;hMessage:uint;wParam:WPARAM;lParam:LPARAM):LRESULT; stdcall; const InitDlg:bool = true; hook:THANDLE = 0; @@ -717,7 +717,7 @@ var pc:pWideChar; i,idx:integer; itemsel:integer; - listhwnd:hwnd; + listhwnd:HWND; tmpbool:bool; begin result:=0; diff --git a/plugins/QuickSearch/sr_window.pas b/plugins/QuickSearch/sr_window.pas index 0b4383fcc2..fcc23e7020 100644 --- a/plugins/QuickSearch/sr_window.pas +++ b/plugins/QuickSearch/sr_window.pas @@ -51,12 +51,12 @@ type end; pQSFRec = ^tQSFRec; tQSFRec = record // row (contact) - contact:MCONTACT; + contact:TMCONTACT; proto :uint_ptr; flags :dword; status :dword; //--- Metacontacts only --- - wparam :WPARAM; + wparam :WPARAM; lparam :LPARAM; end; var @@ -115,7 +115,7 @@ begin end; end; -procedure AddContactToList(hContact:MCONTACT;num:integer); +procedure AddContactToList(hContact:TMCONTACT;num:integer); var li:LV_ITEMW; i:integer; @@ -337,7 +337,7 @@ end; //----- contacts actions ----- -function GetFocusedhContact:MCONTACT; +function GetFocusedhContact:TMCONTACT; var i:integer; begin @@ -348,7 +348,7 @@ begin result:=FlagBuf[i].contact; end; -procedure ShowContactMsgDlg(hContact:MCONTACT); +procedure ShowContactMsgDlg(hContact:TMCONTACT); begin if hContact<>0 then begin @@ -357,7 +357,7 @@ begin end; end; -procedure DeleteOneContact(hContact:MCONTACT); +procedure DeleteOneContact(hContact:TMCONTACT); begin if ServiceExists(strCListDel)>0 then CallService(strCListDel,hContact,0) @@ -388,8 +388,8 @@ end; procedure ConvertToMeta; var - hMeta:MCONTACT; - tmp:MCONTACT; + hMeta:TMCONTACT; + tmp:TMCONTACT; i,j:integer; begin j:=ListView_GetItemCount(grid)-1; @@ -438,7 +438,7 @@ end; procedure UpdateLVCell(item,column:integer;text:pWideChar=pWideChar(-1)); var li:LV_ITEMW; - contact:MCONTACT; + contact:TMCONTACT; row:integer; begin contact:=FlagBuf[LV_GetLParam(grid,item)].contact; @@ -469,7 +469,7 @@ end; procedure MoveToGroup(group:PWideChar); var - contact:MCONTACT; + contact:TMCONTACT; i,j,grcol,row:integer; begin j:=ListView_GetItemCount(grid)-1; @@ -512,7 +512,7 @@ end; procedure MoveToContainer(container:PWideChar); var - contact:MCONTACT; + contact:TMCONTACT; i,j,grcol,row:integer; begin j:=ListView_GetItemCount(grid)-1; @@ -784,7 +784,7 @@ begin UpdateLVCell(SendMessage(grid,LVM_GETNEXTITEM,-1,LVNI_FOCUSED),cmcolumn,qsr.text); end; -function ShowContactMenu(wnd:HWND;hContact:MCONTACT;col:integer=-1):HMENU; +function ShowContactMenu(wnd:HWND;hContact:TMCONTACT;col:integer=-1):HMENU; var mi:TCListMenuItem; pt:tpoint; @@ -798,7 +798,7 @@ begin col:=ListViewToColumn(col); if (qsopt.columns[col].setting_type=QST_SETTING) and // right now, not time or IP - (qsopt.columns[col].datatype<>QSTS_IP) and + (qsopt.columns[col].datatype<>QSTS_IP) and (qsopt.columns[col].datatype<>QSTS_TIMESTAMP) then begin doit:=true; @@ -1096,7 +1096,7 @@ begin end; end; -function NewLVHProc(Dialog:HWnd;hMessage:UINT;wParam:WPARAM;lParam:LPARAM):lresult; stdcall; +function NewLVHProc(Dialog:HWND;hMessage:uint;wParam:WPARAM;lParam:LPARAM):LRESULT; stdcall; begin case hMessage of WM_RBUTTONUP: begin @@ -1114,7 +1114,7 @@ end; var HintWnd:HWND; -function NewLVProc(Dialog:HWnd;hMessage:UINT;wParam:WPARAM;lParam:LPARAM):lresult; stdcall; +function NewLVProc(Dialog:HWND;hMessage:uint;wParam:WPARAM;lParam:LPARAM):LRESULT; stdcall; const OldHItem :integer=0; OldHSubItem:integer=0; @@ -1388,7 +1388,7 @@ procedure SetCellColor(lplvcd:PNMLVCUSTOMDRAW;idx:integer); begin if (qsopt.flags and QSO_COLORIZE)<>0 then begin - with FlagBuf[idx] do + with FlagBuf[idx] do begin if (flags and QSF_ACCDEL)<>0 then begin @@ -1526,13 +1526,13 @@ begin end; -function NewEditProc(Dialog:HWnd;hMessage:UINT;wParam:WPARAM;lParam:LPARAM):lresult; stdcall; +function NewEditProc(Dialog:HWND;hMessage:uint;wParam:WPARAM;lParam:LPARAM):LRESULT; stdcall; var li:LV_ITEM; count,current,next,perpage:integer; begin result:=0; - case hMessage of + case hMessage of WM_CHAR: if wParam=27 then begin PostMessage(GetParent(Dialog),WM_COMMAND,(BN_CLICKED shl 16)+IDCANCEL,0); @@ -1881,7 +1881,7 @@ begin end; end; -function QSMainWndProc(Dialog:HWnd;hMessage:UINT;wParam:WPARAM;lParam:LPARAM):lresult; stdcall; +function QSMainWndProc(Dialog:HWND;hMessage:uint;wParam:WPARAM;lParam:LPARAM):LRESULT; stdcall; var smenu:HMENU; header:HWND; -- cgit v1.2.3