unused header removed from pascal sources

5 files changed, 3 insertions, 125 deletions

diff --git a/include/delphi/m_api.pas b/include/delphi/m_api.pas
index 252d3fef6e..70d52c39af 100644
--- a/include/delphi/m_api.pas
+++ b/include/delphi/m_api.pas
@@ -184,7 +184,6 @@ var
   {$include m_clist.inc}

   {$include m_genmenu.inc}

   {$include m_protosvc.inc}

-  {$include m_protoint.inc}

   {$include m_protocols.inc}

 

   {$include m_acc.inc}

diff --git a/include/delphi/m_protocols.inc b/include/delphi/m_protocols.inc
index 5fb1c39ad7..e5af3b4189 100644
--- a/include/delphi/m_protocols.inc
+++ b/include/delphi/m_protocols.inc
@@ -154,14 +154,6 @@ type
   they can be encryption and loads of other things, too.

   And yes, before you ask, that is triple indirection. Deal with it.

   Access members using ppProtocolDescriptors[index]->element }

-type

-  pfnInitProto = function(const szModuleName:PAnsiChar;const szUserName:TCHAR):PPROTO_INTERFACE; cdecl;

-

-// deallocates an account instance

-  pfnUninitProto = function(pin:PPROTO_INTERFACE):int; cdecl;

-

-// removes an account from the database

-  pfnDestroyProto = function(pin:PPROTO_INTERFACE):int; cdecl;

 

 type

   PPROTOCOLDESCRIPTOR = ^TPROTOCOLDESCRIPTOR;

@@ -170,15 +162,8 @@ type
     cbSize : size_t;

     szName : PAnsiChar; // unique name of the module

     _type  : int;   // module type, see PROTOTYPE_ constants

-  // 0.8.0+ additions

-    fnInit   :pfnInitProto;    // initializes an empty account

-    fnUninit :pfnUninitProto;  // deallocates an account instance

-    fnDestroy:pfnDestroyProto; // removes an account

   end;

 

-const

-  PROTOCOLDESCRIPTOR_V3_SIZE = SizeOf(int_ptr)+SizeOf(PAnsiChar)+SizeOf(size_t);

-

 { v0.3.3+:

   For recv, it will go from lower to higher, so in this case:

   check ignore, decrypt (encryption), translate

@@ -270,7 +255,7 @@ type
     bAccMgrUIChanged:ByteBool;

     hwndAccMgrUI    :HWND;

     iOrder          :int;              // account order in various menus & lists

-    ppro            :PPROTO_INTERFACE; // pointer to the underlying object

+    ppro            :pointer;          // pointer to the underlying object

   end;

   tagACCOUNT = TPROTOACCOUNT;

 

diff --git a/include/delphi/m_protoint.inc b/include/delphi/m_protoint.inc
deleted file mode 100644
index 1416684b80..0000000000
--- a/include/delphi/m_protoint.inc
+++ /dev/null
@@ -1,105 +0,0 @@
-{

-Miranda IM: the free IM client for Microsoft* Windows*

-

-Copyright 2000-2008 Miranda ICQ/IM project,

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-}

-

-{$IFNDEF M_PROTOINT}

-{$DEFINE M_PROTOINT}

-

-type

-  TPROTOEVENTTYPE = (

-    EV_PROTO_ONLOAD,

-    EV_PROTO_ONREADYTOEXIT,

-    EV_PROTO_ONEXIT,

-    EV_PROTO_ONRENAME,

-    EV_PROTO_ONOPTIONS,

-    EV_PROTO_ONERASE,

-    EV_PROTO_ONMENU,

-    EV_PROTO_ONCONTACTDELETED,

-    EV_PROTO_DBSETTINGSCHANGED);

-

-type

-	PROTOCHAR      = TCHAR;

-	PROTOFILEEVENT = TPROTORECVFILE;

-

-type

-  PPROTO_INTERFACE = ^TPROTO_INTERFACE;

-  TPROTO_INTERFACE = record

-    iStatus       :int;

-    iDesiredStatus:int;

-    iXStatus      :int;

-    iVersion      :int;  // version 2 or higher designate support of Unicode services

-

-    tszUserName   :TChar;

-    szModuleName  :PAnsiChar;

-    hProtoIcon    :THANDLE;

-    hNetlibUser   :THANDLE;

-    hWindowList   :THANDLE;

-    hMainMenuItem :HGENMENU;

-	//////////////////////////////////////////////////////////////////////////////////////

-	//////////////////////////////////////////////////////////////////////////////////////

-	// Virtual functions

-

-    AddToList       :function(intf:PPROTO_INTERFACE;flags:int; var psr:TPROTOSEARCHRESULT):TMCONTACT; cdecl;

-    AddToListByEvent:function(intf:PPROTO_INTERFACE;flags:int; iContact:int; hDbEvent:TMEVENT):TMCONTACT; cdecl;

-

-    Authorize  :function(intf:PPROTO_INTERFACE;hDbEvent:TMEVENT):int; cdecl;

-    AuthDeny   :function(intf:PPROTO_INTERFACE;hDbEvent:TMEVENT;const szReason:TChar):int; cdecl;

-    AuthRecv   :function(intf:PPROTO_INTERFACE;hContact:TMCONTACT;var ptr:TPROTORECVEVENT):int; cdecl;

-    AuthRequest:function(intf:PPROTO_INTERFACE;hContact:TMCONTACT;szMessage:TChar):int; cdecl;

-

-    FileAllow :function(intf:PPROTO_INTERFACE;hContact:TMCONTACT;hTransfer:THANDLE; szPath:PROTOCHAR):THANDLE; cdecl;

-    FileCancel:function(intf:PPROTO_INTERFACE;hContact:TMCONTACT;hTransfer:THANDLE):int; cdecl;

-    FileDeny  :function(intf:PPROTO_INTERFACE;hContact:TMCONTACT;hTransfer:THANDLE; var szReason:PROTOCHAR):int; cdecl;

-    FileResume:function(intf:PPROTO_INTERFACE;hTransfer:THANDLE;var action:integer; var szFilename:PROTOCHAR):int; cdecl;

-

-    GetCaps:function(intf:PPROTO_INTERFACE;_type:int;hContact:TMCONTACT=0):dword_ptr; cdecl;

-    GetInfo:function(intf:PPROTO_INTERFACE;hContact:TMCONTACT;infoType:int):int; cdecl;

-

-    SearchBasic           :function(intf:PPROTO_INTERFACE;id:PAnsiChar):THANDLE; cdecl;

-    SearchByEmail         :function(intf:PPROTO_INTERFACE;email:PAnsiChar):THANDLE; cdecl;

-    SearchByName          :function(intf:PPROTO_INTERFACE;nick:PAnsiChar; const firstName:PAnsiChar; const lastName:PAnsiChar):THANDLE; cdecl;

-    SearchAdvanced        :function(intf:PPROTO_INTERFACE;owner:HWND):HWND; cdecl;

-    CreateExtendedSearchUI:function(intf:PPROTO_INTERFACE;owner:HWND):HWND; cdecl;

-

-    RecvContacts:function(intf:PPROTO_INTERFACE;hContact:TMCONTACT;var ptr:TPROTORECVEVENT):int; cdecl;

-    RecvFile    :function(intf:PPROTO_INTERFACE;hContact:TMCONTACT;var ptr:TPROTORECVEVENT):int; cdecl;

-    RecvMessage :function(intf:PPROTO_INTERFACE;hContact:TMCONTACT;var ptr:TPROTORECVEVENT):int; cdecl;

-    RecvUrl     :function(intf:PPROTO_INTERFACE;hContact:TMCONTACT;var ptr:TPROTORECVEVENT):int; cdecl;

-

-    SendContacts:function(intf:PPROTO_INTERFACE;hContact:TMCONTACT;flags:int; nContacts:int; var hContactsList:THANDLE):int; cdecl;

-    SendFile    :function(intf:PPROTO_INTERFACE;hContact:TMCONTACT;szDescription:PROTOCHAR; var ppszFiles:PROTOCHAR):THANDLE; cdecl;

-    SendMessage :function(intf:PPROTO_INTERFACE;hContact:TMCONTACT;flags:int; const msg:PAnsiChar):int; cdecl;

-    SendUrl     :function(intf:PPROTO_INTERFACE;hContact:TMCONTACT;flags:int; const url:PAnsiChar):int; cdecl;

-

-    SetApparentMode:function(intf:PPROTO_INTERFACE;hContact:TMCONTACT;mode:int):int; cdecl;

-    SetStatus      :function(intf:PPROTO_INTERFACE;iNewStatus:int):int; cdecl;

-

-    GetAwayMsg :function(intf:PPROTO_INTERFACE;hContact:TMCONTACT):THANDLE; cdecl;

-    RecvAwayMsg:function(intf:PPROTO_INTERFACE;hContact:TMCONTACT;mode:int;var evt:TPROTORECVEVENT):int; cdecl;

-    SetAwayMsg :function(intf:PPROTO_INTERFACE;iStatus:int; const msg:PAnsiChar):int; cdecl;

-

-    UserIsTyping:function(intf:PPROTO_INTERFACE;hContact:TMCONTACT; _type:int):int; cdecl;

-    OnEvent:function(intf:PPROTO_INTERFACE;iEventType:TPROTOEVENTTYPE;wParam:WPARAM;lParam:LPARAM):int; cdecl;

-  end;

-

- tagPROTO_INTERFACE = TPROTO_INTERFACE;

-

-{$ENDIF}

diff --git a/plugins/Watrack/proto/proto.pas b/plugins/Watrack/proto/proto.pas
index f5f47617ae..238e9e39de 100644
--- a/plugins/Watrack/proto/proto.pas
+++ b/plugins/Watrack/proto/proto.pas
@@ -322,7 +322,7 @@ procedure SetProtocol;
 var

   desc:TPROTOCOLDESCRIPTOR;

 begin

-  desc.cbSize:=PROTOCOLDESCRIPTOR_V3_SIZE;//SizeOf(desc);

+  desc.cbSize:=SizeOf(desc);

   desc.szName:=PluginShort;

   desc._type :=PROTOTYPE_TRANSLATION;

   Proto_RegisterModule(@desc);

diff --git a/plugins/mRadio/mradio.dpr b/plugins/mRadio/mradio.dpr
index c23ec983fa..71670e1947 100644
--- a/plugins/mRadio/mradio.dpr
+++ b/plugins/mRadio/mradio.dpr
@@ -162,8 +162,7 @@ begin
   Langpack_register;

 

   // register protocol

-  FillChar(desc,SizeOf(desc),0);

-  desc.cbSize:=PROTOCOLDESCRIPTOR_V3_SIZE;//SizeOf(desc);

+  desc.cbSize:=SizeOf(desc);

   desc.szName:=PluginName;

   desc._type :=PROTOTYPE_VIRTUAL;

   Proto_RegisterModule(@desc);