From e821fe3e1567f4090be9f6d49627e6df25695d20 Mon Sep 17 00:00:00 2001 From: "J. Peter Mugaas" Date: Thu, 21 Nov 2024 03:40:53 -0500 Subject: [PATCH] Move mode switch from the interface part of the unit to the area between the "unit" and "interface" for good measure Remove some unneeded unit dependencies. --- Lib/Core/IdAboutVCL.pas | 6 ++++-- Lib/Core/IdAntiFreeze.pas | 12 ++++++++---- Lib/Core/IdCmdTCPClient.pas | 7 ++----- Lib/Core/IdCmdTCPServer.pas | 4 ++-- Lib/Core/IdCommandHandlers.pas | 5 +++-- Lib/Core/IdContext.pas | 4 ++-- Lib/Core/IdCoreDsnRegister.pas | 4 ++-- Lib/Core/IdCustomTCPServer.pas | 5 ++--- Lib/Core/IdCustomTransparentProxy.pas | 5 +++-- Lib/Core/IdDsnPropEdBinding.pas | 3 +-- Lib/Core/IdDsnPropEdBindingVCL.pas | 12 +++++++----- Lib/Core/IdExceptionCore.pas | 4 +++- Lib/Core/IdGlobalCore.pas | 4 ++-- Lib/Core/IdIOHandler.pas | 4 ++-- Lib/Core/IdIOHandlerSocket.pas | 4 ++-- Lib/Core/IdIOHandlerStack.pas | 8 ++++---- Lib/Core/IdIOHandlerStream.pas | 4 ++-- Lib/Core/IdIPAddress.pas | 4 ++-- Lib/Core/IdIPMCastBase.pas | 8 +++++--- Lib/Core/IdIPMCastClient.pas | 4 ++-- Lib/Core/IdIPMCastServer.pas | 4 ++-- Lib/Core/IdIcmpClient.pas | 13 +++++++------ Lib/Core/IdIntercept.pas | 7 ++++--- Lib/Core/IdInterceptSimLog.pas | 8 +++++--- Lib/Core/IdInterceptThrottler.pas | 5 +++-- Lib/Core/IdLogBase.pas | 4 ++-- Lib/Core/IdLogDebug.pas | 4 +++- Lib/Core/IdLogEvent.pas | 5 +++-- Lib/Core/IdLogFile.pas | 5 +++-- Lib/Core/IdLogStream.pas | 4 ++-- Lib/Core/IdRawClient.pas | 3 ++- Lib/Core/IdRawFunctions.pas | 4 ++-- Lib/Core/IdRawHeaders.pas | 4 ++-- Lib/Core/IdRegisterCore.pas | 4 ++-- Lib/Core/IdReply.pas | 4 ++-- Lib/Core/IdReplyRFC.pas | 4 +++- Lib/Core/IdScheduler.pas | 4 ++-- Lib/Core/IdSchedulerOfThread.pas | 3 ++- Lib/Core/IdSchedulerOfThreadDefault.pas | 3 ++- Lib/Core/IdSchedulerOfThreadPool.pas | 5 ++--- Lib/Core/IdServerIOHandler.pas | 3 ++- Lib/Core/IdServerIOHandlerSocket.pas | 3 ++- Lib/Core/IdServerIOHandlerStack.pas | 3 ++- Lib/Core/IdSimpleServer.pas | 4 ++-- Lib/Core/IdSocketHandle.pas | 4 ++-- Lib/Core/IdSocks.pas | 5 +++-- Lib/Core/IdTCPConnection.pas | 6 ++---- Lib/Core/IdTCPServer.pas | 3 ++- Lib/Core/IdTCPStream.pas | 4 ++-- Lib/Core/IdTask.pas | 3 ++- Lib/Core/IdThread.pas | 4 ++-- Lib/Core/IdThreadComponent.pas | 4 ++-- Lib/Core/IdThreadSafe.pas | 4 ++-- Lib/Core/IdTraceRoute.pas | 6 +++--- Lib/Core/IdUDPBase.pas | 4 ++-- Lib/Core/IdUDPClient.pas | 4 ++-- Lib/Core/IdUDPServer.pas | 5 +++-- Lib/Core/IdYarn.pas | 4 ++-- Lib/Protocols/IdAttachment.pas | 7 +++---- Lib/Protocols/IdAttachmentFile.pas | 4 ++-- Lib/Protocols/IdAttachmentMemory.pas | 4 ++-- Lib/Protocols/IdAuthentication.pas | 6 +++--- Lib/Protocols/IdAuthenticationDigest.pas | 9 ++++----- Lib/Protocols/IdAuthenticationManager.pas | 4 ++-- Lib/Protocols/IdAuthenticationNTLM.pas | 3 +-- Lib/Protocols/IdAuthenticationSSPI.pas | 6 ++---- Lib/Protocols/IdBlockCipherIntercept.pas | 4 ++-- Lib/Protocols/IdChargenServer.pas | 5 +++-- Lib/Protocols/IdChargenUDPServer.pas | 3 ++- Lib/Protocols/IdCharsets.pas | 4 ++-- Lib/Protocols/IdCoder.pas | 9 ++------- Lib/Protocols/IdCoder00E.pas | 4 ++-- Lib/Protocols/IdCoder3to4.pas | 6 +++--- Lib/Protocols/IdCoderBinHex4.pas | 4 ++-- Lib/Protocols/IdCoderHeader.pas | 5 ++--- Lib/Protocols/IdCoderMIME.pas | 6 ++---- Lib/Protocols/IdCoderQuotedPrintable.pas | 4 ++-- Lib/Protocols/IdCoderTNEF.pas | 4 ++-- Lib/Protocols/IdCoderXXE.pas | 4 ++-- Lib/Protocols/IdCompressionIntercept.pas | 8 +++----- Lib/Protocols/IdCompressorZLib.pas | 3 ++- Lib/Protocols/IdConnectThroughHttpProxy.pas | 3 ++- Lib/Protocols/IdContainers.pas | 4 ++-- Lib/Protocols/IdCookie.pas | 9 ++++----- Lib/Protocols/IdCookieManager.pas | 6 +++--- Lib/Protocols/IdCustomHTTPServer.pas | 4 ++-- Lib/Protocols/IdDICT.pas | 4 ++-- Lib/Protocols/IdDICTCommon.pas | 4 ++-- Lib/Protocols/IdDICTServer.pas | 3 ++- Lib/Protocols/IdDNSCommon.pas | 5 ++--- Lib/Protocols/IdDNSResolver.pas | 4 ++-- Lib/Protocols/IdDNSServer.pas | 6 ++---- Lib/Protocols/IdDateTimeStamp.pas | 5 ++--- Lib/Protocols/IdDayTime.pas | 3 ++- Lib/Protocols/IdDayTimeServer.pas | 3 ++- Lib/Protocols/IdDayTimeUDP.pas | 3 ++- Lib/Protocols/IdDayTimeUDPServer.pas | 5 +++-- Lib/Protocols/IdDiscardServer.pas | 3 ++- Lib/Protocols/IdDiscardUDPServer.pas | 5 +++-- Lib/Protocols/IdDsnRegister.pas | 5 ++--- Lib/Protocols/IdDsnSASLListEditor.pas | 4 ++-- Lib/Protocols/IdDsnSASLListEditorFormVCL.pas | 4 ++-- Lib/Protocols/IdDummyUnit.pas | 4 +++- Lib/Protocols/IdEMailAddress.pas | 7 +++---- Lib/Protocols/IdEcho.pas | 4 ++-- Lib/Protocols/IdEchoServer.pas | 2 +- Lib/Protocols/IdEchoUDPServer.pas | 5 +++-- Lib/Protocols/IdExplicitTLSClientServerBase.pas | 4 ++-- Lib/Protocols/IdFIPS.pas | 4 ++-- Lib/Protocols/IdFSP.pas | 4 ++-- Lib/Protocols/IdFTP.pas | 6 ++++-- Lib/Protocols/IdFTPBaseFileSystem.pas | 3 ++- Lib/Protocols/IdFTPCommon.pas | 9 ++++----- Lib/Protocols/IdFTPList.pas | 4 ++-- Lib/Protocols/IdFTPListOutput.pas | 3 +-- Lib/Protocols/IdFTPListParseAS400.pas | 4 ++-- Lib/Protocols/IdFTPListParseBase.pas | 4 ++-- Lib/Protocols/IdFTPListParseBullGCOS7.pas | 4 ++-- Lib/Protocols/IdFTPListParseBullGCOS8.pas | 4 ++-- Lib/Protocols/IdFTPListParseChameleonNewt.pas | 4 ++-- Lib/Protocols/IdFTPListParseCiscoIOS.pas | 4 ++-- Lib/Protocols/IdFTPListParseDistinctTCPIP.pas | 4 ++-- Lib/Protocols/IdFTPListParseEPLF.pas | 4 ++-- Lib/Protocols/IdFTPListParseHellSoft.pas | 4 ++-- Lib/Protocols/IdFTPListParseIEFTPGateway.pas | 4 ++-- Lib/Protocols/IdFTPListParseKA9Q.pas | 4 ++-- Lib/Protocols/IdFTPListParseMPEiX.pas | 4 ++-- Lib/Protocols/IdFTPListParseMVS.pas | 4 ++-- Lib/Protocols/IdFTPListParseMicrowareOS9.pas | 4 ++-- Lib/Protocols/IdFTPListParseMusic.pas | 4 ++-- Lib/Protocols/IdFTPListParseNCSAForDOS.pas | 4 ++-- Lib/Protocols/IdFTPListParseNCSAForMACOS.pas | 4 ++-- Lib/Protocols/IdFTPListParseNovellNetware.pas | 4 ++-- Lib/Protocols/IdFTPListParseNovellNetwarePSU.pas | 4 ++-- Lib/Protocols/IdFTPListParseOS2.pas | 4 ++-- Lib/Protocols/IdFTPListParsePCNFSD.pas | 4 ++-- Lib/Protocols/IdFTPListParsePCTCP.pas | 4 ++-- Lib/Protocols/IdFTPListParseStercomOS390Exp.pas | 4 ++-- Lib/Protocols/IdFTPListParseStercomUnixEnt.pas | 4 ++-- Lib/Protocols/IdFTPListParseStratusVOS.pas | 4 ++-- Lib/Protocols/IdFTPListParseSuperTCP.pas | 4 ++-- Lib/Protocols/IdFTPListParseTOPS20.pas | 4 ++-- Lib/Protocols/IdFTPListParseTSXPlus.pas | 4 ++-- Lib/Protocols/IdFTPListParseTandemGuardian.pas | 4 ++-- Lib/Protocols/IdFTPListParseUnisysClearPath.pas | 4 ++-- Lib/Protocols/IdFTPListParseUnix.pas | 4 ++-- Lib/Protocols/IdFTPListParseVM.pas | 4 ++-- Lib/Protocols/IdFTPListParseVMS.pas | 4 ++-- Lib/Protocols/IdFTPListParseVSE.pas | 4 ++-- Lib/Protocols/IdFTPListParseVxWorks.pas | 4 ++-- Lib/Protocols/IdFTPListParseWfFTP.pas | 4 ++-- Lib/Protocols/IdFTPListParseWinQVTNET.pas | 4 ++-- Lib/Protocols/IdFTPListParseWindowsNT.pas | 4 ++-- Lib/Protocols/IdFTPListParseXecomMicroRTOS.pas | 4 ++-- Lib/Protocols/IdFTPListTypes.pas | 4 ++-- Lib/Protocols/IdFTPServer.pas | 10 +++++----- Lib/Protocols/IdFTPServerContextBase.pas | 4 ++-- Lib/Protocols/IdFinger.pas | 4 ++-- Lib/Protocols/IdFingerServer.pas | 3 ++- Lib/Protocols/IdGlobalProtocols.pas | 4 ++-- Lib/Protocols/IdGopher.pas | 6 +++--- Lib/Protocols/IdGopherConsts.pas | 3 ++- Lib/Protocols/IdGopherServer.pas | 4 ++-- Lib/Protocols/IdHL7.pas | 4 ++-- Lib/Protocols/IdHMAC.pas | 4 ++-- Lib/Protocols/IdHMACMD5.pas | 7 ++++--- Lib/Protocols/IdHMACSHA1.pas | 4 ++-- Lib/Protocols/IdHTTP.pas | 5 ++--- Lib/Protocols/IdHTTPHeaderInfo.pas | 4 ++-- Lib/Protocols/IdHTTPProxyServer.pas | 6 +++--- Lib/Protocols/IdHTTPServer.pas | 3 ++- Lib/Protocols/IdHTTPWebBrokerBridge.pas | 4 ++-- Lib/Protocols/IdHash.pas | 4 ++-- Lib/Protocols/IdHashAdler32.pas | 3 ++- Lib/Protocols/IdHashCRC.pas | 3 ++- Lib/Protocols/IdHashElf.pas | 4 ++-- Lib/Protocols/IdHashIntf.pas | 3 ++- Lib/Protocols/IdHashMessageDigest.pas | 2 +- Lib/Protocols/IdHashSHA.pas | 3 ++- Lib/Protocols/IdHashSHA1.pas | 3 ++- Lib/Protocols/IdHeaderCoder2022JP.pas | 4 ++-- Lib/Protocols/IdHeaderCoderBase.pas | 4 ++-- Lib/Protocols/IdHeaderCoderBig5.pas | 4 ++-- Lib/Protocols/IdHeaderCoderIndy.pas | 4 ++-- Lib/Protocols/IdHeaderCoderPlain.pas | 4 ++-- Lib/Protocols/IdHeaderList.pas | 5 ++--- Lib/Protocols/IdHostnameServer.pas | 4 ++-- Lib/Protocols/IdIMAP4.pas | 4 +--- Lib/Protocols/IdIMAP4Server.pas | 6 ++---- Lib/Protocols/IdIPAddrMon.pas | 4 ++-- Lib/Protocols/IdIPWatch.pas | 4 ++-- Lib/Protocols/IdIdent.pas | 4 ++-- Lib/Protocols/IdIdentServer.pas | 4 ++-- Lib/Protocols/IdIrcServer.pas | 4 ++-- Lib/Protocols/IdLDAPV3.pas | 4 ++-- Lib/Protocols/IdLDAPV3Coder.pas | 4 ++-- Lib/Protocols/IdLPR.pas | 11 ++++------- Lib/Protocols/IdMIMETypes.pas | 3 ++- Lib/Protocols/IdMailBox.pas | 3 +-- Lib/Protocols/IdMappedFTP.pas | 8 ++++---- Lib/Protocols/IdMappedPOP3.pas | 9 ++++----- Lib/Protocols/IdMappedPortTCP.pas | 10 ++++------ Lib/Protocols/IdMappedPortUDP.pas | 4 ++-- Lib/Protocols/IdMappedTelnet.pas | 9 ++++----- Lib/Protocols/IdMessage.pas | 6 +++--- Lib/Protocols/IdMessageBuilder.pas | 4 ++-- Lib/Protocols/IdMessageClient.pas | 14 ++++++-------- Lib/Protocols/IdMessageCoder.pas | 7 +++---- Lib/Protocols/IdMessageCoderBinHex4.pas | 7 +++---- Lib/Protocols/IdMessageCoderMIME.pas | 6 +++--- Lib/Protocols/IdMessageCoderQuotedPrintable.pas | 7 +++---- Lib/Protocols/IdMessageCoderUUE.pas | 4 ++-- Lib/Protocols/IdMessageCoderXXE.pas | 5 +++-- Lib/Protocols/IdMessageCoderYenc.pas | 9 ++------- Lib/Protocols/IdMessageCollection.pas | 4 ++-- Lib/Protocols/IdMessageParts.pas | 4 ++-- Lib/Protocols/IdMultipartFormData.pas | 4 ++-- Lib/Protocols/IdNNTP.pas | 5 ++--- Lib/Protocols/IdNNTPServer.pas | 8 ++++---- Lib/Protocols/IdNTLM.pas | 8 ++++---- Lib/Protocols/IdNTLMv2.pas | 4 ++-- Lib/Protocols/IdNetworkCalculator.pas | 7 +++---- Lib/Protocols/IdOSFileName.pas | 4 ++-- Lib/Protocols/IdOTPCalculator.pas | 3 ++- Lib/Protocols/IdPOP3.pas | 8 +++----- Lib/Protocols/IdPOP3Server.pas | 8 +++----- Lib/Protocols/IdQOTDUDP.pas | 4 ++-- Lib/Protocols/IdQOTDUDPServer.pas | 5 +++-- Lib/Protocols/IdQotd.pas | 3 ++- Lib/Protocols/IdQotdServer.pas | 4 ++-- Lib/Protocols/IdRSH.pas | 4 +--- Lib/Protocols/IdRSHServer.pas | 5 +++-- Lib/Protocols/IdRegister.pas | 3 +-- Lib/Protocols/IdRemoteCMDClient.pas | 3 ++- Lib/Protocols/IdRemoteCMDServer.pas | 8 ++++---- Lib/Protocols/IdReplyFTP.pas | 5 ++--- Lib/Protocols/IdReplyIMAP4.pas | 7 +++---- Lib/Protocols/IdReplyPOP3.pas | 3 ++- Lib/Protocols/IdReplySMTP.pas | 4 ++-- Lib/Protocols/IdRexec.pas | 4 +--- Lib/Protocols/IdRexecServer.pas | 4 ++-- Lib/Protocols/IdSASL.pas | 8 +++----- Lib/Protocols/IdSASLAnonymous.pas | 6 +++--- Lib/Protocols/IdSASLCollection.pas | 4 ++-- Lib/Protocols/IdSASLDigest.pas | 6 ++++-- Lib/Protocols/IdSASLExternal.pas | 6 +++--- Lib/Protocols/IdSASLLogin.pas | 6 +++--- Lib/Protocols/IdSASLOAuth.pas | 4 ++-- Lib/Protocols/IdSASLOTP.pas | 6 +++--- Lib/Protocols/IdSASLPlain.pas | 4 ++-- Lib/Protocols/IdSASLSKey.pas | 6 ++++-- Lib/Protocols/IdSASLUserPass.pas | 4 ++-- Lib/Protocols/IdSASL_CRAMBase.pas | 4 ++-- Lib/Protocols/IdSASL_CRAM_MD5.pas | 6 +++--- Lib/Protocols/IdSASL_CRAM_SHA1.pas | 6 +++--- Lib/Protocols/IdSASL_NTLM.pas | 4 ++-- Lib/Protocols/IdSMTP.pas | 7 ++----- Lib/Protocols/IdSMTPBase.pas | 6 +++--- Lib/Protocols/IdSMTPRelay.pas | 6 +++--- Lib/Protocols/IdSMTPServer.pas | 4 ++-- Lib/Protocols/IdSNMP.pas | 4 +--- Lib/Protocols/IdSNPP.pas | 3 ++- Lib/Protocols/IdSNTP.pas | 5 +++-- Lib/Protocols/IdSSH.pas | 4 ++-- Lib/Protocols/IdSSL.pas | 4 ++-- Lib/Protocols/IdSSLOpenSSL.pas | 15 ++------------- Lib/Protocols/IdSSLOpenSSLHeaders.pas | 4 ++-- Lib/Protocols/IdSSLOpenSSLHeaders_static.pas | 4 ++-- Lib/Protocols/IdSSLOpenSSLUtils.pas | 4 ++-- Lib/Protocols/IdSSPI.pas | 3 +-- Lib/Protocols/IdServerInterceptLogBase.pas | 3 ++- Lib/Protocols/IdServerInterceptLogEvent.pas | 3 ++- Lib/Protocols/IdServerInterceptLogFile.pas | 3 ++- Lib/Protocols/IdSocksServer.pas | 4 ++-- Lib/Protocols/IdStrings.pas | 4 ++-- Lib/Protocols/IdSysLog.pas | 6 +++--- Lib/Protocols/IdSysLogMessage.pas | 6 +++--- Lib/Protocols/IdSysLogServer.pas | 9 +++------ Lib/Protocols/IdSystat.pas | 4 +++- Lib/Protocols/IdSystatServer.pas | 4 +++- Lib/Protocols/IdSystatUDP.pas | 4 +++- Lib/Protocols/IdSystatUDPServer.pas | 5 +++-- Lib/Protocols/IdTelnet.pas | 4 ++-- Lib/Protocols/IdTelnetServer.pas | 5 ++--- Lib/Protocols/IdText.pas | 4 ++-- Lib/Protocols/IdTime.pas | 4 ++-- Lib/Protocols/IdTimeServer.pas | 3 ++- Lib/Protocols/IdTimeUDP.pas | 4 ++-- Lib/Protocols/IdTimeUDPServer.pas | 4 ++-- Lib/Protocols/IdTrivialFTP.pas | 6 ++++-- Lib/Protocols/IdTrivialFTPBase.pas | 4 ++-- Lib/Protocols/IdTrivialFTPServer.pas | 10 ++++++---- Lib/Protocols/IdTunnelCommon.pas | 3 ++- Lib/Protocols/IdTunnelMaster.pas | 3 ++- Lib/Protocols/IdTunnelSlave.pas | 4 ++-- Lib/Protocols/IdURI.pas | 4 ++-- Lib/Protocols/IdUnixTime.pas | 4 ++-- Lib/Protocols/IdUnixTimeServer.pas | 4 ++-- Lib/Protocols/IdUnixTimeUDP.pas | 6 +++--- Lib/Protocols/IdUnixTimeUDPServer.pas | 4 ++-- Lib/Protocols/IdUserAccounts.pas | 7 +++---- Lib/Protocols/IdUserAccountsOTP.pas | 4 ++-- Lib/Protocols/IdUserPassProvider.pas | 4 ++-- Lib/Protocols/IdVCard.pas | 5 ++--- Lib/Protocols/IdWebDAV.pas | 4 ++-- Lib/Protocols/IdWhoIsServer.pas | 3 ++- Lib/Protocols/IdWhois.pas | 3 ++- Lib/Protocols/IdZLib.pas | 4 ++-- Lib/Protocols/IdZLibCompressorBase.pas | 4 ++-- Lib/Protocols/IdZLibConst.pas | 4 ++-- Lib/Protocols/IdZLibHeaders.pas | 3 +-- Lib/System/IdBaseComponent.pas | 3 +-- Lib/System/IdCTypes.pas | 4 ++-- Lib/System/IdComponent.pas | 4 ++-- Lib/System/IdException.pas | 3 +-- Lib/System/IdGlobal.pas | 4 ++-- Lib/System/IdIDN.pas | 3 +-- Lib/System/IdIconv.pas | 4 ++-- Lib/System/IdStack.pas | 4 ++-- Lib/System/IdStackBSDBase.pas | 5 ++--- Lib/System/IdStackConsts.pas | 4 ++-- Lib/System/IdStackVCLPosix.pas | 4 ++-- Lib/System/IdStackWindows.pas | 4 ++-- Lib/System/IdStream.pas | 4 ++-- Lib/System/IdStreamVCL.pas | 4 ++-- Lib/System/IdStruct.pas | 4 ++-- Lib/System/IdWinsock2.pas | 4 ++-- Lib/System/IdWship6.pas | 4 ++-- 328 files changed, 766 insertions(+), 771 deletions(-) diff --git a/Lib/Core/IdAboutVCL.pas b/Lib/Core/IdAboutVCL.pas index 36579bb0c..4ac6630c0 100644 --- a/Lib/Core/IdAboutVCL.pas +++ b/Lib/Core/IdAboutVCL.pas @@ -1,9 +1,9 @@ unit IdAboutVCL; -interface - {$I IdCompilerDefines.inc} +interface + uses {$IFDEF WIDGET_KYLIX} QStdCtrls, QForms, QExtCtrls, QControls, QComCtrls, QGraphics, Qt, @@ -12,7 +12,9 @@ interface StdCtrls, Buttons, ExtCtrls, Graphics, Controls, ComCtrls, Forms, {$ENDIF} {$IFDEF HAS_UNIT_Types} + {$IFNDEF FPC} Types, + {$ENDIF} {$ENDIF} {$IFDEF WIDGET_LCL} LResources, diff --git a/Lib/Core/IdAntiFreeze.pas b/Lib/Core/IdAntiFreeze.pas index 6d0d655b0..3f22a9e59 100644 --- a/Lib/Core/IdAntiFreeze.pas +++ b/Lib/Core/IdAntiFreeze.pas @@ -51,14 +51,16 @@ restriction. } -interface - {$I IdCompilerDefines.inc} +interface + uses Classes, - IdAntiFreezeBase, - IdBaseComponent; + IdAntiFreezeBase + {$IFNDEF FPC} + , IdBaseComponent + {$ENDIF}; { Directive needed for generating a legacy non-UnitScoped C++Builder HPP } @@ -145,7 +147,9 @@ implementation {$ENDIF} {$IFDEF WINDOWS} {$IFNDEF FMX} + {$IFNDEF FPC} Messages, + {$ENDIF} Windows, {$ENDIF} {$ENDIF} diff --git a/Lib/Core/IdCmdTCPClient.pas b/Lib/Core/IdCmdTCPClient.pas index 2d887477e..1f8979ba0 100644 --- a/Lib/Core/IdCmdTCPClient.pas +++ b/Lib/Core/IdCmdTCPClient.pas @@ -94,11 +94,10 @@ Original author: Sergio Perry Description: TCP client that uses CommandHandlers } +{$I IdCompilerDefines.inc} interface -{$I IdCompilerDefines.inc} - uses IdContext, IdException, @@ -177,9 +176,7 @@ EIdCmdTCPClientError = class(EIdException); EIdCmdTCPClientConnectError = class(EIdCmdTCPClientError); implementation - -uses - IdReplyRFC, SysUtils; +uses SysUtils; type TIdCmdClientContextAccess = class(TIdCmdClientContext) diff --git a/Lib/Core/IdCmdTCPServer.pas b/Lib/Core/IdCmdTCPServer.pas index 740bfb8ea..6a42bf343 100644 --- a/Lib/Core/IdCmdTCPServer.pas +++ b/Lib/Core/IdCmdTCPServer.pas @@ -150,11 +150,11 @@ unit IdCmdTCPServer; -interface - {$I IdCompilerDefines.inc} //Put FPC into Delphi mode +interface + uses Classes, IdCommandHandlers, diff --git a/Lib/Core/IdCommandHandlers.pas b/Lib/Core/IdCommandHandlers.pas index dcca2fbc5..8273e89cc 100644 --- a/Lib/Core/IdCommandHandlers.pas +++ b/Lib/Core/IdCommandHandlers.pas @@ -137,11 +137,12 @@ Separate Unit : Sergio Perry } -interface - {$I IdCompilerDefines.inc} //Put FPC into Delphi mode +interface + + uses Classes, IdComponent, IdReply, IdGlobal, diff --git a/Lib/Core/IdContext.pas b/Lib/Core/IdContext.pas index ae346e1e4..470468bde 100644 --- a/Lib/Core/IdContext.pas +++ b/Lib/Core/IdContext.pas @@ -64,10 +64,10 @@ unit IdContext; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdSocketHandle, IdTCPConnection, IdTask, IdYarn, IdThreadSafe, diff --git a/Lib/Core/IdCoreDsnRegister.pas b/Lib/Core/IdCoreDsnRegister.pas index ce5d21558..0b419144c 100644 --- a/Lib/Core/IdCoreDsnRegister.pas +++ b/Lib/Core/IdCoreDsnRegister.pas @@ -33,10 +33,10 @@ unit IdCoreDsnRegister; -interface - {$I IdCompilerDefines.inc} +interface + uses {$IFDEF DOTNET} Borland.Vcl.Design.DesignIntF, diff --git a/Lib/Core/IdCustomTCPServer.pas b/Lib/Core/IdCustomTCPServer.pas index 5314f3344..85b212bb0 100644 --- a/Lib/Core/IdCustomTCPServer.pas +++ b/Lib/Core/IdCustomTCPServer.pas @@ -248,12 +248,11 @@ Original Author and Maintainer: - Chad Z. Hower a.k.a Kudzu } - -interface - {$I IdCompilerDefines.inc} //here to flip FPC into Delphi mode +interface + uses Classes, {$IFDEF HAS_UNIT_Generics_Collections} diff --git a/Lib/Core/IdCustomTransparentProxy.pas b/Lib/Core/IdCustomTransparentProxy.pas index 02dfe0009..18a1bdffd 100644 --- a/Lib/Core/IdCustomTransparentProxy.pas +++ b/Lib/Core/IdCustomTransparentProxy.pas @@ -59,11 +59,12 @@ unit IdCustomTransparentProxy; -interface - {$I IdCompilerDefines.inc} //we need to put this in Delphi mode to work +interface + + uses Classes, IdComponent, diff --git a/Lib/Core/IdDsnPropEdBinding.pas b/Lib/Core/IdDsnPropEdBinding.pas index f62dc86aa..0fbc50c5c 100644 --- a/Lib/Core/IdDsnPropEdBinding.pas +++ b/Lib/Core/IdDsnPropEdBinding.pas @@ -76,11 +76,10 @@ TODO: Maybe there might be a way to find the location in a more elegant manner than what I described. } +{$I IdCompilerDefines.inc} interface -{$I IdCompilerDefines.inc} - {$IFDEF WIDGET_WINFORMS} {$R 'IdDsnPropEdBindingNET.TIdDsnPropEdBindingNET.resources' 'IdDsnPropEdBindingNET.resx'} {$ENDIF} diff --git a/Lib/Core/IdDsnPropEdBindingVCL.pas b/Lib/Core/IdDsnPropEdBindingVCL.pas index 3affadc78..06013c366 100644 --- a/Lib/Core/IdDsnPropEdBindingVCL.pas +++ b/Lib/Core/IdDsnPropEdBindingVCL.pas @@ -56,10 +56,10 @@ unit IdDsnPropEdBindingVCL; -interface - {$I IdCompilerDefines.inc} +interface + uses Classes, {$IFDEF WIDGET_KYLIX} @@ -68,11 +68,13 @@ interface {$IFDEF WIDGET_VCL_LIKE} ActnList, StdCtrls, Buttons, ExtCtrls, Graphics, Controls, ComCtrls, Forms, Dialogs, {$ENDIF} -{$IFDEF HAS_UNIT_Types} +{$IFNDEF FPC} + {$IFDEF HAS_UNIT_Types} Types, -{$ENDIF} -{$IFDEF WINDOWS} + {$ENDIF} + {$IFDEF WINDOWS} Windows, + {$ENDIF} {$ENDIF} {$IFDEF LCL} LResources, diff --git a/Lib/Core/IdExceptionCore.pas b/Lib/Core/IdExceptionCore.pas index d880b275a..cbffb9f2c 100644 --- a/Lib/Core/IdExceptionCore.pas +++ b/Lib/Core/IdExceptionCore.pas @@ -86,9 +86,11 @@ unit IdExceptionCore; -interface {$I IdCompilerDefines.inc} //needed to put FCP into Delphi mode + +interface + uses IdException, IdStack; diff --git a/Lib/Core/IdGlobalCore.pas b/Lib/Core/IdGlobalCore.pas index 566a1d1ad..178108cab 100644 --- a/Lib/Core/IdGlobalCore.pas +++ b/Lib/Core/IdGlobalCore.pas @@ -28,10 +28,10 @@ unit IdGlobalCore; -interface - {$I IdCompilerDefines.inc} +interface + uses Classes, IdGlobal; diff --git a/Lib/Core/IdIOHandler.pas b/Lib/Core/IdIOHandler.pas index 06b165780..c06dcd1d1 100644 --- a/Lib/Core/IdIOHandler.pas +++ b/Lib/Core/IdIOHandler.pas @@ -396,10 +396,10 @@ unit IdIOHandler; -interface - {$I IdCompilerDefines.inc} +interface + uses Classes, IdException, diff --git a/Lib/Core/IdIOHandlerSocket.pas b/Lib/Core/IdIOHandlerSocket.pas index c8b3367c0..df6f07014 100644 --- a/Lib/Core/IdIOHandlerSocket.pas +++ b/Lib/Core/IdIOHandlerSocket.pas @@ -138,10 +138,10 @@ unit IdIOHandlerSocket; -interface - {$I IdCompilerDefines.inc} +interface + uses Classes, IdCustomTransparentProxy, diff --git a/Lib/Core/IdIOHandlerStack.pas b/Lib/Core/IdIOHandlerStack.pas index d0f12c081..eb43bb2fb 100644 --- a/Lib/Core/IdIOHandlerStack.pas +++ b/Lib/Core/IdIOHandlerStack.pas @@ -177,10 +177,10 @@ unit IdIOHandlerStack; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, IdSocketHandle, IdIOHandlerSocket, IdExceptionCore, IdStack, @@ -211,8 +211,8 @@ implementation {$IFDEF WINDOWS} Windows, {$ENDIF} - IdAntiFreezeBase, IdResourceStringsCore, IdResourceStrings, IdStackConsts, IdException, - IdTCPConnection, IdComponent, IdIOHandler, IdCustomTransparentProxy; + IdAntiFreezeBase, IdResourceStringsCore, IdStackConsts, IdException, + IdComponent, IdIOHandler, IdCustomTransparentProxy; type TIdConnectThread = class(TThread) diff --git a/Lib/Core/IdIOHandlerStream.pas b/Lib/Core/IdIOHandlerStream.pas index 1572a054b..f687021da 100644 --- a/Lib/Core/IdIOHandlerStream.pas +++ b/Lib/Core/IdIOHandlerStream.pas @@ -114,10 +114,10 @@ unit IdIOHandlerStream; -interface - {$I IdCompilerDefines.inc} +interface + uses Classes, IdBaseComponent, diff --git a/Lib/Core/IdIPAddress.pas b/Lib/Core/IdIPAddress.pas index c8b10e861..df920ae53 100644 --- a/Lib/Core/IdIPAddress.pas +++ b/Lib/Core/IdIPAddress.pas @@ -61,11 +61,11 @@ unit IdIPAddress; -interface - {$I IdCompilerDefines.inc} //we need to put this in Delphi mode to work +interface + uses Classes, IdGlobal; diff --git a/Lib/Core/IdIPMCastBase.pas b/Lib/Core/IdIPMCastBase.pas index 096e65d30..149534ac8 100644 --- a/Lib/Core/IdIPMCastBase.pas +++ b/Lib/Core/IdIPMCastBase.pas @@ -33,11 +33,12 @@ unit IdIPMCastBase; -interface - {$I IdCompilerDefines.inc} //here to flip FPC into Delphi mode +interface + + uses {$IFDEF WORKAROUND_INLINE_CONSTRUCTORS} Classes, @@ -132,7 +133,8 @@ implementation uses IdAssignedNumbers, - IdResourceStringsCore, IdStackConsts, SysUtils; + IdResourceStringsCore, + SysUtils; { TIdIPMCastBase } diff --git a/Lib/Core/IdIPMCastClient.pas b/Lib/Core/IdIPMCastClient.pas index e28838e3a..e0bd2cd93 100644 --- a/Lib/Core/IdIPMCastClient.pas +++ b/Lib/Core/IdIPMCastClient.pas @@ -39,11 +39,11 @@ unit IdIPMCastClient; -interface - {$I IdCompilerDefines.inc} //Put FPC into Delphi mode +interface + uses Classes, IdException, diff --git a/Lib/Core/IdIPMCastServer.pas b/Lib/Core/IdIPMCastServer.pas index 01acc1837..cc38a8caf 100644 --- a/Lib/Core/IdIPMCastServer.pas +++ b/Lib/Core/IdIPMCastServer.pas @@ -51,11 +51,11 @@ Dr. Harley J. Mackenzie, Initial revision. } -interface - {$I IdCompilerDefines.inc} //Put FPC into Delphi mode +interface + uses IdComponent, IdGlobal, diff --git a/Lib/Core/IdIcmpClient.pas b/Lib/Core/IdIcmpClient.pas index 0d6bead53..a43467b12 100644 --- a/Lib/Core/IdIcmpClient.pas +++ b/Lib/Core/IdIcmpClient.pas @@ -67,18 +67,17 @@ // SG 25/1/02: Modified the component to support multithreaded PING and traceroute -interface - {$I IdCompilerDefines.inc} //Put FPC into Delphi mode +interface + uses Classes, IdGlobal, IdRawBase, IdRawClient, - IdStackConsts, - IdBaseComponent; + IdStackConsts; const DEF_PACKET_SIZE = 32; @@ -210,9 +209,11 @@ TIdIcmpClient = class(TIdCustomIcmpClient) implementation uses + {$IFNDEF FPC} //facilitate inlining only. - {$IFDEF WINDOWS} - Windows, + {$IFDEF WINDOWS} + Windows, + {$ENDIF} {$ENDIF} {$IFDEF USE_VCL_POSIX} {$IFDEF OSX} diff --git a/Lib/Core/IdIntercept.pas b/Lib/Core/IdIntercept.pas index aef5dc53b..3375ffd39 100644 --- a/Lib/Core/IdIntercept.pas +++ b/Lib/Core/IdIntercept.pas @@ -61,14 +61,15 @@ unit IdIntercept; -interface - {$I IdCompilerDefines.inc} //here only to put FPC in Delphi mode +interface + uses Classes, - IdGlobal, IdBaseComponent, IdBuffer, IdException; + IdException, + IdGlobal, IdBaseComponent; type EIdInterceptCircularLink = class(EIdException); diff --git a/Lib/Core/IdInterceptSimLog.pas b/Lib/Core/IdInterceptSimLog.pas index cc5bd4b79..b023d33ee 100644 --- a/Lib/Core/IdInterceptSimLog.pas +++ b/Lib/Core/IdInterceptSimLog.pas @@ -48,13 +48,13 @@ TODO: Can also change it to detect several EOLs and non binary and use :Lines:x } +{$i IdCompilerDefines.inc} interface -{$i IdCompilerDefines.inc} uses Classes, - IdGlobal, IdIntercept, IdBaseComponent; + IdGlobal, IdIntercept; type TIdInterceptSimLog = class(TIdConnectionIntercept) @@ -77,10 +77,12 @@ TIdInterceptSimLog = class(TIdConnectionIntercept) implementation uses - {$IFDEF DOTNET} + {$IFNDEF FPC} + {$IFDEF DOTNET} IdStreamNET, {$ELSE} IdStreamVCL, + {$ENDIF} {$ENDIF} IdException, IdResourceStringsCore, SysUtils; diff --git a/Lib/Core/IdInterceptThrottler.pas b/Lib/Core/IdInterceptThrottler.pas index 89f171f13..ea5a77808 100644 --- a/Lib/Core/IdInterceptThrottler.pas +++ b/Lib/Core/IdInterceptThrottler.pas @@ -36,9 +36,10 @@ unit IdInterceptThrottler; -interface {$i IdCompilerDefines.inc} +interface + uses IdComponent, IdIntercept, IdGlobal; @@ -61,7 +62,7 @@ TIdInterceptThrottler = class(TIdConnectionIntercept) implementation uses - IdAntiFreezeBase, IdException; + IdAntiFreezeBase; { TIdInterceptThrottler } diff --git a/Lib/Core/IdLogBase.pas b/Lib/Core/IdLogBase.pas index 843def06c..e04b6c172 100644 --- a/Lib/Core/IdLogBase.pas +++ b/Lib/Core/IdLogBase.pas @@ -36,11 +36,11 @@ unit IdLogBase; -interface - {$I IdCompilerDefines.inc} //Put FPC into Delphi mode +interface + uses Classes, IdIntercept, IdGlobal, IdBaseComponent; diff --git a/Lib/Core/IdLogDebug.pas b/Lib/Core/IdLogDebug.pas index e021bd744..8cdbb7f1c 100644 --- a/Lib/Core/IdLogDebug.pas +++ b/Lib/Core/IdLogDebug.pas @@ -33,9 +33,11 @@ unit IdLogDebug; -interface {$I IdCompilerDefines.inc} //Put FPC into Delphi mode + +interface + uses IdLogBase; diff --git a/Lib/Core/IdLogEvent.pas b/Lib/Core/IdLogEvent.pas index d2de64bea..a0bf78bb6 100644 --- a/Lib/Core/IdLogEvent.pas +++ b/Lib/Core/IdLogEvent.pas @@ -27,11 +27,12 @@ unit IdLogEvent; -interface - {$I IdCompilerDefines.inc} //Put FPC into Delphi mode +interface + + uses IdLogBase, Classes; diff --git a/Lib/Core/IdLogFile.pas b/Lib/Core/IdLogFile.pas index 62afd1ccd..9c9627efe 100644 --- a/Lib/Core/IdLogFile.pas +++ b/Lib/Core/IdLogFile.pas @@ -59,11 +59,12 @@ unit IdLogFile; -interface - {$I IdCompilerDefines.inc} //Put FPC into Delphi mode +interface + + uses Classes, IdLogBase; diff --git a/Lib/Core/IdLogStream.pas b/Lib/Core/IdLogStream.pas index ead5baa6e..797e19311 100644 --- a/Lib/Core/IdLogStream.pas +++ b/Lib/Core/IdLogStream.pas @@ -36,11 +36,11 @@ unit IdLogStream; -interface - {$I IdCompilerDefines.inc} //Put FPC into Delphi mode +interface + uses Classes, IdLogBase, IdGlobal; diff --git a/Lib/Core/IdRawClient.pas b/Lib/Core/IdRawClient.pas index 29d8daea7..c949e7359 100644 --- a/Lib/Core/IdRawClient.pas +++ b/Lib/Core/IdRawClient.pas @@ -21,9 +21,10 @@ unit IdRawClient; -interface {$i IdCompilerDefines.inc} +interface + uses IdGlobal, IdRawBase; diff --git a/Lib/Core/IdRawFunctions.pas b/Lib/Core/IdRawFunctions.pas index c7f90f36e..4eb511ee5 100644 --- a/Lib/Core/IdRawFunctions.pas +++ b/Lib/Core/IdRawFunctions.pas @@ -39,10 +39,10 @@ unit IdRawFunctions; -interface - {$i IdCompilerDefines.inc} +interface + uses IdGlobal, IdRawHeaders, IdStack; diff --git a/Lib/Core/IdRawHeaders.pas b/Lib/Core/IdRawHeaders.pas index 2c6c32d87..f15dc4dab 100644 --- a/Lib/Core/IdRawHeaders.pas +++ b/Lib/Core/IdRawHeaders.pas @@ -30,10 +30,10 @@ unit IdRawHeaders; -interface - {$I IdCompilerDefines.inc} +interface + uses {$IFDEF DOTNET} System.Net, diff --git a/Lib/Core/IdRegisterCore.pas b/Lib/Core/IdRegisterCore.pas index e5ec3e086..997055e3f 100644 --- a/Lib/Core/IdRegisterCore.pas +++ b/Lib/Core/IdRegisterCore.pas @@ -102,6 +102,8 @@ unit IdRegisterCore; +{$I IdCompilerDefines.inc} + interface // Procedures @@ -110,8 +112,6 @@ interface implementation -{$I IdCompilerDefines.inc} - uses Classes, {$IFDEF FMX} diff --git a/Lib/Core/IdReply.pas b/Lib/Core/IdReply.pas index fb2733f5b..04412a6a0 100644 --- a/Lib/Core/IdReply.pas +++ b/Lib/Core/IdReply.pas @@ -112,11 +112,11 @@ unit IdReply; -interface - {$I IdCompilerDefines.inc} //we need to put this in Delphi mode to work +interface + uses Classes, IdException; diff --git a/Lib/Core/IdReplyRFC.pas b/Lib/Core/IdReplyRFC.pas index baf47dd3b..c91d4ca6c 100644 --- a/Lib/Core/IdReplyRFC.pas +++ b/Lib/Core/IdReplyRFC.pas @@ -121,8 +121,10 @@ unit IdReplyRFC; -interface {$I IdCompilerDefines.inc} + +interface + uses Classes, IdReply; diff --git a/Lib/Core/IdScheduler.pas b/Lib/Core/IdScheduler.pas index ca0c883a6..284b675f0 100644 --- a/Lib/Core/IdScheduler.pas +++ b/Lib/Core/IdScheduler.pas @@ -64,10 +64,10 @@ unit IdScheduler; -interface - {$i IdCompilerDefines.inc} +interface + uses {$IFDEF HAS_UNIT_Generics_Collections} System.Generics.Collections, diff --git a/Lib/Core/IdSchedulerOfThread.pas b/Lib/Core/IdSchedulerOfThread.pas index b3658d69b..8ebdeb324 100644 --- a/Lib/Core/IdSchedulerOfThread.pas +++ b/Lib/Core/IdSchedulerOfThread.pas @@ -126,9 +126,10 @@ unit IdSchedulerOfThread; -interface {$i IdCompilerDefines.inc} +interface + uses Classes, IdException, IdGlobal, IdScheduler, diff --git a/Lib/Core/IdSchedulerOfThreadDefault.pas b/Lib/Core/IdSchedulerOfThreadDefault.pas index ef744556d..eb29c6918 100644 --- a/Lib/Core/IdSchedulerOfThreadDefault.pas +++ b/Lib/Core/IdSchedulerOfThreadDefault.pas @@ -63,9 +63,10 @@ unit IdSchedulerOfThreadDefault; -interface {$i IdCompilerDefines.inc} +interface + uses IdThread, IdSchedulerOfThread, IdScheduler, IdYarn; diff --git a/Lib/Core/IdSchedulerOfThreadPool.pas b/Lib/Core/IdSchedulerOfThreadPool.pas index 6f41612a0..95693106b 100644 --- a/Lib/Core/IdSchedulerOfThreadPool.pas +++ b/Lib/Core/IdSchedulerOfThreadPool.pas @@ -66,17 +66,16 @@ unit IdSchedulerOfThreadPool; -interface - {$i IdCompilerDefines.inc} +interface + uses {$IFDEF HAS_UNIT_Generics_Collections} System.Generics.Collections, {$ELSE} Classes, {$ENDIF} - IdContext, IdScheduler, IdSchedulerOfThread, IdThread, diff --git a/Lib/Core/IdServerIOHandler.pas b/Lib/Core/IdServerIOHandler.pas index 7c40635bf..58a280fa3 100644 --- a/Lib/Core/IdServerIOHandler.pas +++ b/Lib/Core/IdServerIOHandler.pas @@ -46,9 +46,10 @@ unit IdServerIOHandler; -interface {$i IdCompilerDefines.inc} +interface + uses Classes, IdSocketHandle, IdComponent, IdIOHandlerStack, diff --git a/Lib/Core/IdServerIOHandlerSocket.pas b/Lib/Core/IdServerIOHandlerSocket.pas index 8b3e4e1e1..a79f1e5ed 100644 --- a/Lib/Core/IdServerIOHandlerSocket.pas +++ b/Lib/Core/IdServerIOHandlerSocket.pas @@ -75,9 +75,10 @@ unit IdServerIOHandlerSocket; -interface {$i IdCompilerDefines.inc} +interface + uses IdSocketHandle, IdGlobal, IdThread, IdServerIOHandler, IdIOHandler, IdIOHandlerSocket, IdYarn; diff --git a/Lib/Core/IdServerIOHandlerStack.pas b/Lib/Core/IdServerIOHandlerStack.pas index 23c80a9ab..0e665937f 100644 --- a/Lib/Core/IdServerIOHandlerStack.pas +++ b/Lib/Core/IdServerIOHandlerStack.pas @@ -55,9 +55,10 @@ unit IdServerIOHandlerStack; -interface {$i IdCompilerDefines.inc} +interface + uses IdIOHandler, IdIOHandlerStack, IdServerIOHandlerSocket, IdYarn; diff --git a/Lib/Core/IdSimpleServer.pas b/Lib/Core/IdSimpleServer.pas index 1a6b0c214..a55fef4b0 100644 --- a/Lib/Core/IdSimpleServer.pas +++ b/Lib/Core/IdSimpleServer.pas @@ -91,10 +91,10 @@ } unit IdSimpleServer; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdException, diff --git a/Lib/Core/IdSocketHandle.pas b/Lib/Core/IdSocketHandle.pas index 00b88b045..171c8e3c8 100644 --- a/Lib/Core/IdSocketHandle.pas +++ b/Lib/Core/IdSocketHandle.pas @@ -125,10 +125,10 @@ unit IdSocketHandle; -interface - {$I IdCompilerDefines.inc} +interface + uses Classes, IdException, IdGlobal, IdStackConsts, IdStack; diff --git a/Lib/Core/IdSocks.pas b/Lib/Core/IdSocks.pas index e4bc4349e..110a00fda 100644 --- a/Lib/Core/IdSocks.pas +++ b/Lib/Core/IdSocks.pas @@ -182,11 +182,12 @@ } unit IdSocks; -interface - {$I IdCompilerDefines.inc} //we need to put this in Delphi mode to work. +interface + + uses Classes, IdAssignedNumbers, IdException, IdBaseComponent, diff --git a/Lib/Core/IdTCPConnection.pas b/Lib/Core/IdTCPConnection.pas index 7a7bfdffe..7e95a6a13 100644 --- a/Lib/Core/IdTCPConnection.pas +++ b/Lib/Core/IdTCPConnection.pas @@ -308,10 +308,10 @@ } unit IdTCPConnection; -interface - {$i IdCompilerDefines.inc} +interface + { 2003-12-14 - Ciaran Costelloe - Added procedure ChangeReplyClass, because in .NET, you cannot set FReplyClass @@ -356,9 +356,7 @@ interface IdIntercept, IdIOHandler, IdIOHandlerSocket, - IdIOHandlerStack, IdReply, - IdSocketHandle, IdBaseComponent; type diff --git a/Lib/Core/IdTCPServer.pas b/Lib/Core/IdTCPServer.pas index 84b2d447d..c78ed7e70 100644 --- a/Lib/Core/IdTCPServer.pas +++ b/Lib/Core/IdTCPServer.pas @@ -22,9 +22,10 @@ unit IdTCPServer; -interface {$i IdCompilerDefines.inc} +interface + uses IdCustomTCPServer; type diff --git a/Lib/Core/IdTCPStream.pas b/Lib/Core/IdTCPStream.pas index 981bb4d0d..ed4b87d68 100644 --- a/Lib/Core/IdTCPStream.pas +++ b/Lib/Core/IdTCPStream.pas @@ -60,9 +60,10 @@ unit IdTCPStream; +{$I IdCompilerDefines.inc} + interface -{$I IdCompilerDefines.inc} //TODO: This should be renamed to IdStreamTCP for consistency, and class too uses @@ -88,7 +89,6 @@ TIdTCPStream = class(TIdBaseStream) implementation uses - IdException, SysUtils; constructor TIdTCPStream.Create(AConnection: TIdTCPConnection; const AWriteThreshold: Integer = 0); diff --git a/Lib/Core/IdTask.pas b/Lib/Core/IdTask.pas index 8e5cec3d0..54615f9d5 100644 --- a/Lib/Core/IdTask.pas +++ b/Lib/Core/IdTask.pas @@ -25,9 +25,10 @@ unit IdTask; -interface {$i IdCompilerDefines.inc} +interface + uses {$IFDEF USE_OBJECT_ARC} IdGlobal, diff --git a/Lib/Core/IdThread.pas b/Lib/Core/IdThread.pas index b63cbb7ab..1c122b8a4 100644 --- a/Lib/Core/IdThread.pas +++ b/Lib/Core/IdThread.pas @@ -144,10 +144,10 @@ -TIdThreadOptions } -interface - {$I IdCompilerDefines.inc} +interface + // RLebeau: On OSX/iOS, an auto-release object pool should be used to clean up // Objective-C objects that are created within a thread. On Android, any thread // that uses Java objects will attach to the JVM and must be detached from the diff --git a/Lib/Core/IdThreadComponent.pas b/Lib/Core/IdThreadComponent.pas index 986b55d67..89783e3f7 100644 --- a/Lib/Core/IdThreadComponent.pas +++ b/Lib/Core/IdThreadComponent.pas @@ -80,11 +80,11 @@ History: Based on my TmcThread } -interface - {$I IdCompilerDefines.inc} //Put FPC into Delphi mode +interface + uses Classes, IdBaseComponent, IdException, IdGlobal, IdThread, SysUtils; diff --git a/Lib/Core/IdThreadSafe.pas b/Lib/Core/IdThreadSafe.pas index 0abd94773..9c426ddcd 100644 --- a/Lib/Core/IdThreadSafe.pas +++ b/Lib/Core/IdThreadSafe.pas @@ -54,11 +54,11 @@ unit IdThreadSafe; -interface - {$I IdCompilerDefines.inc} //we need to put this in Delphi mode to work +interface + uses Classes, {$IFDEF HAS_UNIT_Generics_Collections} diff --git a/Lib/Core/IdTraceRoute.pas b/Lib/Core/IdTraceRoute.pas index 7bf4de1de..d377f7156 100644 --- a/Lib/Core/IdTraceRoute.pas +++ b/Lib/Core/IdTraceRoute.pas @@ -18,15 +18,15 @@ unit IdTraceRoute; -interface - {$i IdCompilerDefines.inc} +interface + uses {$IFDEF DOTNET_2_OR_ABOVE} IdGlobal, {$ENDIF} - IdIcmpClient, IdRawBase, IdRawClient, IdThread; + IdIcmpClient, IdRawBase, IdThread; type TIdTraceRoute = class(TIdCustomICMPClient) diff --git a/Lib/Core/IdUDPBase.pas b/Lib/Core/IdUDPBase.pas index 5c64642be..27da674d5 100644 --- a/Lib/Core/IdUDPBase.pas +++ b/Lib/Core/IdUDPBase.pas @@ -70,11 +70,11 @@ unit IdUDPBase; -interface - {$I IdCompilerDefines.inc} //here to flip FPC into Delphi mode +interface + uses IdComponent, IdGlobal, diff --git a/Lib/Core/IdUDPClient.pas b/Lib/Core/IdUDPClient.pas index 16bd223a7..72fcc4e41 100644 --- a/Lib/Core/IdUDPClient.pas +++ b/Lib/Core/IdUDPClient.pas @@ -66,11 +66,11 @@ unit IdUDPClient; -interface - {$I IdCompilerDefines.inc} //Put FPC into Delphi mode +interface + uses Classes, IdUDPBase, diff --git a/Lib/Core/IdUDPServer.pas b/Lib/Core/IdUDPServer.pas index 264eb9761..062df8e72 100644 --- a/Lib/Core/IdUDPServer.pas +++ b/Lib/Core/IdUDPServer.pas @@ -67,11 +67,12 @@ unit IdUDPServer; -interface - {$I IdCompilerDefines.inc} //Put FPC into Delphi mode +interface + + uses Classes, {$IFDEF HAS_UNIT_Generics_Collections} diff --git a/Lib/Core/IdYarn.pas b/Lib/Core/IdYarn.pas index 40470890f..c28f447b7 100644 --- a/Lib/Core/IdYarn.pas +++ b/Lib/Core/IdYarn.pas @@ -31,10 +31,10 @@ unit IdYarn; -interface - {$i IdCompilerDefines.inc} +interface + type TIdYarn = class(TObject) end; diff --git a/Lib/Protocols/IdAttachment.pas b/Lib/Protocols/IdAttachment.pas index 863a8ed2c..1de403980 100644 --- a/Lib/Protocols/IdAttachment.pas +++ b/Lib/Protocols/IdAttachment.pas @@ -45,14 +45,13 @@ unit IdAttachment; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, - IdMessageParts, - IdBaseComponent; + IdMessageParts; type TIdAttachment = class(TIdMessagePart) diff --git a/Lib/Protocols/IdAttachmentFile.pas b/Lib/Protocols/IdAttachmentFile.pas index bf37e4e23..a531a106c 100644 --- a/Lib/Protocols/IdAttachmentFile.pas +++ b/Lib/Protocols/IdAttachmentFile.pas @@ -33,10 +33,10 @@ unit IdAttachmentFile; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdAttachment, diff --git a/Lib/Protocols/IdAttachmentMemory.pas b/Lib/Protocols/IdAttachmentMemory.pas index 28a468799..81abb40c3 100644 --- a/Lib/Protocols/IdAttachmentMemory.pas +++ b/Lib/Protocols/IdAttachmentMemory.pas @@ -48,10 +48,10 @@ } unit IdAttachmentMemory; -interface - {$I IdCompilerDefines.inc} +interface + uses Classes, IdAttachment, IdMessageParts, IdGlobal; diff --git a/Lib/Protocols/IdAuthentication.pas b/Lib/Protocols/IdAuthentication.pas index ea7010b83..cdfe50149 100644 --- a/Lib/Protocols/IdAuthentication.pas +++ b/Lib/Protocols/IdAuthentication.pas @@ -45,10 +45,10 @@ Author: Doychin Bondzhev (doychin@dsoft-bg.com) } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdHeaderList, @@ -119,7 +119,7 @@ EIdAlreadyRegisteredAuthenticationMethod = class(EIdException); implementation uses - IdCoderMIME, IdGlobalProtocols, IdResourceStringsProtocols, + IdCoderMIME, IdGlobalProtocols, {$IFDEF HAS_UNIT_Generics_Collections} System.Generics.Collections, {$ENDIF} diff --git a/Lib/Protocols/IdAuthenticationDigest.pas b/Lib/Protocols/IdAuthenticationDigest.pas index 0a295063e..024cd96c9 100644 --- a/Lib/Protocols/IdAuthenticationDigest.pas +++ b/Lib/Protocols/IdAuthenticationDigest.pas @@ -45,17 +45,16 @@ Copyright: (c) Chad Z. Hower and The Winshoes Working Group. } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdAuthentication, IdException, IdGlobal, - IdHashMessageDigest, - IdHeaderList; + IdHashMessageDigest; type EIdInvalidAlgorithm = class(EIdException); @@ -97,7 +96,7 @@ TIdDigestAuthentication = class(TIdAuthentication) implementation uses - IdGlobalProtocols, IdFIPS, IdHash, IdResourceStrings, IdResourceStringsProtocols, + IdGlobalProtocols, IdFIPS, IdHash, IdResourceStringsProtocols, SysUtils; { TIdDigestAuthentication } diff --git a/Lib/Protocols/IdAuthenticationManager.pas b/Lib/Protocols/IdAuthenticationManager.pas index c1fd2abf6..359d2fd53 100644 --- a/Lib/Protocols/IdAuthenticationManager.pas +++ b/Lib/Protocols/IdAuthenticationManager.pas @@ -33,10 +33,10 @@ unit IdAuthenticationManager; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdAuthentication, diff --git a/Lib/Protocols/IdAuthenticationNTLM.pas b/Lib/Protocols/IdAuthenticationNTLM.pas index 31185100f..ce6f06e2f 100644 --- a/Lib/Protocols/IdAuthenticationNTLM.pas +++ b/Lib/Protocols/IdAuthenticationNTLM.pas @@ -39,13 +39,12 @@ to properly format the Type 1 message. } +{$i IdCompilerDefines.inc} unit IdAuthenticationNTLM; interface -{$i IdCompilerDefines.inc} - uses Classes, IdAuthentication; diff --git a/Lib/Protocols/IdAuthenticationSSPI.pas b/Lib/Protocols/IdAuthenticationSSPI.pas index 83444e9b6..0fce6be63 100644 --- a/Lib/Protocols/IdAuthenticationSSPI.pas +++ b/Lib/Protocols/IdAuthenticationSSPI.pas @@ -36,12 +36,12 @@ Copyright: (c) Chad Z. Hower and The Winshoes Working Group. } +{$i IdCompilerDefines.inc} + {$DEFINE SET_ENCRYPT_IN_FT_WITH_GETPROCADDRESS_FUDGE} interface -{$i IdCompilerDefines.inc} - uses IdGlobal, IdAuthentication, @@ -433,9 +433,7 @@ TIdSSPINTLMAuthentication = class(TIdAuthentication) implementation uses - IdGlobalCore, IdGlobalProtocols, - IdException, IdCoderMIME, IdResourceStringsSSPI, IdHeaderList; diff --git a/Lib/Protocols/IdBlockCipherIntercept.pas b/Lib/Protocols/IdBlockCipherIntercept.pas index bffe17817..7df178a7f 100644 --- a/Lib/Protocols/IdBlockCipherIntercept.pas +++ b/Lib/Protocols/IdBlockCipherIntercept.pas @@ -38,10 +38,10 @@ Purpose: Secure communications } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, diff --git a/Lib/Protocols/IdChargenServer.pas b/Lib/Protocols/IdChargenServer.pas index 41a290e70..6ce97857c 100644 --- a/Lib/Protocols/IdChargenServer.pas +++ b/Lib/Protocols/IdChargenServer.pas @@ -41,10 +41,11 @@ Original Author: Ozz Nixon } -interface - {$i IdCompilerDefines.inc} + +interface + uses IdAssignedNumbers, IdContext, diff --git a/Lib/Protocols/IdChargenUDPServer.pas b/Lib/Protocols/IdChargenUDPServer.pas index b2b4d91b9..05318b2a9 100644 --- a/Lib/Protocols/IdChargenUDPServer.pas +++ b/Lib/Protocols/IdChargenUDPServer.pas @@ -37,9 +37,10 @@ unit IdChargenUDPServer; -interface {$i IdCompilerDefines.inc} +interface + uses IdAssignedNumbers, IdGlobal, IdSocketHandle, IdUDPBase, IdUDPServer; diff --git a/Lib/Protocols/IdCharsets.pas b/Lib/Protocols/IdCharsets.pas index 16beec3ba..86e8369ff 100644 --- a/Lib/Protocols/IdCharsets.pas +++ b/Lib/Protocols/IdCharsets.pas @@ -119,10 +119,10 @@ revised character set from the original character set. } -interface - {$i IdCompilerDefines.inc} +interface + // once upon a time Indy had 3 different declarations of TIdCharSet // now all use this one. For reference, one of the more widely used // enums and the equivalents in the full enum is listed here: diff --git a/Lib/Protocols/IdCoder.pas b/Lib/Protocols/IdCoder.pas index 7f430d587..b6c1a367e 100644 --- a/Lib/Protocols/IdCoder.pas +++ b/Lib/Protocols/IdCoder.pas @@ -89,10 +89,10 @@ } unit IdCoder; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdBaseComponent, @@ -160,11 +160,6 @@ TIdDecoderClass = class of TIdDecoder; implementation uses - {$IFDEF DOTNET} - IdStreamNET, - {$ELSE} - IdStreamVCL, - {$ENDIF} IdGlobalProtocols, SysUtils; { TIdDecoder } diff --git a/Lib/Protocols/IdCoder00E.pas b/Lib/Protocols/IdCoder00E.pas index 40cbaca89..b1ad3b2d3 100644 --- a/Lib/Protocols/IdCoder00E.pas +++ b/Lib/Protocols/IdCoder00E.pas @@ -34,10 +34,10 @@ unit IdCoder00E; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdCoder3to4; diff --git a/Lib/Protocols/IdCoder3to4.pas b/Lib/Protocols/IdCoder3to4.pas index 0884dfc70..74ab53a38 100644 --- a/Lib/Protocols/IdCoder3to4.pas +++ b/Lib/Protocols/IdCoder3to4.pas @@ -152,10 +152,10 @@ } unit IdCoder3to4; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdCoder, @@ -195,7 +195,7 @@ TIdDecoder4to3 = class(TIdDecoder) implementation uses - IdException, IdResourceStrings, IdStream; + IdStream; { TIdDecoder4to3 } diff --git a/Lib/Protocols/IdCoderBinHex4.pas b/Lib/Protocols/IdCoderBinHex4.pas index d89699e8b..703865988 100644 --- a/Lib/Protocols/IdCoderBinHex4.pas +++ b/Lib/Protocols/IdCoderBinHex4.pas @@ -147,10 +147,10 @@ ContentTransfer := 'binhex40'. } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdException, diff --git a/Lib/Protocols/IdCoderHeader.pas b/Lib/Protocols/IdCoderHeader.pas index 7dc5ad9ad..9b69c7d48 100644 --- a/Lib/Protocols/IdCoderHeader.pas +++ b/Lib/Protocols/IdCoderHeader.pas @@ -92,10 +92,10 @@ - tiny fix for 8bit header encoding suggested by Andrew P.Rybin } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdComponent, @@ -116,7 +116,6 @@ interface implementation uses - IdException, IdGlobal, IdGlobalProtocols, IdAllHeaderCoders, diff --git a/Lib/Protocols/IdCoderMIME.pas b/Lib/Protocols/IdCoderMIME.pas index eb63d64f3..238df9145 100644 --- a/Lib/Protocols/IdCoderMIME.pas +++ b/Lib/Protocols/IdCoderMIME.pas @@ -30,10 +30,10 @@ unit IdCoderMIME; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdCoder3to4, @@ -82,8 +82,6 @@ implementation uses {$IFDEF DOTNET} IdStreamNET, - {$ELSE} - IdStreamVCL, {$ENDIF} SysUtils; diff --git a/Lib/Protocols/IdCoderQuotedPrintable.pas b/Lib/Protocols/IdCoderQuotedPrintable.pas index 8badccc58..569d98610 100644 --- a/Lib/Protocols/IdCoderQuotedPrintable.pas +++ b/Lib/Protocols/IdCoderQuotedPrintable.pas @@ -102,10 +102,10 @@ unit IdCoderQuotedPrintable; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdCoder, diff --git a/Lib/Protocols/IdCoderTNEF.pas b/Lib/Protocols/IdCoderTNEF.pas index 1a2aa3583..ba8ec7f05 100644 --- a/Lib/Protocols/IdCoderTNEF.pas +++ b/Lib/Protocols/IdCoderTNEF.pas @@ -88,10 +88,10 @@ See the "TODO"s in the code below. } -interface - {$I IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, diff --git a/Lib/Protocols/IdCoderXXE.pas b/Lib/Protocols/IdCoderXXE.pas index 0d72f4fa7..ef004923e 100644 --- a/Lib/Protocols/IdCoderXXE.pas +++ b/Lib/Protocols/IdCoderXXE.pas @@ -33,10 +33,10 @@ unit IdCoderXXE; -interface - {$i IdCompilerDefines.inc} +interface + uses {$IFDEF WORKAROUND_INLINE_CONSTRUCTORS} Classes, diff --git a/Lib/Protocols/IdCompressionIntercept.pas b/Lib/Protocols/IdCompressionIntercept.pas index 43b7bae2d..127ad6c16 100644 --- a/Lib/Protocols/IdCompressionIntercept.pas +++ b/Lib/Protocols/IdCompressionIntercept.pas @@ -87,20 +87,18 @@ Sofware Corporation. No warranties, express or implied are given with this source file. } -interface {$I IdCompilerDefines.inc} +interface + uses Classes, IdException, IdGlobal, IdGlobalProtocols, IdIntercept, - IdTCPClient, - IdTCPConnection, - IdZLibHeaders, - IdZLib; + IdZLibHeaders; type EIdCompressionException = class(EIdException); diff --git a/Lib/Protocols/IdCompressorZLib.pas b/Lib/Protocols/IdCompressorZLib.pas index 453b92e60..26d406b88 100644 --- a/Lib/Protocols/IdCompressorZLib.pas +++ b/Lib/Protocols/IdCompressorZLib.pas @@ -56,9 +56,10 @@ unit IdCompressorZLib; -interface {$i IdCompilerDefines.inc} +interface + uses Classes, IdException, diff --git a/Lib/Protocols/IdConnectThroughHttpProxy.pas b/Lib/Protocols/IdConnectThroughHttpProxy.pas index a8207121c..4ee5e9904 100644 --- a/Lib/Protocols/IdConnectThroughHttpProxy.pas +++ b/Lib/Protocols/IdConnectThroughHttpProxy.pas @@ -44,9 +44,10 @@ http://www.web-cache.com/Writings/Internet-Drafts/draft-luotonen-web-proxy-tunneling-01.txt } -interface {$i IdCompilerDefines.inc} +interface + uses Classes, IdCustomTransparentProxy, IdGlobal, IdIOHandler; diff --git a/Lib/Protocols/IdContainers.pas b/Lib/Protocols/IdContainers.pas index 57f592892..ca2cfda84 100644 --- a/Lib/Protocols/IdContainers.pas +++ b/Lib/Protocols/IdContainers.pas @@ -60,10 +60,10 @@ unit IdContainers; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes {$IFDEF HAS_UNIT_Generics_Collections} diff --git a/Lib/Protocols/IdCookie.pas b/Lib/Protocols/IdCookie.pas index 737a62a18..7f51dff42 100644 --- a/Lib/Protocols/IdCookie.pas +++ b/Lib/Protocols/IdCookie.pas @@ -67,10 +67,10 @@ http://www.ietf.org/id/draft-pettersen-cookie-v2-05.txt } -interface - {$I IdCompilerDefines.inc} +interface + uses Classes, {$IFDEF HAS_UNIT_Generics_Collections} @@ -203,11 +203,10 @@ function CanonicalizeHostName(const AHost: String): String; implementation -uses {$IFDEF VCL_XE3_OR_ABOVE} - System.Types, +uses + System.Types; {$ENDIF} - IdAssignedNumbers, IdResourceStringsProtocols; function GetDefaultPath(const AURL: TIdURI): String; var diff --git a/Lib/Protocols/IdCookieManager.pas b/Lib/Protocols/IdCookieManager.pas index c58121cc0..fc3527f76 100644 --- a/Lib/Protocols/IdCookieManager.pas +++ b/Lib/Protocols/IdCookieManager.pas @@ -55,10 +55,10 @@ Copyright: (c) Chad Z. Hower and The Indy Team. } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdBaseComponent, @@ -112,7 +112,7 @@ implementation {$IFDEF HAS_UNIT_Generics_Defaults} System.Generics.Defaults, {$ENDIF} - IdAssignedNumbers, IdException, IdGlobal, IdGlobalProtocols, SysUtils; + IdGlobal, IdGlobalProtocols, SysUtils; { TIdCookieManager } diff --git a/Lib/Protocols/IdCustomHTTPServer.pas b/Lib/Protocols/IdCustomHTTPServer.pas index b55dd6e92..89e2d9e04 100644 --- a/Lib/Protocols/IdCustomHTTPServer.pas +++ b/Lib/Protocols/IdCustomHTTPServer.pas @@ -156,10 +156,10 @@ unit IdCustomHTTPServer; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, {$IFDEF HAS_UNIT_Generics_Collections} diff --git a/Lib/Protocols/IdDICT.pas b/Lib/Protocols/IdDICT.pas index bcd38d62f..8a2c1f933 100644 --- a/Lib/Protocols/IdDICT.pas +++ b/Lib/Protocols/IdDICT.pas @@ -51,10 +51,10 @@ unit IdDICT; -interface - {$I IdCompilerDefines.inc} +interface + uses Classes, IdAssignedNumbers, IdComponent, diff --git a/Lib/Protocols/IdDICTCommon.pas b/Lib/Protocols/IdDICTCommon.pas index 4edb99f81..0870d7d52 100644 --- a/Lib/Protocols/IdDICTCommon.pas +++ b/Lib/Protocols/IdDICTCommon.pas @@ -35,10 +35,10 @@ unit IdDICTCommon; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes; diff --git a/Lib/Protocols/IdDICTServer.pas b/Lib/Protocols/IdDICTServer.pas index f49e9b8b6..c80b65b0b 100644 --- a/Lib/Protocols/IdDICTServer.pas +++ b/Lib/Protocols/IdDICTServer.pas @@ -65,9 +65,10 @@ Original Author: Ozz Nixon } -interface {$i IdCompilerDefines.inc} +interface + uses IdGlobal, IdGlobalProtocols, IdResourceStringsProtocols, IdAssignedNumbers, IdCommandHandlers, IdCmdTCPServer; diff --git a/Lib/Protocols/IdDNSCommon.pas b/Lib/Protocols/IdDNSCommon.pas index f94c8c51e..b05d42498 100644 --- a/Lib/Protocols/IdDNSCommon.pas +++ b/Lib/Protocols/IdDNSCommon.pas @@ -162,16 +162,15 @@ unit IdDNSCommon; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdContainers, IdException, IdGlobal, - IdResourceStrings, IdResourceStringsProtocols; const diff --git a/Lib/Protocols/IdDNSResolver.pas b/Lib/Protocols/IdDNSResolver.pas index e707411e5..06924d783 100644 --- a/Lib/Protocols/IdDNSResolver.pas +++ b/Lib/Protocols/IdDNSResolver.pas @@ -196,10 +196,10 @@ unit IdDNSResolver; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdAssignedNumbers, diff --git a/Lib/Protocols/IdDNSServer.pas b/Lib/Protocols/IdDNSServer.pas index 91f72d6db..6fca48324 100644 --- a/Lib/Protocols/IdDNSServer.pas +++ b/Lib/Protocols/IdDNSServer.pas @@ -283,23 +283,21 @@ } unit IdDNSServer; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdContainers, IdAssignedNumbers, IdSocketHandle, - IdIOHandlerSocket, IdGlobal, IdGlobalProtocols, IdBaseComponent, IdComponent, IdContext, IdUDPBase, - IdResourceStrings, IdExceptionCore, IdDNSResolver, IdUDPServer, diff --git a/Lib/Protocols/IdDateTimeStamp.pas b/Lib/Protocols/IdDateTimeStamp.pas index da0a6158b..945a1a59d 100644 --- a/Lib/Protocols/IdDateTimeStamp.pas +++ b/Lib/Protocols/IdDateTimeStamp.pas @@ -127,10 +127,10 @@ ToDo: Conversion between Time Zones. } -interface - {$i IdCompilerDefines.inc} +interface + uses IdGlobal, IdBaseComponent; @@ -481,7 +481,6 @@ implementation uses IdGlobalProtocols, - IdStrings, SysUtils; const diff --git a/Lib/Protocols/IdDayTime.pas b/Lib/Protocols/IdDayTime.pas index dc79851c8..66856d327 100644 --- a/Lib/Protocols/IdDayTime.pas +++ b/Lib/Protocols/IdDayTime.pas @@ -44,9 +44,10 @@ { } {*******************************************************} -interface {$i IdCompilerDefines.inc} +interface + uses IdAssignedNumbers, IdTCPClient; diff --git a/Lib/Protocols/IdDayTimeServer.pas b/Lib/Protocols/IdDayTimeServer.pas index bfd11bbb8..5c51bc69f 100644 --- a/Lib/Protocols/IdDayTimeServer.pas +++ b/Lib/Protocols/IdDayTimeServer.pas @@ -46,9 +46,10 @@ Original Author: Ozz Nixon } -interface {$i IdCompilerDefines.inc} +interface + uses {$IFDEF WORKAROUND_INLINE_CONSTRUCTORS} Classes, diff --git a/Lib/Protocols/IdDayTimeUDP.pas b/Lib/Protocols/IdDayTimeUDP.pas index e62d45b34..dafeadea7 100644 --- a/Lib/Protocols/IdDayTimeUDP.pas +++ b/Lib/Protocols/IdDayTimeUDP.pas @@ -24,8 +24,9 @@ unit IdDayTimeUDP; -interface {$i IdCompilerDefines.inc} + +interface uses IdAssignedNumbers, IdUDPBase, IdUDPClient; diff --git a/Lib/Protocols/IdDayTimeUDPServer.pas b/Lib/Protocols/IdDayTimeUDPServer.pas index 9407e2f52..ad8ee51f7 100644 --- a/Lib/Protocols/IdDayTimeUDPServer.pas +++ b/Lib/Protocols/IdDayTimeUDPServer.pas @@ -33,14 +33,15 @@ unit IdDayTimeUDPServer; -interface {$i IdCompilerDefines.inc} +interface + uses {$IFDEF WORKAROUND_INLINE_CONSTRUCTORS} Classes, {$ENDIF} - IdAssignedNumbers, IdGlobal, IdSocketHandle, IdUDPBase, IdUDPServer; + IdAssignedNumbers, IdGlobal, IdSocketHandle, IdUDPServer; type TIdDayTimeUDPServer = class(TIdUDPServer) diff --git a/Lib/Protocols/IdDiscardServer.pas b/Lib/Protocols/IdDiscardServer.pas index 632eef4c0..9e6783e89 100644 --- a/Lib/Protocols/IdDiscardServer.pas +++ b/Lib/Protocols/IdDiscardServer.pas @@ -58,9 +58,10 @@ Original Author: Ozz Nixon } -interface {$i IdCompilerDefines.inc} +interface + uses IdAssignedNumbers, IdContext, diff --git a/Lib/Protocols/IdDiscardUDPServer.pas b/Lib/Protocols/IdDiscardUDPServer.pas index f028f8e94..6915760b7 100644 --- a/Lib/Protocols/IdDiscardUDPServer.pas +++ b/Lib/Protocols/IdDiscardUDPServer.pas @@ -24,11 +24,12 @@ unit IdDiscardUDPServer; -interface {$i IdCompilerDefines.inc} +interface + uses - IdAssignedNumbers, IdSocketHandle, IdUDPBase, IdUDPServer; + IdAssignedNumbers, IdUDPServer; type TIdDiscardUDPServer = class(TIdUDPServer) diff --git a/Lib/Protocols/IdDsnRegister.pas b/Lib/Protocols/IdDsnRegister.pas index 4fac40948..802a46390 100644 --- a/Lib/Protocols/IdDsnRegister.pas +++ b/Lib/Protocols/IdDsnRegister.pas @@ -43,10 +43,10 @@ unit IdDsnRegister; -interface - {$I IdCompilerDefines.inc} +interface + uses Classes, {$IFDEF DOTNET} @@ -95,7 +95,6 @@ procedure Register; implementation uses - IdDsnResourceStrings, {$IFDEF WIDGET_WINFORMS} IdDsnSASLListEditorFormNET, {$R 'IdDsnSASLListEditorFormNET.TfrmSASLListEditor.resources' 'IdDsnSASLListEditorFormNET.resx'} diff --git a/Lib/Protocols/IdDsnSASLListEditor.pas b/Lib/Protocols/IdDsnSASLListEditor.pas index c371a0d29..4f4d3929b 100644 --- a/Lib/Protocols/IdDsnSASLListEditor.pas +++ b/Lib/Protocols/IdDsnSASLListEditor.pas @@ -40,10 +40,10 @@ unit IdDsnSASLListEditor; -interface - {$I IdCompilerDefines.inc} +interface + uses {$IFDEF DOTNET} Borland.Vcl.Design.DesignIntf, diff --git a/Lib/Protocols/IdDsnSASLListEditorFormVCL.pas b/Lib/Protocols/IdDsnSASLListEditorFormVCL.pas index 53c2a154a..8abc38e76 100644 --- a/Lib/Protocols/IdDsnSASLListEditorFormVCL.pas +++ b/Lib/Protocols/IdDsnSASLListEditorFormVCL.pas @@ -48,10 +48,10 @@ unit IdDsnSASLListEditorFormVCL; -interface - {$I IdCompilerDefines.inc} +interface + uses {$IFDEF WIDGET_KYLIX} QControls, QForms, QStdCtrls, QButtons, QExtCtrls, QActnList, QGraphics, diff --git a/Lib/Protocols/IdDummyUnit.pas b/Lib/Protocols/IdDummyUnit.pas index 529f6018a..2242bc487 100644 --- a/Lib/Protocols/IdDummyUnit.pas +++ b/Lib/Protocols/IdDummyUnit.pas @@ -37,8 +37,10 @@ } -interface {$i IdCompilerDefines.inc} + +interface + uses IdAntiFreeze; diff --git a/Lib/Protocols/IdEMailAddress.pas b/Lib/Protocols/IdEMailAddress.pas index 4d6551ee8..e38fc4e2a 100644 --- a/Lib/Protocols/IdEMailAddress.pas +++ b/Lib/Protocols/IdEMailAddress.pas @@ -109,10 +109,10 @@ Allen O'Neill } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdException; @@ -179,8 +179,7 @@ implementation uses IdGlobal, IdGlobalProtocols, - IdExceptionCore, - IdResourceStringsProtocols, SysUtils; + SysUtils; const // ATEXT without the double quote and space characters diff --git a/Lib/Protocols/IdEcho.pas b/Lib/Protocols/IdEcho.pas index 4680ffdf4..00f93bc4e 100644 --- a/Lib/Protocols/IdEcho.pas +++ b/Lib/Protocols/IdEcho.pas @@ -56,10 +56,10 @@ { } {*******************************************************} -interface - {$i IdCompilerDefines.inc} +interface + uses IdGlobal, IdAssignedNumbers, diff --git a/Lib/Protocols/IdEchoServer.pas b/Lib/Protocols/IdEchoServer.pas index 3f7a8fe8f..a2d146511 100644 --- a/Lib/Protocols/IdEchoServer.pas +++ b/Lib/Protocols/IdEchoServer.pas @@ -55,9 +55,9 @@ { Original Author: Ozz Nixon } +{$i IdCompilerDefines.inc} interface -{$i IdCompilerDefines.inc} uses IdAssignedNumbers, diff --git a/Lib/Protocols/IdEchoUDPServer.pas b/Lib/Protocols/IdEchoUDPServer.pas index 60fa2c6bd..cdc478bc2 100644 --- a/Lib/Protocols/IdEchoUDPServer.pas +++ b/Lib/Protocols/IdEchoUDPServer.pas @@ -33,11 +33,12 @@ unit IdEchoUDPServer; -interface {$i IdCompilerDefines.inc} +interface + uses - IdAssignedNumbers, IdGlobal, IdSocketHandle, IdUDPBase, IdUDPServer; + IdAssignedNumbers, IdGlobal, IdSocketHandle, IdUDPServer; type TIdEchoUDPServer = class(TIdUDPServer) diff --git a/Lib/Protocols/IdExplicitTLSClientServerBase.pas b/Lib/Protocols/IdExplicitTLSClientServerBase.pas index d7ea6c9db..d98063c72 100644 --- a/Lib/Protocols/IdExplicitTLSClientServerBase.pas +++ b/Lib/Protocols/IdExplicitTLSClientServerBase.pas @@ -68,10 +68,10 @@ unit IdExplicitTLSClientServerBase; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdCmdTCPServer, diff --git a/Lib/Protocols/IdFIPS.pas b/Lib/Protocols/IdFIPS.pas index 2b592cea2..0bdebcd66 100644 --- a/Lib/Protocols/IdFIPS.pas +++ b/Lib/Protocols/IdFIPS.pas @@ -1,9 +1,9 @@ unit IdFIPS; -interface - {$I IdCompilerDefines.inc} +interface + { IMPORTANT!!! diff --git a/Lib/Protocols/IdFSP.pas b/Lib/Protocols/IdFSP.pas index 71a78c413..e845945bd 100644 --- a/Lib/Protocols/IdFSP.pas +++ b/Lib/Protocols/IdFSP.pas @@ -77,10 +77,10 @@ } unit IdFSP; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdException, diff --git a/Lib/Protocols/IdFTP.pas b/Lib/Protocols/IdFTP.pas index e58f57dee..196ba129f 100644 --- a/Lib/Protocols/IdFTP.pas +++ b/Lib/Protocols/IdFTP.pas @@ -606,10 +606,10 @@ TODO: Change the FTP demo to demonstrate the use of the new events and add proxy support } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdAssignedNumbers, IdGlobal, IdExceptionCore, @@ -1106,8 +1106,10 @@ implementation Posix.Unistd, {$ENDIF} {$IFDEF WINDOWS} + {$IFNDEF FPC} //facilitate inlining only. Windows, + {$ENDIF} {$ENDIF} {$IFDEF DOTNET} {$IFDEF USE_INLINE} diff --git a/Lib/Protocols/IdFTPBaseFileSystem.pas b/Lib/Protocols/IdFTPBaseFileSystem.pas index b2f4426bf..075867afe 100644 --- a/Lib/Protocols/IdFTPBaseFileSystem.pas +++ b/Lib/Protocols/IdFTPBaseFileSystem.pas @@ -75,9 +75,10 @@ unit IdFTPBaseFileSystem; -interface {$i IdCompilerDefines.inc} +interface + uses Classes, IdBaseComponent, diff --git a/Lib/Protocols/IdFTPCommon.pas b/Lib/Protocols/IdFTPCommon.pas index 049cdfe5b..f73fe79a5 100644 --- a/Lib/Protocols/IdFTPCommon.pas +++ b/Lib/Protocols/IdFTPCommon.pas @@ -168,10 +168,10 @@ unit IdFTPCommon; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, @@ -736,12 +736,11 @@ function MakeXAUTKey : UInt32; implementation -uses {$IFDEF USE_VCL_POSIX} +uses Posix.SysTime, - Posix.Time, + Posix.Time; {$ENDIF} - IdException; {WS_FTP Pro XAUT Support} diff --git a/Lib/Protocols/IdFTPList.pas b/Lib/Protocols/IdFTPList.pas index b59684f22..5d204efd1 100644 --- a/Lib/Protocols/IdFTPList.pas +++ b/Lib/Protocols/IdFTPList.pas @@ -415,10 +415,10 @@ dSoft-Bulgaria } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, IdException, IdFTPCommon; diff --git a/Lib/Protocols/IdFTPListOutput.pas b/Lib/Protocols/IdFTPListOutput.pas index 53f891b45..eb81a0915 100644 --- a/Lib/Protocols/IdFTPListOutput.pas +++ b/Lib/Protocols/IdFTPListOutput.pas @@ -275,7 +275,6 @@ implementation uses //facilitate inlining only. - IdException, {$IFDEF DOTNET} {$IFDEF USE_INLINE} System.IO, @@ -290,7 +289,7 @@ implementation {$IFDEF USE_VCL_POSIX} Posix.SysTime, {$ENDIF} - IdContainers, IdFTPCommon, IdGlobalProtocols, IdStrings, SysUtils; + IdContainers, IdFTPCommon, IdGlobalProtocols, SysUtils; type {$IFDEF HAS_GENERICS_TObjectList} diff --git a/Lib/Protocols/IdFTPListParseAS400.pas b/Lib/Protocols/IdFTPListParseAS400.pas index 7259060a1..eac4490fa 100644 --- a/Lib/Protocols/IdFTPListParseAS400.pas +++ b/Lib/Protocols/IdFTPListParseAS400.pas @@ -37,10 +37,10 @@ unit IdFTPListParseAS400; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseBase.pas b/Lib/Protocols/IdFTPListParseBase.pas index 2176517d6..c99708180 100644 --- a/Lib/Protocols/IdFTPListParseBase.pas +++ b/Lib/Protocols/IdFTPListParseBase.pas @@ -117,10 +117,10 @@ unit IdFTPListParseBase; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdException; diff --git a/Lib/Protocols/IdFTPListParseBullGCOS7.pas b/Lib/Protocols/IdFTPListParseBullGCOS7.pas index 18ae71d48..118f0fba6 100644 --- a/Lib/Protocols/IdFTPListParseBullGCOS7.pas +++ b/Lib/Protocols/IdFTPListParseBullGCOS7.pas @@ -40,10 +40,10 @@ unit IdFTPListParseBullGCOS7; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase; diff --git a/Lib/Protocols/IdFTPListParseBullGCOS8.pas b/Lib/Protocols/IdFTPListParseBullGCOS8.pas index 1dc17e2db..6f3b00cfc 100644 --- a/Lib/Protocols/IdFTPListParseBullGCOS8.pas +++ b/Lib/Protocols/IdFTPListParseBullGCOS8.pas @@ -44,10 +44,10 @@ } unit IdFTPListParseBullGCOS8; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseChameleonNewt.pas b/Lib/Protocols/IdFTPListParseChameleonNewt.pas index 41cbea752..c8b654317 100644 --- a/Lib/Protocols/IdFTPListParseChameleonNewt.pas +++ b/Lib/Protocols/IdFTPListParseChameleonNewt.pas @@ -22,10 +22,10 @@ unit IdFTPListParseChameleonNewt; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase,IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseCiscoIOS.pas b/Lib/Protocols/IdFTPListParseCiscoIOS.pas index 00ad4cdab..b0b839f43 100644 --- a/Lib/Protocols/IdFTPListParseCiscoIOS.pas +++ b/Lib/Protocols/IdFTPListParseCiscoIOS.pas @@ -34,10 +34,10 @@ unit IdFTPListParseCiscoIOS; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase,IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseDistinctTCPIP.pas b/Lib/Protocols/IdFTPListParseDistinctTCPIP.pas index 2e78e05ee..903ed9b95 100644 --- a/Lib/Protocols/IdFTPListParseDistinctTCPIP.pas +++ b/Lib/Protocols/IdFTPListParseDistinctTCPIP.pas @@ -50,10 +50,10 @@ unit IdFTPListParseDistinctTCPIP; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseEPLF.pas b/Lib/Protocols/IdFTPListParseEPLF.pas index e6ce1d939..c5caaa0ad 100644 --- a/Lib/Protocols/IdFTPListParseEPLF.pas +++ b/Lib/Protocols/IdFTPListParseEPLF.pas @@ -43,10 +43,10 @@ unit IdFTPListParseEPLF; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseHellSoft.pas b/Lib/Protocols/IdFTPListParseHellSoft.pas index cd551e174..bcfb1df12 100644 --- a/Lib/Protocols/IdFTPListParseHellSoft.pas +++ b/Lib/Protocols/IdFTPListParseHellSoft.pas @@ -37,10 +37,10 @@ unit IdFTPListParseHellSoft; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListParseNovellNetware; diff --git a/Lib/Protocols/IdFTPListParseIEFTPGateway.pas b/Lib/Protocols/IdFTPListParseIEFTPGateway.pas index eceeef566..456038fb5 100644 --- a/Lib/Protocols/IdFTPListParseIEFTPGateway.pas +++ b/Lib/Protocols/IdFTPListParseIEFTPGateway.pas @@ -1,9 +1,9 @@ unit IdFTPListParseIEFTPGateway; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase,IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseKA9Q.pas b/Lib/Protocols/IdFTPListParseKA9Q.pas index 19fcb3c99..465ef08e9 100644 --- a/Lib/Protocols/IdFTPListParseKA9Q.pas +++ b/Lib/Protocols/IdFTPListParseKA9Q.pas @@ -42,10 +42,10 @@ unit IdFTPListParseKA9Q; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase; diff --git a/Lib/Protocols/IdFTPListParseMPEiX.pas b/Lib/Protocols/IdFTPListParseMPEiX.pas index c3b2d2607..5f903c681 100644 --- a/Lib/Protocols/IdFTPListParseMPEiX.pas +++ b/Lib/Protocols/IdFTPListParseMPEiX.pas @@ -37,10 +37,10 @@ unit IdFTPListParseMPEiX; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, diff --git a/Lib/Protocols/IdFTPListParseMVS.pas b/Lib/Protocols/IdFTPListParseMVS.pas index 2b09822b6..8e5e08e8e 100644 --- a/Lib/Protocols/IdFTPListParseMVS.pas +++ b/Lib/Protocols/IdFTPListParseMVS.pas @@ -45,10 +45,10 @@ unit IdFTPListParseMVS; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseMicrowareOS9.pas b/Lib/Protocols/IdFTPListParseMicrowareOS9.pas index 8d8ceef2f..18e31111a 100644 --- a/Lib/Protocols/IdFTPListParseMicrowareOS9.pas +++ b/Lib/Protocols/IdFTPListParseMicrowareOS9.pas @@ -39,10 +39,10 @@ unit IdFTPListParseMicrowareOS9; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, diff --git a/Lib/Protocols/IdFTPListParseMusic.pas b/Lib/Protocols/IdFTPListParseMusic.pas index eaa9f7d75..68ff3bee9 100644 --- a/Lib/Protocols/IdFTPListParseMusic.pas +++ b/Lib/Protocols/IdFTPListParseMusic.pas @@ -37,10 +37,10 @@ unit IdFTPListParseMusic; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseNCSAForDOS.pas b/Lib/Protocols/IdFTPListParseNCSAForDOS.pas index 183c80fa3..de5d59733 100644 --- a/Lib/Protocols/IdFTPListParseNCSAForDOS.pas +++ b/Lib/Protocols/IdFTPListParseNCSAForDOS.pas @@ -43,10 +43,10 @@ unit IdFTPListParseNCSAForDOS; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase; diff --git a/Lib/Protocols/IdFTPListParseNCSAForMACOS.pas b/Lib/Protocols/IdFTPListParseNCSAForMACOS.pas index 9c23b803b..660812ec1 100644 --- a/Lib/Protocols/IdFTPListParseNCSAForMACOS.pas +++ b/Lib/Protocols/IdFTPListParseNCSAForMACOS.pas @@ -22,10 +22,10 @@ unit IdFTPListParseNCSAForMACOS; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseNovellNetware.pas b/Lib/Protocols/IdFTPListParseNovellNetware.pas index 629da6b49..dea9107e6 100644 --- a/Lib/Protocols/IdFTPListParseNovellNetware.pas +++ b/Lib/Protocols/IdFTPListParseNovellNetware.pas @@ -51,10 +51,10 @@ unit IdFTPListParseNovellNetware; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseNovellNetwarePSU.pas b/Lib/Protocols/IdFTPListParseNovellNetwarePSU.pas index b8f377c6a..fd0205e47 100644 --- a/Lib/Protocols/IdFTPListParseNovellNetwarePSU.pas +++ b/Lib/Protocols/IdFTPListParseNovellNetwarePSU.pas @@ -51,10 +51,10 @@ unit IdFTPListParseNovellNetwarePSU; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseOS2.pas b/Lib/Protocols/IdFTPListParseOS2.pas index c959f0a26..18dcf515a 100644 --- a/Lib/Protocols/IdFTPListParseOS2.pas +++ b/Lib/Protocols/IdFTPListParseOS2.pas @@ -42,10 +42,10 @@ unit IdFTPListParseOS2; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParsePCNFSD.pas b/Lib/Protocols/IdFTPListParsePCNFSD.pas index 19c6cb13e..f790dc496 100644 --- a/Lib/Protocols/IdFTPListParsePCNFSD.pas +++ b/Lib/Protocols/IdFTPListParsePCNFSD.pas @@ -25,10 +25,10 @@ unit IdFTPListParsePCNFSD; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParsePCTCP.pas b/Lib/Protocols/IdFTPListParsePCTCP.pas index 6e35632a6..a9af98ce6 100644 --- a/Lib/Protocols/IdFTPListParsePCTCP.pas +++ b/Lib/Protocols/IdFTPListParsePCTCP.pas @@ -1,9 +1,9 @@ unit IdFTPListParsePCTCP; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase; diff --git a/Lib/Protocols/IdFTPListParseStercomOS390Exp.pas b/Lib/Protocols/IdFTPListParseStercomOS390Exp.pas index d81378461..0ebc09c30 100644 --- a/Lib/Protocols/IdFTPListParseStercomOS390Exp.pas +++ b/Lib/Protocols/IdFTPListParseStercomOS390Exp.pas @@ -31,10 +31,10 @@ unit IdFTPListParseStercomOS390Exp; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase; diff --git a/Lib/Protocols/IdFTPListParseStercomUnixEnt.pas b/Lib/Protocols/IdFTPListParseStercomUnixEnt.pas index fa73d2b3d..78d748b9e 100644 --- a/Lib/Protocols/IdFTPListParseStercomUnixEnt.pas +++ b/Lib/Protocols/IdFTPListParseStercomUnixEnt.pas @@ -34,10 +34,10 @@ unit IdFTPListParseStercomUnixEnt; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseStratusVOS.pas b/Lib/Protocols/IdFTPListParseStratusVOS.pas index a880facea..658b91707 100644 --- a/Lib/Protocols/IdFTPListParseStratusVOS.pas +++ b/Lib/Protocols/IdFTPListParseStratusVOS.pas @@ -32,10 +32,10 @@ FTP server (OS TCP/IP) } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseSuperTCP.pas b/Lib/Protocols/IdFTPListParseSuperTCP.pas index 996c10b78..ba76f044e 100644 --- a/Lib/Protocols/IdFTPListParseSuperTCP.pas +++ b/Lib/Protocols/IdFTPListParseSuperTCP.pas @@ -28,10 +28,10 @@ unit IdFTPListParseSuperTCP; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase; diff --git a/Lib/Protocols/IdFTPListParseTOPS20.pas b/Lib/Protocols/IdFTPListParseTOPS20.pas index 5afb7ee3f..e7d415d5e 100644 --- a/Lib/Protocols/IdFTPListParseTOPS20.pas +++ b/Lib/Protocols/IdFTPListParseTOPS20.pas @@ -67,10 +67,10 @@ unit IdFTPListParseTOPS20; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseTSXPlus.pas b/Lib/Protocols/IdFTPListParseTSXPlus.pas index 19eb8b6e0..e2159f8d7 100644 --- a/Lib/Protocols/IdFTPListParseTSXPlus.pas +++ b/Lib/Protocols/IdFTPListParseTSXPlus.pas @@ -32,10 +32,10 @@ http://www.gweep.net/~shifty/music/miragehack/gcc/xasm/cug292.lst } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseTandemGuardian.pas b/Lib/Protocols/IdFTPListParseTandemGuardian.pas index e550b3b10..f66f7ae1a 100644 --- a/Lib/Protocols/IdFTPListParseTandemGuardian.pas +++ b/Lib/Protocols/IdFTPListParseTandemGuardian.pas @@ -30,10 +30,10 @@ unit IdFTPListParseTandemGuardian; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, diff --git a/Lib/Protocols/IdFTPListParseUnisysClearPath.pas b/Lib/Protocols/IdFTPListParseUnisysClearPath.pas index a58110849..2bdbf4b78 100644 --- a/Lib/Protocols/IdFTPListParseUnisysClearPath.pas +++ b/Lib/Protocols/IdFTPListParseUnisysClearPath.pas @@ -63,10 +63,10 @@ in Unix format. If not, we'll deal with it given some data samples. } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseUnix.pas b/Lib/Protocols/IdFTPListParseUnix.pas index ecafa43ce..a8c59b076 100644 --- a/Lib/Protocols/IdFTPListParseUnix.pas +++ b/Lib/Protocols/IdFTPListParseUnix.pas @@ -106,10 +106,10 @@ unit IdFTPListParseUnix; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseVM.pas b/Lib/Protocols/IdFTPListParseVM.pas index eb008dd37..a74edb15b 100644 --- a/Lib/Protocols/IdFTPListParseVM.pas +++ b/Lib/Protocols/IdFTPListParseVM.pas @@ -59,10 +59,10 @@ IBM VM and z/VM parser } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseVMS.pas b/Lib/Protocols/IdFTPListParseVMS.pas index ef8efc680..b56924b61 100644 --- a/Lib/Protocols/IdFTPListParseVMS.pas +++ b/Lib/Protocols/IdFTPListParseVMS.pas @@ -67,10 +67,10 @@ VMS TCPWare, plus some non-multinet systems. } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseVSE.pas b/Lib/Protocols/IdFTPListParseVSE.pas index 58dfa9f94..a2e41db0e 100644 --- a/Lib/Protocols/IdFTPListParseVSE.pas +++ b/Lib/Protocols/IdFTPListParseVSE.pas @@ -40,10 +40,10 @@ unit IdFTPListParseVSE; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPCommon, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseVxWorks.pas b/Lib/Protocols/IdFTPListParseVxWorks.pas index 4437acac1..1143e2249 100644 --- a/Lib/Protocols/IdFTPListParseVxWorks.pas +++ b/Lib/Protocols/IdFTPListParseVxWorks.pas @@ -37,10 +37,10 @@ unit IdFTPListParseVxWorks; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase; diff --git a/Lib/Protocols/IdFTPListParseWfFTP.pas b/Lib/Protocols/IdFTPListParseWfFTP.pas index 68b4a7a51..95cc51877 100644 --- a/Lib/Protocols/IdFTPListParseWfFTP.pas +++ b/Lib/Protocols/IdFTPListParseWfFTP.pas @@ -29,10 +29,10 @@ Wellfleet router. } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase, IdFTPListTypes; diff --git a/Lib/Protocols/IdFTPListParseWinQVTNET.pas b/Lib/Protocols/IdFTPListParseWinQVTNET.pas index dba04d582..4358221d3 100644 --- a/Lib/Protocols/IdFTPListParseWinQVTNET.pas +++ b/Lib/Protocols/IdFTPListParseWinQVTNET.pas @@ -37,10 +37,10 @@ unit IdFTPListParseWinQVTNET; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase; diff --git a/Lib/Protocols/IdFTPListParseWindowsNT.pas b/Lib/Protocols/IdFTPListParseWindowsNT.pas index f0eafe551..7cc7a8dce 100644 --- a/Lib/Protocols/IdFTPListParseWindowsNT.pas +++ b/Lib/Protocols/IdFTPListParseWindowsNT.pas @@ -68,10 +68,10 @@ unit IdFTPListParseWindowsNT; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFTPList, IdFTPListParseBase; diff --git a/Lib/Protocols/IdFTPListParseXecomMicroRTOS.pas b/Lib/Protocols/IdFTPListParseXecomMicroRTOS.pas index a22e6299e..2c68b73b9 100644 --- a/Lib/Protocols/IdFTPListParseXecomMicroRTOS.pas +++ b/Lib/Protocols/IdFTPListParseXecomMicroRTOS.pas @@ -37,10 +37,10 @@ unit IdFTPListParseXecomMicroRTOS; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, diff --git a/Lib/Protocols/IdFTPListTypes.pas b/Lib/Protocols/IdFTPListTypes.pas index 285355d86..aea2bc4a8 100644 --- a/Lib/Protocols/IdFTPListTypes.pas +++ b/Lib/Protocols/IdFTPListTypes.pas @@ -48,10 +48,10 @@ unit IdFTPListTypes; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, diff --git a/Lib/Protocols/IdFTPServer.pas b/Lib/Protocols/IdFTPServer.pas index 818898778..367de1cc8 100644 --- a/Lib/Protocols/IdFTPServer.pas +++ b/Lib/Protocols/IdFTPServer.pas @@ -594,17 +594,17 @@ Change events to use DoXXXX } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdAssignedNumbers, IdCommandHandlers, IdGlobal, IdContext, IdException, IdExplicitTLSClientServerBase, IdFTPBaseFileSystem, IdFTPCommon, IdBaseComponent, IdFTPList, IdFTPListOutput, IdFTPServerContextBase, - IdReply, IdReplyFTP, IdReplyRFC, IdScheduler, IdServerIOHandler, - IdTCPConnection, IdCmdTCPServer, IdTCPServer, IdThread, IdUserAccounts, + IdReply, IdReplyFTP, IdReplyRFC, IdServerIOHandler, + IdTCPConnection, IdCmdTCPServer, IdThread, IdUserAccounts, IdYarn, IdZLibCompressorBase, SysUtils; type @@ -1314,7 +1314,7 @@ implementation IdFIPS, IdHash, IdHashCRC, IdHashMessageDigest, IdHashSHA, IdIOHandlerSocket, IdResourceStringsProtocols, IdGlobalProtocols, IdSimpleServer, IdSSL, - IdIOHandlerStack, IdSocketHandle, IdStrings, IdTCPClient, IdEMailAddress, + IdIOHandlerStack, IdSocketHandle, IdTCPClient, IdEMailAddress, IdStack, IdFTPListTypes, IdStream; const diff --git a/Lib/Protocols/IdFTPServerContextBase.pas b/Lib/Protocols/IdFTPServerContextBase.pas index 004872ab6..8d786f08a 100644 --- a/Lib/Protocols/IdFTPServerContextBase.pas +++ b/Lib/Protocols/IdFTPServerContextBase.pas @@ -29,10 +29,10 @@ than just the Username } -interface - {$i IdCompilerDefines.inc} +interface + uses IdCustomTCPServer, IdFTPList; diff --git a/Lib/Protocols/IdFinger.pas b/Lib/Protocols/IdFinger.pas index bf8242ecf..ab4607b6f 100644 --- a/Lib/Protocols/IdFinger.pas +++ b/Lib/Protocols/IdFinger.pas @@ -57,10 +57,10 @@ { } {*******************************************************} -interface - {$i IdCompilerDefines.inc} +interface + uses IdAssignedNumbers, IdTCPClient; diff --git a/Lib/Protocols/IdFingerServer.pas b/Lib/Protocols/IdFingerServer.pas index f9fe72254..bb0c459f1 100644 --- a/Lib/Protocols/IdFingerServer.pas +++ b/Lib/Protocols/IdFingerServer.pas @@ -57,9 +57,10 @@ Original Author: Ozz Nixon } -interface {$i IdCompilerDefines.inc} +interface + uses IdAssignedNumbers, IdContext, diff --git a/Lib/Protocols/IdGlobalProtocols.pas b/Lib/Protocols/IdGlobalProtocols.pas index b77300f0c..3ee2fdb3d 100644 --- a/Lib/Protocols/IdGlobalProtocols.pas +++ b/Lib/Protocols/IdGlobalProtocols.pas @@ -319,10 +319,10 @@ unit IdGlobalProtocols; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, {$IFDEF WINDOWS} diff --git a/Lib/Protocols/IdGopher.pas b/Lib/Protocols/IdGopher.pas index c2f7f9759..ceedc8a39 100644 --- a/Lib/Protocols/IdGopher.pas +++ b/Lib/Protocols/IdGopher.pas @@ -116,7 +116,7 @@ interface IdAssignedNumbers, IdEMailAddress, IdGlobal, - IdHeaderList, IdTCPClient, IdBaseComponent; + IdHeaderList, IdTCPClient; type TIdGopherMenuItem = class(TCollectionItem) @@ -249,8 +249,8 @@ TIdGopher = class ( TIdTCPClientCustom ) implementation uses - IdComponent, IdException, - IdGlobalProtocols, IdGopherConsts, IdReplyRFC, + IdComponent, + IdGlobalProtocols, IdGopherConsts, IdTCPConnection, SysUtils; { TIdGopher } diff --git a/Lib/Protocols/IdGopherConsts.pas b/Lib/Protocols/IdGopherConsts.pas index d3669306b..b0b66f519 100644 --- a/Lib/Protocols/IdGopherConsts.pas +++ b/Lib/Protocols/IdGopherConsts.pas @@ -41,9 +41,10 @@ { } {*******************************************************} -interface {$i IdCompilerDefines.inc} +interface + uses IdGlobal; diff --git a/Lib/Protocols/IdGopherServer.pas b/Lib/Protocols/IdGopherServer.pas index 740d22dfc..919cd38c8 100644 --- a/Lib/Protocols/IdGopherServer.pas +++ b/Lib/Protocols/IdGopherServer.pas @@ -48,10 +48,10 @@ unit IdGopherServer; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdAssignedNumbers, diff --git a/Lib/Protocols/IdHL7.pas b/Lib/Protocols/IdHL7.pas index 062c2a768..f5f8aa86e 100644 --- a/Lib/Protocols/IdHL7.pas +++ b/Lib/Protocols/IdHL7.pas @@ -134,10 +134,10 @@ unit IdHL7; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, Contnrs, diff --git a/Lib/Protocols/IdHMAC.pas b/Lib/Protocols/IdHMAC.pas index 9ca1f725e..3d2517696 100644 --- a/Lib/Protocols/IdHMAC.pas +++ b/Lib/Protocols/IdHMAC.pas @@ -22,10 +22,10 @@ unit IdHMAC; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFIPS, diff --git a/Lib/Protocols/IdHMACMD5.pas b/Lib/Protocols/IdHMACMD5.pas index 089b13ec6..20cb8a06c 100644 --- a/Lib/Protocols/IdHMACMD5.pas +++ b/Lib/Protocols/IdHMACMD5.pas @@ -22,14 +22,15 @@ unit IdHMACMD5; -interface - {$i IdCompilerDefines.inc} +interface + uses IdFIPS, IdGlobal, - IdHash, IdHashMessageDigest, IdHMAC; + IdHashMessageDigest, + IdHMAC; type TIdHMACMD5 = class(TIdHMAC) diff --git a/Lib/Protocols/IdHMACSHA1.pas b/Lib/Protocols/IdHMACSHA1.pas index 18888c94b..6207bd59c 100644 --- a/Lib/Protocols/IdHMACSHA1.pas +++ b/Lib/Protocols/IdHMACSHA1.pas @@ -22,10 +22,10 @@ unit IdHMACSHA1; -interface - {$i IdCompilerDefines.inc} +interface + uses IdFIPS, IdGlobal, diff --git a/Lib/Protocols/IdHTTP.pas b/Lib/Protocols/IdHTTP.pas index a975f38e1..0da4555ee 100644 --- a/Lib/Protocols/IdHTTP.pas +++ b/Lib/Protocols/IdHTTP.pas @@ -331,16 +331,15 @@ TODO: Figure out what to do with ConnectTimeout. Ideally, that should be in the core and is not the same as a read Timeout. } +{$I IdCompilerDefines.inc} interface -{$I IdCompilerDefines.inc} - uses Classes, IdException, IdExceptionCore, IdAssignedNumbers, IdHeaderList, IdHTTPHeaderInfo, IdReplyRFC, IdSSL, IdZLibCompressorBase, - IdTCPClient, IdURI, IdCookie, IdCookieManager, IdAuthentication, IdAuthenticationManager, + IdTCPClient, IdURI, IdCookieManager, IdAuthentication, IdAuthenticationManager, IdMultipartFormData, IdGlobal, IdBaseComponent, IdUriUtils; type diff --git a/Lib/Protocols/IdHTTPHeaderInfo.pas b/Lib/Protocols/IdHTTPHeaderInfo.pas index ce75957c8..dd683358a 100644 --- a/Lib/Protocols/IdHTTPHeaderInfo.pas +++ b/Lib/Protocols/IdHTTPHeaderInfo.pas @@ -64,10 +64,10 @@ Author: Doychin Bondzhev (doychin@dsoft-bg.com) } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdAuthentication, diff --git a/Lib/Protocols/IdHTTPProxyServer.pas b/Lib/Protocols/IdHTTPProxyServer.pas index f68830530..e0291243b 100644 --- a/Lib/Protocols/IdHTTPProxyServer.pas +++ b/Lib/Protocols/IdHTTPProxyServer.pas @@ -97,10 +97,10 @@ unit IdHTTPProxyServer; -interface - {$i IdCompilerDefines.inc} +interface + { Indy HTTP proxy Server @@ -182,7 +182,7 @@ TIdHTTPProxyServer = class(TIdCmdTCPServer) implementation uses - IdResourceStrings, IdResourceStringsProtocols, IdReplyRFC, IdIOHandler, IdTCPClient, + IdResourceStringsProtocols, IdIOHandler, IdTCPClient, IdURI, IdGlobalProtocols, IdStack, IdStackConsts, IdTCPStream, IdException, SysUtils; constructor TIdHTTPProxyServerContext.Create(AConnection: TIdTCPConnection; diff --git a/Lib/Protocols/IdHTTPServer.pas b/Lib/Protocols/IdHTTPServer.pas index 6d84caea3..acf960a17 100644 --- a/Lib/Protocols/IdHTTPServer.pas +++ b/Lib/Protocols/IdHTTPServer.pas @@ -34,9 +34,10 @@ Additional chages and bug fixes - Doychin Bondzhev (doychin@dsoft-bg.com) } -interface {$i IdCompilerDefines.inc} +interface + uses IdCustomHTTPServer; diff --git a/Lib/Protocols/IdHTTPWebBrokerBridge.pas b/Lib/Protocols/IdHTTPWebBrokerBridge.pas index 2ce020df5..1f1cb10a6 100644 --- a/Lib/Protocols/IdHTTPWebBrokerBridge.pas +++ b/Lib/Protocols/IdHTTPWebBrokerBridge.pas @@ -48,10 +48,10 @@ Modified by: Chad Z. Hower (Kudzu) } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, HTTPApp, diff --git a/Lib/Protocols/IdHash.pas b/Lib/Protocols/IdHash.pas index 6cc38d0da..1365774be 100644 --- a/Lib/Protocols/IdHash.pas +++ b/Lib/Protocols/IdHash.pas @@ -52,10 +52,10 @@ unit IdHash; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdFIPS, diff --git a/Lib/Protocols/IdHashAdler32.pas b/Lib/Protocols/IdHashAdler32.pas index 506face2f..16ebabf9e 100644 --- a/Lib/Protocols/IdHashAdler32.pas +++ b/Lib/Protocols/IdHashAdler32.pas @@ -41,9 +41,10 @@ unit IdHashAdler32; -interface {$i IdCompilerDefines.inc} +interface + uses IdHash; diff --git a/Lib/Protocols/IdHashCRC.pas b/Lib/Protocols/IdHashCRC.pas index 2ede7d691..9e426dd0d 100644 --- a/Lib/Protocols/IdHashCRC.pas +++ b/Lib/Protocols/IdHashCRC.pas @@ -34,9 +34,10 @@ unit IdHashCRC; -interface {$i IdCompilerDefines.inc} +interface + uses IdGlobal, IdHash; diff --git a/Lib/Protocols/IdHashElf.pas b/Lib/Protocols/IdHashElf.pas index 98ecc93fb..9baf566de 100644 --- a/Lib/Protocols/IdHashElf.pas +++ b/Lib/Protocols/IdHashElf.pas @@ -24,10 +24,10 @@ unit IdHashElf; -interface - {$i IdCompilerDefines.inc} +interface + uses IdGlobal, IdHash; diff --git a/Lib/Protocols/IdHashIntf.pas b/Lib/Protocols/IdHashIntf.pas index 80e08b274..7de77bd05 100644 --- a/Lib/Protocols/IdHashIntf.pas +++ b/Lib/Protocols/IdHashIntf.pas @@ -1,8 +1,9 @@ unit IdHashIntf; -interface {$i IdCompilerDefines.inc} +interface + uses Classes, IdFIPS, diff --git a/Lib/Protocols/IdHashMessageDigest.pas b/Lib/Protocols/IdHashMessageDigest.pas index 3de7a59df..6fe4bddec 100644 --- a/Lib/Protocols/IdHashMessageDigest.pas +++ b/Lib/Protocols/IdHashMessageDigest.pas @@ -42,9 +42,9 @@ unit IdHashMessageDigest; -interface {$i IdCompilerDefines.inc} +interface uses IdFIPS, IdGlobal, IdHash, Classes; diff --git a/Lib/Protocols/IdHashSHA.pas b/Lib/Protocols/IdHashSHA.pas index 968b1796c..b82a6fa10 100644 --- a/Lib/Protocols/IdHashSHA.pas +++ b/Lib/Protocols/IdHashSHA.pas @@ -44,9 +44,10 @@ unit IdHashSHA; -interface {$i IdCompilerDefines.inc} +interface + uses Classes, IdFIPS, diff --git a/Lib/Protocols/IdHashSHA1.pas b/Lib/Protocols/IdHashSHA1.pas index b25324d45..96482b224 100644 --- a/Lib/Protocols/IdHashSHA1.pas +++ b/Lib/Protocols/IdHashSHA1.pas @@ -44,9 +44,10 @@ unit IdHashSHA1; -interface {$i IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, IdHash; diff --git a/Lib/Protocols/IdHeaderCoder2022JP.pas b/Lib/Protocols/IdHeaderCoder2022JP.pas index ef6a1c617..a766603de 100644 --- a/Lib/Protocols/IdHeaderCoder2022JP.pas +++ b/Lib/Protocols/IdHeaderCoder2022JP.pas @@ -1,9 +1,9 @@ unit IdHeaderCoder2022JP; -interface - {$i IdCompilerDefines.inc} +interface + {RLebeau: TODO - move this logic into an IIdTextEncoding implementation} uses diff --git a/Lib/Protocols/IdHeaderCoderBase.pas b/Lib/Protocols/IdHeaderCoderBase.pas index 12dbf3ce7..be9a12cac 100644 --- a/Lib/Protocols/IdHeaderCoderBase.pas +++ b/Lib/Protocols/IdHeaderCoderBase.pas @@ -1,9 +1,9 @@ unit IdHeaderCoderBase; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, IdException; diff --git a/Lib/Protocols/IdHeaderCoderBig5.pas b/Lib/Protocols/IdHeaderCoderBig5.pas index a17baf595..71d9bcb44 100644 --- a/Lib/Protocols/IdHeaderCoderBig5.pas +++ b/Lib/Protocols/IdHeaderCoderBig5.pas @@ -1,9 +1,9 @@ unit IdHeaderCoderBig5; -interface - {$i IdCompilerDefines.inc} +interface + uses IdGlobal, IdHeaderCoderBase; diff --git a/Lib/Protocols/IdHeaderCoderIndy.pas b/Lib/Protocols/IdHeaderCoderIndy.pas index cb47092b6..ac35e1b56 100644 --- a/Lib/Protocols/IdHeaderCoderIndy.pas +++ b/Lib/Protocols/IdHeaderCoderIndy.pas @@ -1,9 +1,9 @@ unit IdHeaderCoderIndy; -interface - {$i IdCompilerDefines.inc} +interface + uses IdGlobal, IdHeaderCoderBase; diff --git a/Lib/Protocols/IdHeaderCoderPlain.pas b/Lib/Protocols/IdHeaderCoderPlain.pas index 05dec7f32..35ed37ce0 100644 --- a/Lib/Protocols/IdHeaderCoderPlain.pas +++ b/Lib/Protocols/IdHeaderCoderPlain.pas @@ -1,9 +1,9 @@ unit IdHeaderCoderPlain; -interface - {$i IdCompilerDefines.inc} +interface + uses IdGlobal, IdHeaderCoderBase; diff --git a/Lib/Protocols/IdHeaderList.pas b/Lib/Protocols/IdHeaderList.pas index 811a27e33..c4aeb7854 100644 --- a/Lib/Protocols/IdHeaderList.pas +++ b/Lib/Protocols/IdHeaderList.pas @@ -63,10 +63,10 @@ and are private. } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdGlobalProtocols; @@ -145,7 +145,6 @@ TIdHeaderList = class(TStringList) implementation uses - IdException, IdGlobal, SysUtils; diff --git a/Lib/Protocols/IdHostnameServer.pas b/Lib/Protocols/IdHostnameServer.pas index 826312d50..e73f2100c 100644 --- a/Lib/Protocols/IdHostnameServer.pas +++ b/Lib/Protocols/IdHostnameServer.pas @@ -36,10 +36,10 @@ unit IdHostnameServer; -interface - {$i IdCompilerDefines.inc} +interface + { Original Author: Ozz Nixon Based on RFC 953 diff --git a/Lib/Protocols/IdIMAP4.pas b/Lib/Protocols/IdIMAP4.pas index 48e404fc0..8de2a9c80 100644 --- a/Lib/Protocols/IdIMAP4.pas +++ b/Lib/Protocols/IdIMAP4.pas @@ -394,6 +394,7 @@ IMAP 4 (Internet Message Access Protocol - Version 4 Rev 1) By Idan Cohen i_cohen@yahoo.com } +{$I IdCompilerDefines.inc} interface @@ -428,8 +429,6 @@ interface you need to add the path "C:\Program Files\Borland\Delphi7\Source\Indy" in Project -> Options -> Directories/Conditionals -> Search Path} -{$I IdCompilerDefines.inc} - uses Classes, {$IFNDEF VCL_6_OR_ABOVE}IdCTypes,{$ENDIF} @@ -1166,7 +1165,6 @@ implementation {$ENDIF} IdCoder, IdEMailAddress, - IdResourceStrings, IdExplicitTLSClientServerBase, IdGlobalProtocols, IdExceptionCore, diff --git a/Lib/Protocols/IdIMAP4Server.pas b/Lib/Protocols/IdIMAP4Server.pas index 207a127c2..f413f488a 100644 --- a/Lib/Protocols/IdIMAP4Server.pas +++ b/Lib/Protocols/IdIMAP4Server.pas @@ -210,10 +210,10 @@ UIDs or flags! } -interface - {$i IdCompilerDefines.inc} +interface + {$IFDEF DOTNET} {$I IdUnitPlatformOff.inc} {$I IdSymbolPlatformOff.inc} @@ -493,10 +493,8 @@ implementation IdGlobal, IdGlobalProtocols, IdMessageCollection, - IdResourceStrings, IdResourceStringsProtocols, IdSSL, - IdStream, SysUtils; function TIdIMAP4Server.GetReplyClass: TIdReplyClass; diff --git a/Lib/Protocols/IdIPAddrMon.pas b/Lib/Protocols/IdIPAddrMon.pas index 006c19d45..0e77750dc 100644 --- a/Lib/Protocols/IdIPAddrMon.pas +++ b/Lib/Protocols/IdIPAddrMon.pas @@ -44,6 +44,8 @@ unit IdIPAddrMon; +{$i IdCompilerDefines.inc} + { TIdIPAddrMon @@ -88,8 +90,6 @@ interface -{$i IdCompilerDefines.inc} - uses Classes, IdGlobal, diff --git a/Lib/Protocols/IdIPWatch.pas b/Lib/Protocols/IdIPWatch.pas index b6eeba479..a1a8c37b5 100644 --- a/Lib/Protocols/IdIPWatch.pas +++ b/Lib/Protocols/IdIPWatch.pas @@ -64,10 +64,10 @@ Original Author: Dave Nosker - AfterWave Technologies (allbyte@jetlink.net) } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, diff --git a/Lib/Protocols/IdIdent.pas b/Lib/Protocols/IdIdent.pas index 8074a7c01..45cbc593d 100644 --- a/Lib/Protocols/IdIdent.pas +++ b/Lib/Protocols/IdIdent.pas @@ -45,10 +45,10 @@ This is the Ident client which is based on RFC 1413. } -interface - {$i IdCompilerDefines.inc} +interface + uses IdAssignedNumbers, IdException, IdTCPClient; diff --git a/Lib/Protocols/IdIdentServer.pas b/Lib/Protocols/IdIdentServer.pas index ed51395b6..d68b6d19d 100644 --- a/Lib/Protocols/IdIdentServer.pas +++ b/Lib/Protocols/IdIdentServer.pas @@ -56,10 +56,10 @@ reflect what it does. } -interface - {$i IdCompilerDefines.inc} +interface + uses IdAssignedNumbers, IdContext, IdCustomTCPServer, IdGlobal; diff --git a/Lib/Protocols/IdIrcServer.pas b/Lib/Protocols/IdIrcServer.pas index c865acdc1..722a87a93 100644 --- a/Lib/Protocols/IdIrcServer.pas +++ b/Lib/Protocols/IdIrcServer.pas @@ -68,10 +68,10 @@ unit IdIrcServer; -interface - {$i IdCompilerDefines.inc} +interface + { Original Author: Ozz Nixon -RFC 1459 - Internet Relay Chat diff --git a/Lib/Protocols/IdLDAPV3.pas b/Lib/Protocols/IdLDAPV3.pas index f08bc5fc8..169c9002e 100644 --- a/Lib/Protocols/IdLDAPV3.pas +++ b/Lib/Protocols/IdLDAPV3.pas @@ -22,10 +22,10 @@ unit IdLDAPV3; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdContainers; diff --git a/Lib/Protocols/IdLDAPV3Coder.pas b/Lib/Protocols/IdLDAPV3Coder.pas index 4329d96be..7433a2f62 100644 --- a/Lib/Protocols/IdLDAPV3Coder.pas +++ b/Lib/Protocols/IdLDAPV3Coder.pas @@ -22,10 +22,10 @@ unit IdLDAPV3Coder; -interface - {$i IdCompilerDefines.inc} +interface + uses IdASN1Coder, IdLdapV3; diff --git a/Lib/Protocols/IdLPR.pas b/Lib/Protocols/IdLPR.pas index 1399309d6..893fa5d7f 100644 --- a/Lib/Protocols/IdLPR.pas +++ b/Lib/Protocols/IdLPR.pas @@ -67,14 +67,16 @@ mail: babelfisch@daybyday.de } +{$i IdCompilerDefines.inc} + interface -{$i IdCompilerDefines.inc} + uses Classes, IdAssignedNumbers, IdGlobal, IdException, IdTCPClient, - IdComponent, IdBaseComponent; + IdComponent; type TIdLPRFileFormat = @@ -189,11 +191,6 @@ EIdLPRErrorException = class(EIdException); implementation uses - {$IFDEF DOTNET} - IdStreamNET, - {$ELSE} - IdStreamVCL, - {$ENDIF} IdGlobalProtocols, IdResourceStringsProtocols, IdStack, IdStackConsts, SysUtils; diff --git a/Lib/Protocols/IdMIMETypes.pas b/Lib/Protocols/IdMIMETypes.pas index 5ebc7c2c8..a5aef7561 100644 --- a/Lib/Protocols/IdMIMETypes.pas +++ b/Lib/Protocols/IdMIMETypes.pas @@ -31,9 +31,10 @@ unit IdMIMETypes; -interface {$i IdCompilerDefines.inc} +interface + const MIMESplit = '/'; {Do not Localize} MIMEXVal = 'x-'; {Do not Localize} diff --git a/Lib/Protocols/IdMailBox.pas b/Lib/Protocols/IdMailBox.pas index c4e897d83..6ae141d1b 100644 --- a/Lib/Protocols/IdMailBox.pas +++ b/Lib/Protocols/IdMailBox.pas @@ -44,9 +44,9 @@ IdMailBox (Created for use with the IdIMAP4 unit) By Idan Cohen i_cohen@yahoo.com } +{$i IdCompilerDefines.inc} interface -{$i IdCompilerDefines.inc} uses {$IFNDEF HAS_UInt32} @@ -54,7 +54,6 @@ interface {$ENDIF} IdBaseComponent, IdMessage, - IdException, IdMessageCollection; type diff --git a/Lib/Protocols/IdMappedFTP.pas b/Lib/Protocols/IdMappedFTP.pas index a5ee009eb..0f73f1608 100644 --- a/Lib/Protocols/IdMappedFTP.pas +++ b/Lib/Protocols/IdMappedFTP.pas @@ -78,14 +78,14 @@ unit IdMappedFTP; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdContext, IdAssignedNumbers, IdMappedPortTCP, IdStack, IdYarn, - IdTCPConnection,IdTCPServer, IdThread, IdGlobal; + IdTCPConnection, IdThread, IdGlobal; type TIdMappedFtpDataThread = class; @@ -163,7 +163,7 @@ TIdMappedFTP = class(TIdMappedPortTCP) implementation uses - IdGlobalProtocols, IdIOHandlerSocket, IdException, + IdGlobalProtocols, IdIOHandlerSocket, IdResourceStringsProtocols, IdTcpClient, IdSimpleServer, IdStackConsts, SysUtils; diff --git a/Lib/Protocols/IdMappedPOP3.pas b/Lib/Protocols/IdMappedPOP3.pas index 980cba157..63819883d 100644 --- a/Lib/Protocols/IdMappedPOP3.pas +++ b/Lib/Protocols/IdMappedPOP3.pas @@ -46,17 +46,16 @@ unit IdMappedPOP3; -interface - {$i IdCompilerDefines.inc} +interface + uses {$IFDEF WORKAROUND_INLINE_CONSTRUCTORS} Classes, {$ENDIF} IdAssignedNumbers, - IdMappedPortTCP, IdMappedTelnet, IdReplyPOP3, - IdTCPServer; + IdMappedPortTCP, IdMappedTelnet, IdReplyPOP3; type TIdMappedPOP3Context = class (TIdMappedTelnetContext) @@ -96,7 +95,7 @@ TIdMappedPOP3 = class (TIdMappedTelnet) implementation uses - IdGlobal, IdException, IdIOHandlerSocket, IdResourceStringsProtocols, + IdGlobal, IdException, IdResourceStringsProtocols, IdTCPClient, IdTCPConnection, SysUtils; { TIdMappedPOP3 } diff --git a/Lib/Protocols/IdMappedPortTCP.pas b/Lib/Protocols/IdMappedPortTCP.pas index 3d10b1210..9cbe8a149 100644 --- a/Lib/Protocols/IdMappedPortTCP.pas +++ b/Lib/Protocols/IdMappedPortTCP.pas @@ -114,16 +114,15 @@ unit IdMappedPortTCP; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, - IdAssignedNumbers, IdContext, IdCustomTCPServer, - IdGlobal, IdStack, IdTCPConnection, IdTCPServer, IdYarn, SysUtils; + IdGlobal, IdStack, IdTCPConnection, IdYarn, SysUtils; type TIdMappedPortTCP = class; @@ -201,8 +200,7 @@ TIdMappedPortTCP = class(TIdCustomTCPServer) Implementation uses - IdException, - IdIOHandler, IdIOHandlerSocket, IdResourceStrings,IdStackConsts, IdTCPClient; + IdIOHandler, IdIOHandlerSocket, IdTCPClient; procedure TIdMappedPortTCP.InitComponent; begin diff --git a/Lib/Protocols/IdMappedPortUDP.pas b/Lib/Protocols/IdMappedPortUDP.pas index 307892dbf..d8f761cf5 100644 --- a/Lib/Protocols/IdMappedPortUDP.pas +++ b/Lib/Protocols/IdMappedPortUDP.pas @@ -39,10 +39,10 @@ unit IdMappedPortUDP; -interface - {$i IdCompilerDefines.inc} +interface + { - Syncronized with Indy standards by Gregor Ibic - Original DNS mapped port by Gregor Ibic diff --git a/Lib/Protocols/IdMappedTelnet.pas b/Lib/Protocols/IdMappedTelnet.pas index a8ea37956..bc60cf529 100644 --- a/Lib/Protocols/IdMappedTelnet.pas +++ b/Lib/Protocols/IdMappedTelnet.pas @@ -35,14 +35,13 @@ unit IdMappedTelnet; -interface - {$i IdCompilerDefines.inc} +interface + uses IdAssignedNumbers, - IdMappedPortTCP, - IdTCPServer; + IdMappedPortTCP; type TIdMappedTelnetContext = class(TIdMappedPortContext) @@ -88,7 +87,7 @@ implementation uses IdGlobal, IdException, IdResourceStringsProtocols, - IdIOHandlerSocket, IdTCPClient, SysUtils; + IdTCPClient, SysUtils; const NAMESEP = #0+#9+' :'; {do not localize} diff --git a/Lib/Protocols/IdMessage.pas b/Lib/Protocols/IdMessage.pas index ef60a20e0..60d4dd50a 100644 --- a/Lib/Protocols/IdMessage.pas +++ b/Lib/Protocols/IdMessage.pas @@ -297,10 +297,10 @@ is the encoded raw message part. Otherwise, it is the (decoded) text. } -interface - {$I IdCompilerDefines.inc} +interface + uses Classes, IdAttachment, @@ -533,7 +533,7 @@ implementation IdMessageCoderMIME, // Here so the 'MIME' in create will always suceed IdCharSets, IdGlobalProtocols, IdMessageCoder, IdResourceStringsProtocols, IdMessageClient, IdAttachmentFile, - IdText, SysUtils; + SysUtils; const cPriorityStrs: array[TIdMessagePriority] of string = ('urgent', 'urgent', 'normal', 'non-urgent', 'non-urgent'); diff --git a/Lib/Protocols/IdMessageBuilder.pas b/Lib/Protocols/IdMessageBuilder.pas index 8fbdbae98..c77b25efd 100644 --- a/Lib/Protocols/IdMessageBuilder.pas +++ b/Lib/Protocols/IdMessageBuilder.pas @@ -1,9 +1,9 @@ unit IdMessageBuilder; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdMessage; diff --git a/Lib/Protocols/IdMessageClient.pas b/Lib/Protocols/IdMessageClient.pas index b101b6968..d2c97bf10 100644 --- a/Lib/Protocols/IdMessageClient.pas +++ b/Lib/Protocols/IdMessageClient.pas @@ -397,10 +397,10 @@ Added support for generating encoded message body. } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdCoderMIME, @@ -409,8 +409,7 @@ interface IdHeaderList, IdIOHandlerStream, IdBaseComponent, - IdMessage, - IdTCPClient; + IdMessage; type TIdIOHandlerStreamMsg = class(TIdIOHandlerStream) @@ -476,18 +475,17 @@ implementation {$IFDEF DOTNET} System.IO, IdStreamNET, - {$ELSE} - IdStreamVCL, {$ENDIF} //TODO: Remove these references and make it completely pluggable. Check other spots in Indy as well IdMessageCoderBinHex4, IdMessageCoderQuotedPrintable, IdMessageCoderMIME, IdMessageCoderUUE, IdMessageCoderXXE, // IdGlobalProtocols, - IdCoder, IdCoder3to4, IdCoderBinHex4, + IdCoderBinHex4, IdCoderHeader, IdHeaderCoderBase, IdMessageCoder, IdComponent, IdException, IdResourceStringsProtocols, IdTCPConnection, IdTCPStream, IdIOHandler, - IdAttachmentFile, IdText, IdAttachment, + IdAttachment, + IdText, SysUtils; const diff --git a/Lib/Protocols/IdMessageCoder.pas b/Lib/Protocols/IdMessageCoder.pas index 5181a56d9..eeb962053 100644 --- a/Lib/Protocols/IdMessageCoder.pas +++ b/Lib/Protocols/IdMessageCoder.pas @@ -67,16 +67,15 @@ unit IdMessageCoder; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdComponent, IdGlobal, - IdMessage, - IdBaseComponent; + IdMessage; type TIdMessageCoderPartType = (mcptText, mcptAttachment, mcptIgnore, mcptEOF); diff --git a/Lib/Protocols/IdMessageCoderBinHex4.pas b/Lib/Protocols/IdMessageCoderBinHex4.pas index 50421464c..816c71402 100644 --- a/Lib/Protocols/IdMessageCoderBinHex4.pas +++ b/Lib/Protocols/IdMessageCoderBinHex4.pas @@ -1,13 +1,12 @@ unit IdMessageCoderBinHex4; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdMessageCoder, - IdMessage, IdGlobal; type @@ -24,7 +23,7 @@ TIdMessageEncoderInfoBinHex4 = class(TIdMessageEncoderInfo) implementation uses - IdCoder, IdCoderBinHex4, SysUtils; + IdCoderBinHex4, SysUtils; { TIdMessageEncoderInfoBinHex4 } diff --git a/Lib/Protocols/IdMessageCoderMIME.pas b/Lib/Protocols/IdMessageCoderMIME.pas index 08cda73e2..844909aeb 100644 --- a/Lib/Protocols/IdMessageCoderMIME.pas +++ b/Lib/Protocols/IdMessageCoderMIME.pas @@ -153,10 +153,10 @@ // TODO: Predict output sizes and presize outputs, then use move on // presized outputs when possible, or presize only and reposition if stream -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdBaseComponent, @@ -215,7 +215,7 @@ TIdMIMEBoundaryStrings = class implementation uses - IdCoder, IdCoderMIME, IdException, IdGlobalProtocols, IdResourceStrings, + IdCoder, IdCoderMIME, IdGlobalProtocols, IdCoderQuotedPrintable, IdCoderBinHex4, IdCoderHeader, SysUtils; type diff --git a/Lib/Protocols/IdMessageCoderQuotedPrintable.pas b/Lib/Protocols/IdMessageCoderQuotedPrintable.pas index e8f41d0f8..ddd664c6d 100644 --- a/Lib/Protocols/IdMessageCoderQuotedPrintable.pas +++ b/Lib/Protocols/IdMessageCoderQuotedPrintable.pas @@ -41,16 +41,15 @@ unit IdMessageCoderQuotedPrintable; -interface - {$i IdCompilerDefines.inc} +interface + // Written by C Costelloe, 23rd September 2003 uses Classes, IdMessageCoder, - IdMessage, IdGlobal; { Note: Decoding handled by IdMessageDecoderMIME } @@ -69,7 +68,7 @@ TIdMessageEncoderInfoQuotedPrintable = class(TIdMessageEncoderInfo) implementation uses - IdCoder, IdCoderMIME, IdException, IdGlobalProtocols, IdResourceStrings, IdCoderQuotedPrintable, + IdCoderMIME, IdGlobalProtocols, IdCoderQuotedPrintable, IdCoderHeader, SysUtils; { TIdMessageEncoderInfoQuotedPrintable } diff --git a/Lib/Protocols/IdMessageCoderUUE.pas b/Lib/Protocols/IdMessageCoderUUE.pas index 3bb0dc3e1..0f5f8e51f 100644 --- a/Lib/Protocols/IdMessageCoderUUE.pas +++ b/Lib/Protocols/IdMessageCoderUUE.pas @@ -65,10 +65,10 @@ unit IdMessageCoderUUE; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdCoder3to4, diff --git a/Lib/Protocols/IdMessageCoderXXE.pas b/Lib/Protocols/IdMessageCoderXXE.pas index f4ae914bd..a4a5cbe3c 100644 --- a/Lib/Protocols/IdMessageCoderXXE.pas +++ b/Lib/Protocols/IdMessageCoderXXE.pas @@ -27,11 +27,12 @@ unit IdMessageCoderXXE; -interface {$i IdCompilerDefines.inc} +interface + uses - IdMessageCoderUUE, IdMessageCoder, IdMessage; + IdMessageCoderUUE, IdMessageCoder; type // No Decoder - UUE handles XXE decoding diff --git a/Lib/Protocols/IdMessageCoderYenc.pas b/Lib/Protocols/IdMessageCoderYenc.pas index da35fb995..13b268c1e 100644 --- a/Lib/Protocols/IdMessageCoderYenc.pas +++ b/Lib/Protocols/IdMessageCoderYenc.pas @@ -67,10 +67,10 @@ unit IdMessageCoderYenc; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdMessageCoder, IdMessage, IdExceptionCore, IdGlobal; @@ -120,11 +120,6 @@ TIdMessageEncoderInfoYenc = class(TIdMessageEncoderInfo) implementation uses - {$IFDEF DOTNET} - IdStreamNET, - {$ELSE} - IdStreamVCL, - {$ENDIF} IdHashCRC, IdResourceStringsProtocols, SysUtils; diff --git a/Lib/Protocols/IdMessageCollection.pas b/Lib/Protocols/IdMessageCollection.pas index 205dd146d..5a95d9df9 100644 --- a/Lib/Protocols/IdMessageCollection.pas +++ b/Lib/Protocols/IdMessageCollection.pas @@ -37,10 +37,10 @@ Originally by Peter Mee. } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdMessage; diff --git a/Lib/Protocols/IdMessageParts.pas b/Lib/Protocols/IdMessageParts.pas index 7cc563247..af2862c6d 100644 --- a/Lib/Protocols/IdMessageParts.pas +++ b/Lib/Protocols/IdMessageParts.pas @@ -62,10 +62,10 @@ unit IdMessageParts; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdHeaderList, diff --git a/Lib/Protocols/IdMultipartFormData.pas b/Lib/Protocols/IdMultipartFormData.pas index b9e4ad196..d6c5e6564 100644 --- a/Lib/Protocols/IdMultipartFormData.pas +++ b/Lib/Protocols/IdMultipartFormData.pas @@ -101,10 +101,10 @@ Author: Shiv Kumar } -interface - {$I IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, diff --git a/Lib/Protocols/IdNNTP.pas b/Lib/Protocols/IdNNTP.pas index 597a9ae35..6521f8214 100644 --- a/Lib/Protocols/IdNNTP.pas +++ b/Lib/Protocols/IdNNTP.pas @@ -144,15 +144,14 @@ unit IdNNTP; -interface - {$i IdCompilerDefines.inc} +interface uses Classes, IdAssignedNumbers, IdExplicitTLSClientServerBase, IdException, IdGlobal, IdMessage, IdMessageClient, IdReplyRFC, - IdTCPServer, IdTCPConnection; + IdTCPConnection; { Original Author: Chad Z. Hower a.k.a. Kudzu diff --git a/Lib/Protocols/IdNNTPServer.pas b/Lib/Protocols/IdNNTPServer.pas index d1f0ca978..ecb4d1154 100644 --- a/Lib/Protocols/IdNNTPServer.pas +++ b/Lib/Protocols/IdNNTPServer.pas @@ -131,10 +131,10 @@ unit IdNNTPServer; -interface - {$i IdCompilerDefines.inc} +interface + { Original Author: Ozz Nixon (Winshoes 7) } @@ -142,8 +142,8 @@ interface uses Classes, IdAssignedNumbers, IdContext, IdCustomTCPServer, IdYarn, IdCommandHandlers, IdException, - IdGlobal, IdServerIOHandler, IdCmdTCPServer, IdExplicitTLSClientServerBase, - IdTCPConnection, IdTCPServer, IdReply; + IdGlobal, IdCmdTCPServer, IdExplicitTLSClientServerBase, + IdTCPConnection, IdReply; (* For more information on NNTP visit http://www.faqs.org/rfcs/ diff --git a/Lib/Protocols/IdNTLM.pas b/Lib/Protocols/IdNTLM.pas index 374e98336..0c5f9ac86 100644 --- a/Lib/Protocols/IdNTLM.pas +++ b/Lib/Protocols/IdNTLM.pas @@ -45,8 +45,10 @@ interface {$i IdCompilerDefines.inc} uses - IdGlobal, - IdStruct; + IdGlobal + {$IFDEF DOTNET} + , IdStruct + {$ENDIF}; type {$IFDEF DOTNET} @@ -282,8 +284,6 @@ implementation {$ENDIF} IdFIPS, IdGlobalProtocols, - IdHash, - IdHashMessageDigest, IdCoderMIME {$IFDEF HAS_GENERICS_TArray_Copy} {$IFDEF HAS_UNIT_Generics_Collections} diff --git a/Lib/Protocols/IdNTLMv2.pas b/Lib/Protocols/IdNTLMv2.pas index 9d21f1ba5..d8c0d1fe5 100644 --- a/Lib/Protocols/IdNTLMv2.pas +++ b/Lib/Protocols/IdNTLMv2.pas @@ -1,9 +1,9 @@ unit IdNTLMv2; -interface - {$i IdCompilerDefines.inc} +interface + uses IdGlobal, IdStruct diff --git a/Lib/Protocols/IdNetworkCalculator.pas b/Lib/Protocols/IdNetworkCalculator.pas index 80a5884a3..63e390309 100644 --- a/Lib/Protocols/IdNetworkCalculator.pas +++ b/Lib/Protocols/IdNetworkCalculator.pas @@ -33,15 +33,14 @@ unit IdNetworkCalculator; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, - IdBaseComponent, - IdStruct; + IdBaseComponent; type TNetworkClass = ( diff --git a/Lib/Protocols/IdOSFileName.pas b/Lib/Protocols/IdOSFileName.pas index 6be9e2743..4e50fa007 100644 --- a/Lib/Protocols/IdOSFileName.pas +++ b/Lib/Protocols/IdOSFileName.pas @@ -35,10 +35,10 @@ unit IdOSFileName; -interface - {$i IdCompilerDefines.inc} +interface + uses IdBaseComponent, IdFTPCommon; diff --git a/Lib/Protocols/IdOTPCalculator.pas b/Lib/Protocols/IdOTPCalculator.pas index a45de1a4f..4bb25a6ba 100644 --- a/Lib/Protocols/IdOTPCalculator.pas +++ b/Lib/Protocols/IdOTPCalculator.pas @@ -55,9 +55,10 @@ unit IdOTPCalculator; -interface {$i IdCompilerDefines.inc} +interface + uses IdException; diff --git a/Lib/Protocols/IdPOP3.pas b/Lib/Protocols/IdPOP3.pas index 93bfd0430..d470a48f0 100644 --- a/Lib/Protocols/IdPOP3.pas +++ b/Lib/Protocols/IdPOP3.pas @@ -186,10 +186,10 @@ { POP 3 (Post Office Protocol Version 3) } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdAssignedNumbers, @@ -201,9 +201,7 @@ interface IdMessageClient, IdReply, IdSASL, - IdSASLCollection, - IdBaseComponent, - IdUserPassProvider; + IdSASLCollection; type TIdPOP3AuthenticationType = (patUserPass, patAPOP, patSASL); diff --git a/Lib/Protocols/IdPOP3Server.pas b/Lib/Protocols/IdPOP3Server.pas index 51b099546..acfd75657 100644 --- a/Lib/Protocols/IdPOP3Server.pas +++ b/Lib/Protocols/IdPOP3Server.pas @@ -174,9 +174,10 @@ unit IdPOP3Server; -interface {$i IdCompilerDefines.inc} +interface + { Indy POP3 Server @@ -203,11 +204,8 @@ interface IdExplicitTLSClientServerBase, IdGlobal, IdReply, - IdTCPServer, - IdServerIOHandler, IdMailBox, - IdBaseComponent, - IdTCPConnection, IdYarn; + IdTCPConnection; { We can not port APOP to NET due to the use of GetSystemClock and a process ID diff --git a/Lib/Protocols/IdQOTDUDP.pas b/Lib/Protocols/IdQOTDUDP.pas index aa73d15a8..37751de4b 100644 --- a/Lib/Protocols/IdQOTDUDP.pas +++ b/Lib/Protocols/IdQOTDUDP.pas @@ -24,10 +24,10 @@ unit IdQOTDUDP; -interface - {$i IdCompilerDefines.inc} +interface + uses IdAssignedNumbers, IdUDPBase, IdUDPClient; diff --git a/Lib/Protocols/IdQOTDUDPServer.pas b/Lib/Protocols/IdQOTDUDPServer.pas index 4a76dadc8..b57cad290 100644 --- a/Lib/Protocols/IdQOTDUDPServer.pas +++ b/Lib/Protocols/IdQOTDUDPServer.pas @@ -33,11 +33,12 @@ unit IdQOTDUDPServer; -interface {$i IdCompilerDefines.inc} +interface + uses - IdAssignedNumbers, IdGlobal, IdSocketHandle, IdUDPBase, IdUDPServer; + IdAssignedNumbers, IdGlobal, IdSocketHandle, IdUDPServer; type TIdQotdUDPGetEvent = procedure (ABinding: TIdSocketHandle; var AQuote : String) of object; diff --git a/Lib/Protocols/IdQotd.pas b/Lib/Protocols/IdQotd.pas index 2b91e0679..6763a2aa2 100644 --- a/Lib/Protocols/IdQotd.pas +++ b/Lib/Protocols/IdQotd.pas @@ -40,9 +40,10 @@ { } {*******************************************************} -interface {$i IdCompilerDefines.inc} +interface + uses IdAssignedNumbers, IdTCPClient; diff --git a/Lib/Protocols/IdQotdServer.pas b/Lib/Protocols/IdQotdServer.pas index f083b221a..c24f9c718 100644 --- a/Lib/Protocols/IdQotdServer.pas +++ b/Lib/Protocols/IdQotdServer.pas @@ -47,10 +47,10 @@ unit IdQotdServer; -interface - {$i IdCompilerDefines.inc} +interface + { Original Author: Ozz Nixon (RFC 865) [less than 512 characters total, multiple lines OK!] diff --git a/Lib/Protocols/IdRSH.pas b/Lib/Protocols/IdRSH.pas index d2e926f40..f9e7575b4 100644 --- a/Lib/Protocols/IdRSH.pas +++ b/Lib/Protocols/IdRSH.pas @@ -39,9 +39,9 @@ Original author J. Peter Mugaas 2001-February-15 } +{$i IdCompilerDefines.inc} interface -{$i IdCompilerDefines.inc} uses IdAssignedNumbers, IdGlobal, IdRemoteCMDClient, IdTCPClient; @@ -68,8 +68,6 @@ implementation uses IdComponent, IdGlobalProtocols, - IdSimpleServer, - IdTCPConnection, IdThread; { TIdRSH } diff --git a/Lib/Protocols/IdRSHServer.pas b/Lib/Protocols/IdRSHServer.pas index a644a8a81..a47fb04f3 100644 --- a/Lib/Protocols/IdRSHServer.pas +++ b/Lib/Protocols/IdRSHServer.pas @@ -54,11 +54,12 @@ agonized over writing this component at all due to these risks. } -interface {$i IdCompilerDefines.inc} +interface + uses - IdAssignedNumbers, IdContext, IdRemoteCMDServer, IdTCPClient, IdTCPServer; + IdAssignedNumbers, IdContext, IdRemoteCMDServer, IdTCPClient; const RSH_FORCEPORTSINRANGE = True; diff --git a/Lib/Protocols/IdRegister.pas b/Lib/Protocols/IdRegister.pas index f04cf5c85..c5d9982ee 100644 --- a/Lib/Protocols/IdRegister.pas +++ b/Lib/Protocols/IdRegister.pas @@ -172,11 +172,10 @@ unit IdRegister; +{$i IdCompilerDefines.inc} interface -{$i IdCompilerDefines.inc} - uses Classes; diff --git a/Lib/Protocols/IdRemoteCMDClient.pas b/Lib/Protocols/IdRemoteCMDClient.pas index dd1214ed4..2adf3cf12 100644 --- a/Lib/Protocols/IdRemoteCMDClient.pas +++ b/Lib/Protocols/IdRemoteCMDClient.pas @@ -52,9 +52,10 @@ 2001-February-15 } -interface {$i IdCompilerDefines.inc} +interface + uses IdException, IdTCPClient; diff --git a/Lib/Protocols/IdRemoteCMDServer.pas b/Lib/Protocols/IdRemoteCMDServer.pas index d16df934f..6487cb43d 100644 --- a/Lib/Protocols/IdRemoteCMDServer.pas +++ b/Lib/Protocols/IdRemoteCMDServer.pas @@ -38,12 +38,12 @@ unit IdRemoteCMDServer; -interface - {$i IdCompilerDefines.inc} +interface + uses - IdAssignedNumbers, IdContext,IdTCPClient, IdCustomTCPServer; + IdContext,IdTCPClient, IdCustomTCPServer; type TIdRemoteCMDServer = class(TIdCustomTCPServer) @@ -61,7 +61,7 @@ TIdRemoteCMDServer = class(TIdCustomTCPServer) implementation uses - IdSocketHandle, IdException, IdGlobal, IdIOHandlerStack, IdIOHandlerSocket, IdStack, SysUtils; + IdSocketHandle, IdGlobal, IdIOHandlerStack, IdIOHandlerSocket, IdStack, SysUtils; { TIdRemoteCMDServer } diff --git a/Lib/Protocols/IdReplyFTP.pas b/Lib/Protocols/IdReplyFTP.pas index 7605cfa99..df007079f 100644 --- a/Lib/Protocols/IdReplyFTP.pas +++ b/Lib/Protocols/IdReplyFTP.pas @@ -73,10 +73,10 @@ unit IdReplyFTP; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdReply, @@ -115,7 +115,6 @@ EIdFTPServiceNotAvailable = class(EIdReplyRFCError); implementation uses - IdException, IdGlobal, SysUtils; { TIdReplyFTP } diff --git a/Lib/Protocols/IdReplyIMAP4.pas b/Lib/Protocols/IdReplyIMAP4.pas index 7595256c2..60499c74a 100644 --- a/Lib/Protocols/IdReplyIMAP4.pas +++ b/Lib/Protocols/IdReplyIMAP4.pas @@ -109,14 +109,13 @@ unit IdReplyIMAP4; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, - IdReply, - IdReplyRFC; + IdReply; const IMAP_OK = 'OK'; {Do not Localize} diff --git a/Lib/Protocols/IdReplyPOP3.pas b/Lib/Protocols/IdReplyPOP3.pas index 5d28da92d..b572b7e9c 100644 --- a/Lib/Protocols/IdReplyPOP3.pas +++ b/Lib/Protocols/IdReplyPOP3.pas @@ -93,9 +93,10 @@ unit IdReplyPOP3; -interface {$i IdCompilerDefines.inc} +interface + uses Classes, IdException, diff --git a/Lib/Protocols/IdReplySMTP.pas b/Lib/Protocols/IdReplySMTP.pas index a1dbcd30a..ef819004c 100644 --- a/Lib/Protocols/IdReplySMTP.pas +++ b/Lib/Protocols/IdReplySMTP.pas @@ -97,10 +97,10 @@ unit IdReplySMTP; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, diff --git a/Lib/Protocols/IdRexec.pas b/Lib/Protocols/IdRexec.pas index 805c91706..cea176bbc 100644 --- a/Lib/Protocols/IdRexec.pas +++ b/Lib/Protocols/IdRexec.pas @@ -52,9 +52,9 @@ Original author Laurence LIew 2000-October-24 } +{$i IdCompilerDefines.inc} interface -{$i IdCompilerDefines.inc} uses IdAssignedNumbers, @@ -79,8 +79,6 @@ implementation uses IdComponent, IdGlobal, - IdSimpleServer, - IdTCPConnection, IdThread; procedure TIdRexec.InitComponent; diff --git a/Lib/Protocols/IdRexecServer.pas b/Lib/Protocols/IdRexecServer.pas index 18fd18583..62733928f 100644 --- a/Lib/Protocols/IdRexecServer.pas +++ b/Lib/Protocols/IdRexecServer.pas @@ -45,12 +45,12 @@ This is based on the IdRexec.pas unit and programming comments at http://www.abandoned.org/nemon/rexeclib.py } +{$i IdCompilerDefines.inc} interface -{$i IdCompilerDefines.inc} uses - IdAssignedNumbers, IdContext, IdRemoteCMDServer, IdTCPClient, IdTCPServer; + IdAssignedNumbers, IdContext, IdRemoteCMDServer, IdTCPClient; type TIdRexecCommandEvent = procedure (AThread: TIdContext; diff --git a/Lib/Protocols/IdSASL.pas b/Lib/Protocols/IdSASL.pas index 8a9d16ff3..d0ea57abe 100644 --- a/Lib/Protocols/IdSASL.pas +++ b/Lib/Protocols/IdSASL.pas @@ -53,16 +53,14 @@ unit IdSASL; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, - IdBaseComponent, - IdTCPConnection, - IdException; + IdBaseComponent; type TIdSASLResult = (srSuccess, srFailure, srAborted); diff --git a/Lib/Protocols/IdSASLAnonymous.pas b/Lib/Protocols/IdSASLAnonymous.pas index dbe5b0029..6735d176f 100644 --- a/Lib/Protocols/IdSASLAnonymous.pas +++ b/Lib/Protocols/IdSASLAnonymous.pas @@ -26,12 +26,12 @@ unit IdSASLAnonymous; -interface - {$i IdCompilerDefines.inc} +interface + uses - IdSASL, IdTCPConnection; + IdSASL; { Implements RFC 2245 diff --git a/Lib/Protocols/IdSASLCollection.pas b/Lib/Protocols/IdSASLCollection.pas index 51af2ae78..e3c12b3fc 100644 --- a/Lib/Protocols/IdSASLCollection.pas +++ b/Lib/Protocols/IdSASLCollection.pas @@ -40,10 +40,10 @@ unit IdSASLCollection; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdBaseComponent, diff --git a/Lib/Protocols/IdSASLDigest.pas b/Lib/Protocols/IdSASLDigest.pas index 131e71506..f6c271677 100644 --- a/Lib/Protocols/IdSASLDigest.pas +++ b/Lib/Protocols/IdSASLDigest.pas @@ -1,11 +1,13 @@ unit IdSASLDigest; -interface {$i IdCompilerDefines.inc} + +interface + uses Classes, SysUtils, //here to facilitate inline expansion - IdSASL, IdSASLUserPass, IdUserPassProvider, IdException; + IdSASL, IdSASLUserPass, IdException; type TIdSASLDigest = class(TIdSASLUserPass) diff --git a/Lib/Protocols/IdSASLExternal.pas b/Lib/Protocols/IdSASLExternal.pas index 1a60eeefd..479140b88 100644 --- a/Lib/Protocols/IdSASLExternal.pas +++ b/Lib/Protocols/IdSASLExternal.pas @@ -24,12 +24,12 @@ unit IdSASLExternal; -interface - {$i IdCompilerDefines.inc} +interface + uses - IdSASL, IdTCPConnection; + IdSASL; { Implements RFC 2222: External SASL Mechanism diff --git a/Lib/Protocols/IdSASLLogin.pas b/Lib/Protocols/IdSASLLogin.pas index f01281eec..df4a94e87 100644 --- a/Lib/Protocols/IdSASLLogin.pas +++ b/Lib/Protocols/IdSASLLogin.pas @@ -31,10 +31,10 @@ unit IdSASLLogin; -interface - {$i IdCompilerDefines.inc} +interface + uses IdSASL, IdSASLUserPass; @@ -54,7 +54,7 @@ TIdSASLLogin = class(TIdSASLUserPass) implementation uses - IdGlobal, IdUserPassProvider, IdBaseComponent; + IdGlobal; function IsUsernameChallenge(const AChallenge: string): Boolean; begin diff --git a/Lib/Protocols/IdSASLOAuth.pas b/Lib/Protocols/IdSASLOAuth.pas index eca6be876..9d54a77e7 100644 --- a/Lib/Protocols/IdSASLOAuth.pas +++ b/Lib/Protocols/IdSASLOAuth.pas @@ -18,10 +18,10 @@ unit IdSASLOAuth; -interface - {$i IdCompilerDefines.inc} +interface + uses IdGlobal, IdSASL, diff --git a/Lib/Protocols/IdSASLOTP.pas b/Lib/Protocols/IdSASLOTP.pas index b78657663..80acc3030 100644 --- a/Lib/Protocols/IdSASLOTP.pas +++ b/Lib/Protocols/IdSASLOTP.pas @@ -37,10 +37,10 @@ unit IdSASLOTP; -interface {$i IdCompilerDefines.inc} + +interface uses - IdException, IdSASL, IdSASLUserPass; @@ -59,7 +59,7 @@ TIdSASLOTP = class(TIdSASLUserPass) implementation uses - IdBaseComponent, IdGlobal, IdOTPCalculator, IdUserPassProvider; + IdGlobal, IdOTPCalculator; { TIdSASLOTP } diff --git a/Lib/Protocols/IdSASLPlain.pas b/Lib/Protocols/IdSASLPlain.pas index 25813c320..0b57878b4 100644 --- a/Lib/Protocols/IdSASLPlain.pas +++ b/Lib/Protocols/IdSASLPlain.pas @@ -30,10 +30,10 @@ unit IdSASLPlain; -interface - {$i IdCompilerDefines.inc} +interface + uses IdSASL, IdSASLUserPass; diff --git a/Lib/Protocols/IdSASLSKey.pas b/Lib/Protocols/IdSASLSKey.pas index b9357dc7d..2240dd96f 100644 --- a/Lib/Protocols/IdSASLSKey.pas +++ b/Lib/Protocols/IdSASLSKey.pas @@ -36,8 +36,10 @@ unit IdSASLSKey; -interface {$i IdCompilerDefines.inc} + +interface + uses IdSASLUserPass, IdSASL; @@ -66,7 +68,7 @@ TIdSASLSKey = class(TIdSASLUserPass) implementation uses - IdBaseComponent, IdFIPS, IdGlobal, IdGlobalProtocols, IdOTPCalculator, IdUserPassProvider, SysUtils; + IdFIPS, IdGlobal, IdGlobalProtocols, IdOTPCalculator, SysUtils; const SKEYSERVICENAME = 'SKEY'; {do not localize} diff --git a/Lib/Protocols/IdSASLUserPass.pas b/Lib/Protocols/IdSASLUserPass.pas index bcce6a02c..7074275a0 100644 --- a/Lib/Protocols/IdSASLUserPass.pas +++ b/Lib/Protocols/IdSASLUserPass.pas @@ -29,10 +29,10 @@ unit IdSASLUserPass; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdSASL, IdUserPassProvider, IdBaseComponent, diff --git a/Lib/Protocols/IdSASL_CRAMBase.pas b/Lib/Protocols/IdSASL_CRAMBase.pas index 12b550ee7..ae99c7c9e 100644 --- a/Lib/Protocols/IdSASL_CRAMBase.pas +++ b/Lib/Protocols/IdSASL_CRAMBase.pas @@ -57,11 +57,11 @@ IETF draft draft-ietf-ipsec-hmac-md5-txt.00 } -interface {$i IdCompilerDefines.inc} +interface + uses - IdHMACSHA1, IdSASL, IdSASLUserPass; diff --git a/Lib/Protocols/IdSASL_CRAM_MD5.pas b/Lib/Protocols/IdSASL_CRAM_MD5.pas index 5f4c3fc7b..ce33123cd 100644 --- a/Lib/Protocols/IdSASL_CRAM_MD5.pas +++ b/Lib/Protocols/IdSASL_CRAM_MD5.pas @@ -56,14 +56,14 @@ RFC 2195 (IMAP/POP3 AUTHorize Extension for Simple Challenge/Response) IETF draft draft-ietf-ipsec-hmac-md5-txt.00 } +{$i IdCompilerDefines.inc} interface -{$i IdCompilerDefines.inc} + uses IdSASL, - IdSASL_CRAMBase, - IdSASLUserPass; + IdSASL_CRAMBase; type diff --git a/Lib/Protocols/IdSASL_CRAM_SHA1.pas b/Lib/Protocols/IdSASL_CRAM_SHA1.pas index e986ef46a..54db79589 100644 --- a/Lib/Protocols/IdSASL_CRAM_SHA1.pas +++ b/Lib/Protocols/IdSASL_CRAM_SHA1.pas @@ -57,13 +57,13 @@ IETF draft draft-ietf-ipsec-hmac-md5-txt.00 } -interface {$i IdCompilerDefines.inc} +interface + uses IdSASL, - IdSASL_CRAMBase, - IdSASLUserPass; + IdSASL_CRAMBase; type diff --git a/Lib/Protocols/IdSASL_NTLM.pas b/Lib/Protocols/IdSASL_NTLM.pas index a2d344831..08fd94b50 100644 --- a/Lib/Protocols/IdSASL_NTLM.pas +++ b/Lib/Protocols/IdSASL_NTLM.pas @@ -1,9 +1,9 @@ unit IdSASL_NTLM; -interface - {$i IdCompilerDefines.inc} +interface + uses IdGlobal, IdSASL, diff --git a/Lib/Protocols/IdSMTP.pas b/Lib/Protocols/IdSMTP.pas index 7988db1d1..985b5ee89 100644 --- a/Lib/Protocols/IdSMTP.pas +++ b/Lib/Protocols/IdSMTP.pas @@ -184,15 +184,14 @@ unit IdSMTP; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdAssignedNumbers, IdEMailAddress, - IdException, IdExplicitTLSClientServerBase, IdHeaderList, IdMessage, @@ -266,9 +265,7 @@ implementation uses IdCoderMIME, IdGlobalProtocols, - IdReplySMTP, IdSSL, - IdResourceStringsProtocols, IdTCPConnection; { TIdSMTP } diff --git a/Lib/Protocols/IdSMTPBase.pas b/Lib/Protocols/IdSMTPBase.pas index 33b4e3e9c..b517d4161 100644 --- a/Lib/Protocols/IdSMTPBase.pas +++ b/Lib/Protocols/IdSMTPBase.pas @@ -85,10 +85,10 @@ unit IdSMTPBase; -interface - {$i IdCompilerDefines.inc} +interface + uses IdGlobal, IdEMailAddress, @@ -180,7 +180,7 @@ implementation {$IFDEF VCL_XE3_OR_ABOVE} System.Classes, {$ENDIF} - IdAssignedNumbers, IdException, + IdAssignedNumbers, IdExplicitTLSClientServerBase, IdGlobalProtocols, IdIOHandler, IdReplySMTP, IdSSL, diff --git a/Lib/Protocols/IdSMTPRelay.pas b/Lib/Protocols/IdSMTPRelay.pas index 488a49db9..a09079efc 100644 --- a/Lib/Protocols/IdSMTPRelay.pas +++ b/Lib/Protocols/IdSMTPRelay.pas @@ -126,13 +126,13 @@ to keep track of the status as the sending is in progress. } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, - IdAssignedNumbers, IdException, IdExceptionCore, + IdException, IdExceptionCore, IdEMailAddress, IdGlobal, IdHeaderList, IdDNSResolver, IdMessage, IdMessageClient, IdBaseComponent, IdSMTPBase, IdReplySMTP, SysUtils; diff --git a/Lib/Protocols/IdSMTPServer.pas b/Lib/Protocols/IdSMTPServer.pas index e12d3ddc2..301e7f98b 100644 --- a/Lib/Protocols/IdSMTPServer.pas +++ b/Lib/Protocols/IdSMTPServer.pas @@ -49,10 +49,10 @@ unit IdSMTPServer; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdAssignedNumbers, diff --git a/Lib/Protocols/IdSNMP.pas b/Lib/Protocols/IdSNMP.pas index a4cce3c07..d456f7ecc 100644 --- a/Lib/Protocols/IdSNMP.pas +++ b/Lib/Protocols/IdSNMP.pas @@ -54,18 +54,16 @@ | (Found at URL: http://www.ararat.cz/synapse/) | |==============================================================================| } +{$i IdCompilerDefines.inc} interface -{$i IdCompilerDefines.inc} - uses Classes, {$IFDEF HAS_UNIT_Generics_Collections} System.Generics.Collections, {$ENDIF} IdASN1Util, - IdException, IdGlobal, IdUDPBase, IdUDPClient, diff --git a/Lib/Protocols/IdSNPP.pas b/Lib/Protocols/IdSNPP.pas index 6c27adb1f..79f5c076a 100644 --- a/Lib/Protocols/IdSNPP.pas +++ b/Lib/Protocols/IdSNPP.pas @@ -53,9 +53,10 @@ unit IdSNPP; -interface {$i IdCompilerDefines.inc} +interface + uses IdComponent, IdGlobal, IdException, IdGlobalProtocols, IdReplyRFC, diff --git a/Lib/Protocols/IdSNTP.pas b/Lib/Protocols/IdSNTP.pas index e86c24055..7d2613fe7 100644 --- a/Lib/Protocols/IdSNTP.pas +++ b/Lib/Protocols/IdSNTP.pas @@ -76,11 +76,12 @@ R. Brian Lindahl - Original Author *} -interface {$i IdCompilerDefines.inc} +interface + uses - Classes, + Classes, IdGlobal, IdUDPClient; diff --git a/Lib/Protocols/IdSSH.pas b/Lib/Protocols/IdSSH.pas index 158b3d833..3fc31f039 100644 --- a/Lib/Protocols/IdSSH.pas +++ b/Lib/Protocols/IdSSH.pas @@ -27,10 +27,10 @@ unit IdSSH; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdContainers, diff --git a/Lib/Protocols/IdSSL.pas b/Lib/Protocols/IdSSL.pas index 8a240729f..cd3f8fdc1 100644 --- a/Lib/Protocols/IdSSL.pas +++ b/Lib/Protocols/IdSSL.pas @@ -55,10 +55,10 @@ unit IdSSL; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, diff --git a/Lib/Protocols/IdSSLOpenSSL.pas b/Lib/Protocols/IdSSLOpenSSL.pas index dc3b47c22..31e962a02 100644 --- a/Lib/Protocols/IdSSLOpenSSL.pas +++ b/Lib/Protocols/IdSSLOpenSSL.pas @@ -197,10 +197,10 @@ This helps user code distinquish between Self-signed and invalid certificates. } -interface - {$I IdCompilerDefines.inc} +interface + {$IFNDEF USE_OPENSSL} {$message error Should not compile if USE_OPENSSL is not defined!!!} {$ENDIF} @@ -213,7 +213,6 @@ interface Windows, {$ENDIF} Classes, - IdBuffer, IdCTypes, IdGlobal, IdException, @@ -223,14 +222,9 @@ interface IdComponent, IdIOHandler, IdGlobalProtocols, - IdTCPServer, IdThread, - IdTCPConnection, - IdIntercept, IdIOHandlerSocket, IdSSL, - IdSocks, - IdScheduler, IdYarn; type @@ -684,14 +678,9 @@ implementation Posix.Unistd, {$ENDIF} IdFIPS, - IdResourceStringsCore, IdResourceStringsProtocols, IdResourceStringsOpenSSL, IdStack, - IdStackBSDBase, - IdAntiFreezeBase, - IdExceptionCore, - IdResourceStrings, IdThreadSafe, SysUtils, SyncObjs; diff --git a/Lib/Protocols/IdSSLOpenSSLHeaders.pas b/Lib/Protocols/IdSSLOpenSSLHeaders.pas index e2d2c2d38..483871472 100644 --- a/Lib/Protocols/IdSSLOpenSSLHeaders.pas +++ b/Lib/Protocols/IdSSLOpenSSLHeaders.pas @@ -187,10 +187,10 @@ } -interface - {$I IdCompilerDefines.inc} +interface + {$IFNDEF USE_OPENSSL} {$message error Should not compile if USE_OPENSSL is not defined!!!} {$ENDIF} diff --git a/Lib/Protocols/IdSSLOpenSSLHeaders_static.pas b/Lib/Protocols/IdSSLOpenSSLHeaders_static.pas index eb26de2f6..832b3a53e 100644 --- a/Lib/Protocols/IdSSLOpenSSLHeaders_static.pas +++ b/Lib/Protocols/IdSSLOpenSSLHeaders_static.pas @@ -1,9 +1,9 @@ unit IdSSLOpenSSLHeaders_static; -interface - {$I IdCompilerDefines.inc} +interface + {$IFNDEF USE_OPENSSL} {$message error Should not compile if USE_OPENSSL is not defined!!!} {$ENDIF} diff --git a/Lib/Protocols/IdSSLOpenSSLUtils.pas b/Lib/Protocols/IdSSLOpenSSLUtils.pas index af8f2c556..525047036 100644 --- a/Lib/Protocols/IdSSLOpenSSLUtils.pas +++ b/Lib/Protocols/IdSSLOpenSSLUtils.pas @@ -1,9 +1,9 @@ unit IdSSLOpenSSLUtils; -interface - {$I IdCompilerDefines.inc} +interface + uses IdCTypes, IdSSLOpenSSLHeaders, diff --git a/Lib/Protocols/IdSSPI.pas b/Lib/Protocols/IdSSPI.pas index 7160051fb..65f7d9c6d 100644 --- a/Lib/Protocols/IdSSPI.pas +++ b/Lib/Protocols/IdSSPI.pas @@ -33,13 +33,12 @@ unit IdSSPI; +{$i IdCompilerDefines.inc} {$ALIGN ON} {$MINENUMSIZE 4} interface -{$i IdCompilerDefines.inc} - uses IdGlobal, Windows; diff --git a/Lib/Protocols/IdServerInterceptLogBase.pas b/Lib/Protocols/IdServerInterceptLogBase.pas index 1da41afa7..8a21c4d6a 100644 --- a/Lib/Protocols/IdServerInterceptLogBase.pas +++ b/Lib/Protocols/IdServerInterceptLogBase.pas @@ -41,9 +41,10 @@ unit IdServerInterceptLogBase; -interface {$i IdCompilerDefines.inc} +interface + uses IdIntercept, IdGlobal, IdLogBase, IdBaseComponent, Classes; diff --git a/Lib/Protocols/IdServerInterceptLogEvent.pas b/Lib/Protocols/IdServerInterceptLogEvent.pas index 326a86443..1b404b28e 100644 --- a/Lib/Protocols/IdServerInterceptLogEvent.pas +++ b/Lib/Protocols/IdServerInterceptLogEvent.pas @@ -26,9 +26,10 @@ unit IdServerInterceptLogEvent; -interface {$i IdCompilerDefines.inc} +interface + uses IdServerInterceptLogBase; diff --git a/Lib/Protocols/IdServerInterceptLogFile.pas b/Lib/Protocols/IdServerInterceptLogFile.pas index d73e53c21..c6f6d1ce2 100644 --- a/Lib/Protocols/IdServerInterceptLogFile.pas +++ b/Lib/Protocols/IdServerInterceptLogFile.pas @@ -39,9 +39,10 @@ unit IdServerInterceptLogFile; -interface {$i IdCompilerDefines.inc} +interface + uses IdServerInterceptLogBase, IdGlobal, diff --git a/Lib/Protocols/IdSocksServer.pas b/Lib/Protocols/IdSocksServer.pas index 5bfef7adf..383d08705 100644 --- a/Lib/Protocols/IdSocksServer.pas +++ b/Lib/Protocols/IdSocksServer.pas @@ -94,10 +94,10 @@ unit IdSocksServer; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdAssignedNumbers, diff --git a/Lib/Protocols/IdStrings.pas b/Lib/Protocols/IdStrings.pas index d78fb217a..69ae23806 100644 --- a/Lib/Protocols/IdStrings.pas +++ b/Lib/Protocols/IdStrings.pas @@ -50,10 +50,10 @@ unit IdStrings; -interface - {$i IdCompilerDefines.inc} +interface + { IsWhiteString Returns TRUE when AStr contains only whitespace characters diff --git a/Lib/Protocols/IdSysLog.pas b/Lib/Protocols/IdSysLog.pas index 48f58be84..d2d512b34 100644 --- a/Lib/Protocols/IdSysLog.pas +++ b/Lib/Protocols/IdSysLog.pas @@ -51,10 +51,10 @@ in UDP Client. This will probably require some changes to the Indy core units though. } -interface - {$i IdCompilerDefines.inc} +interface + uses IdAssignedNumbers, IdSocketHandle, IdSysLogMessage, IdUDPBase, IdUDPClient; type @@ -80,7 +80,7 @@ TIdSysLog = class(TIdUDPClient) implementation uses - IdGlobal, IdStackConsts, SysUtils; + IdGlobal, SysUtils; { TIdSysLog } diff --git a/Lib/Protocols/IdSysLogMessage.pas b/Lib/Protocols/IdSysLogMessage.pas index 1f22fc999..84b3e6064 100644 --- a/Lib/Protocols/IdSysLogMessage.pas +++ b/Lib/Protocols/IdSysLogMessage.pas @@ -62,10 +62,10 @@ 08/09/01: Dev started } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, IdGlobalProtocols, IdBaseComponent; @@ -184,7 +184,7 @@ function logFacilityToNo(AFac : TIdSyslogFacility) : Word; implementation uses - IdAssignedNumbers, IdException, IdExceptionCore, IdResourceStringsProtocols, IdStack, IdStackConsts, IdUDPClient, SysUtils; + IdAssignedNumbers, IdException, IdExceptionCore, IdResourceStringsProtocols, IdStack, IdUDPClient, SysUtils; const // facility diff --git a/Lib/Protocols/IdSysLogServer.pas b/Lib/Protocols/IdSysLogServer.pas index 714b942eb..75ea6a9c7 100644 --- a/Lib/Protocols/IdSysLogServer.pas +++ b/Lib/Protocols/IdSysLogServer.pas @@ -42,22 +42,19 @@ unit IdSysLogServer; -interface {$i IdCompilerDefines.inc} +interface + uses IdAssignedNumbers, IdBaseComponent, IdComponent, IdGlobal, - IdException, IdSocketHandle, - IdStackConsts, IdThread, - IdUDPBase, IdUDPServer, - IdSysLogMessage, - IdSysLog; + IdSysLogMessage; type TOnSyslogEvent = procedure(Sender: TObject; ASysLogMessage: TIdSysLogMessage; diff --git a/Lib/Protocols/IdSystat.pas b/Lib/Protocols/IdSystat.pas index b7c4d4a8c..4266045ed 100644 --- a/Lib/Protocols/IdSystat.pas +++ b/Lib/Protocols/IdSystat.pas @@ -43,8 +43,10 @@ Note that this protocol is officially called Active User } -interface {$i IdCompilerDefines.inc} + +interface + uses Classes, IdAssignedNumbers, diff --git a/Lib/Protocols/IdSystatServer.pas b/Lib/Protocols/IdSystatServer.pas index fc9ee3c58..02fb4728d 100644 --- a/Lib/Protocols/IdSystatServer.pas +++ b/Lib/Protocols/IdSystatServer.pas @@ -51,8 +51,10 @@ Note that this protocol is officially called Active User } -interface {$i IdCompilerDefines.inc} + +interface + uses Classes, IdAssignedNumbers, diff --git a/Lib/Protocols/IdSystatUDP.pas b/Lib/Protocols/IdSystatUDP.pas index 7d11d9e23..fd339f253 100644 --- a/Lib/Protocols/IdSystatUDP.pas +++ b/Lib/Protocols/IdSystatUDP.pas @@ -40,8 +40,10 @@ Note that this protocol is officially called Active User } -interface {$i IdCompilerDefines.inc} + +interface + uses Classes, IdAssignedNumbers, IdUDPBase, IdUDPClient; const DefIdSysUDPTimeout = 1000; //one second diff --git a/Lib/Protocols/IdSystatUDPServer.pas b/Lib/Protocols/IdSystatUDPServer.pas index 0138a17cc..145cc28a6 100644 --- a/Lib/Protocols/IdSystatUDPServer.pas +++ b/Lib/Protocols/IdSystatUDPServer.pas @@ -46,12 +46,13 @@ Note that this protocol is officially called Active User. } -interface {$i IdCompilerDefines.inc} +interface + uses Classes, - IdAssignedNumbers, IdGlobal, IdSocketHandle, IdUDPBase, IdUDPServer; + IdAssignedNumbers, IdGlobal, IdSocketHandle, IdUDPServer; type TIdUDPSystatEvent = procedure (ABinding: TIdSocketHandle; AResults : TStrings) of object; diff --git a/Lib/Protocols/IdTelnet.pas b/Lib/Protocols/IdTelnet.pas index 44cdcd0c4..6fad18b4a 100644 --- a/Lib/Protocols/IdTelnet.pas +++ b/Lib/Protocols/IdTelnet.pas @@ -85,10 +85,10 @@ There is no real terminal emulation other than dumb terminal } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdAssignedNumbers, diff --git a/Lib/Protocols/IdTelnetServer.pas b/Lib/Protocols/IdTelnetServer.pas index 45217a8c5..31d8cb79e 100644 --- a/Lib/Protocols/IdTelnetServer.pas +++ b/Lib/Protocols/IdTelnetServer.pas @@ -60,14 +60,13 @@ unit IdTelnetServer; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, - IdBaseComponent, IdAssignedNumbers, IdContext, IdCustomTCPServer, IdTCPConnection, IdYarn; diff --git a/Lib/Protocols/IdText.pas b/Lib/Protocols/IdText.pas index 2a9d38129..6df431bf0 100644 --- a/Lib/Protocols/IdText.pas +++ b/Lib/Protocols/IdText.pas @@ -39,10 +39,10 @@ unit IdText; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdMessageParts; diff --git a/Lib/Protocols/IdTime.pas b/Lib/Protocols/IdTime.pas index a8bf726e6..2acf6915a 100644 --- a/Lib/Protocols/IdTime.pas +++ b/Lib/Protocols/IdTime.pas @@ -83,10 +83,10 @@ to be more consistant with TIdSNTP. } -interface - {$i IdCompilerDefines.inc} +interface + uses {$IFDEF WORKAROUND_INLINE_CONSTRUCTORS} Classes, diff --git a/Lib/Protocols/IdTimeServer.pas b/Lib/Protocols/IdTimeServer.pas index 501b96f99..d0c9ddad1 100644 --- a/Lib/Protocols/IdTimeServer.pas +++ b/Lib/Protocols/IdTimeServer.pas @@ -46,9 +46,10 @@ unit IdTimeServer; -interface {$i IdCompilerDefines.inc} +interface + { 2000-3-May J. Peter Mugaas -Added BaseDate to the date the calculations are based on can be diff --git a/Lib/Protocols/IdTimeUDP.pas b/Lib/Protocols/IdTimeUDP.pas index 305ba52cf..2ae689d57 100644 --- a/Lib/Protocols/IdTimeUDP.pas +++ b/Lib/Protocols/IdTimeUDP.pas @@ -42,10 +42,10 @@ unit IdTimeUDP; -interface - {$i IdCompilerDefines.inc} +interface + uses {$IFDEF WORKAROUND_INLINE_CONSTRUCTORS} Classes, diff --git a/Lib/Protocols/IdTimeUDPServer.pas b/Lib/Protocols/IdTimeUDPServer.pas index f58774d26..e2d1ec1f6 100644 --- a/Lib/Protocols/IdTimeUDPServer.pas +++ b/Lib/Protocols/IdTimeUDPServer.pas @@ -36,14 +36,14 @@ unit IdTimeUDPServer; -interface {$i IdCompilerDefines.inc} +interface uses {$IFDEF WORKAROUND_INLINE_CONSTRUCTORS} Classes, {$ENDIF} - IdAssignedNumbers, IdGlobal, IdSocketHandle, IdUDPBase, IdUDPServer; + IdAssignedNumbers, IdGlobal, IdSocketHandle, IdUDPServer; type TIdCustomTimeUDPServer = class(TIdUDPServer) diff --git a/Lib/Protocols/IdTrivialFTP.pas b/Lib/Protocols/IdTrivialFTP.pas index b2ebd630a..52d289af2 100644 --- a/Lib/Protocols/IdTrivialFTP.pas +++ b/Lib/Protocols/IdTrivialFTP.pas @@ -42,10 +42,10 @@ unit IdTrivialFTP; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdAssignedNumbers, @@ -90,7 +90,9 @@ implementation {$IFDEF DOTNET} IdStreamNET, {$ELSE} + {$IFNDEF FPC} IdStreamVCL, + {$ENDIF} {$ENDIF} IdComponent, IdExceptionCore, diff --git a/Lib/Protocols/IdTrivialFTPBase.pas b/Lib/Protocols/IdTrivialFTPBase.pas index 81aa1a247..7e8e8d60e 100644 --- a/Lib/Protocols/IdTrivialFTPBase.pas +++ b/Lib/Protocols/IdTrivialFTPBase.pas @@ -33,10 +33,10 @@ unit IdTrivialFTPBase; -interface - {$i IdCompilerDefines.inc} +interface + uses IdGlobal, IdUDPBase, IdUDPClient, SysUtils; diff --git a/Lib/Protocols/IdTrivialFTPServer.pas b/Lib/Protocols/IdTrivialFTPServer.pas index da5e2b8de..0d8ca73f9 100644 --- a/Lib/Protocols/IdTrivialFTPServer.pas +++ b/Lib/Protocols/IdTrivialFTPServer.pas @@ -39,10 +39,10 @@ unit IdTrivialFTPServer; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, {$IFDEF HAS_UNIT_Generics_Collections} @@ -115,10 +115,12 @@ implementation Posix.SysSelect, Posix.SysTime, {$ENDIF} - {$IFDEF DOTNET} + {$IFNDEF FPC} + {$IFDEF DOTNET} IdStreamNET, - {$ELSE} + {$ELSE} IdStreamVCL, + {$ENDIF} {$ENDIF} IdExceptionCore, IdGlobalProtocols, diff --git a/Lib/Protocols/IdTunnelCommon.pas b/Lib/Protocols/IdTunnelCommon.pas index e87085ca0..7b45eac2f 100644 --- a/Lib/Protocols/IdTunnelCommon.pas +++ b/Lib/Protocols/IdTunnelCommon.pas @@ -56,9 +56,10 @@ *} -interface {$i IdCompilerDefines.inc} +interface + uses SysUtils, Classes, SyncObjs, IdException, diff --git a/Lib/Protocols/IdTunnelMaster.pas b/Lib/Protocols/IdTunnelMaster.pas index 40f179411..8e21cf819 100644 --- a/Lib/Protocols/IdTunnelMaster.pas +++ b/Lib/Protocols/IdTunnelMaster.pas @@ -26,9 +26,10 @@ unit IdTunnelMaster; -interface {$i IdCompilerDefines.inc} +interface + uses Classes, SyncObjs, IdTCPServer, IdTCPClient, IdTunnelCommon; diff --git a/Lib/Protocols/IdTunnelSlave.pas b/Lib/Protocols/IdTunnelSlave.pas index 595f9beed..0d4abb943 100644 --- a/Lib/Protocols/IdTunnelSlave.pas +++ b/Lib/Protocols/IdTunnelSlave.pas @@ -26,10 +26,10 @@ unit IdTunnelSlave; -interface - {$i IdCompilerDefines.inc} +interface + uses SysUtils, Classes, SyncObjs, IdTunnelCommon, IdTCPServer, IdTCPClient, diff --git a/Lib/Protocols/IdURI.pas b/Lib/Protocols/IdURI.pas index fe43fbd50..5508c6651 100644 --- a/Lib/Protocols/IdURI.pas +++ b/Lib/Protocols/IdURI.pas @@ -66,10 +66,10 @@ http://username:password@hostname:port/path/document#bookmark } -interface - {$i IdCompilerDefines.inc} +interface + uses IdException, IdGlobal; diff --git a/Lib/Protocols/IdUnixTime.pas b/Lib/Protocols/IdUnixTime.pas index 54f94da99..5316390aa 100644 --- a/Lib/Protocols/IdUnixTime.pas +++ b/Lib/Protocols/IdUnixTime.pas @@ -22,10 +22,10 @@ unit IdUnixTime; -interface - {$i IdCompilerDefines.inc} +interface + uses {$IFDEF WORKAROUND_INLINE_CONSTRUCTORS} Classes, diff --git a/Lib/Protocols/IdUnixTimeServer.pas b/Lib/Protocols/IdUnixTimeServer.pas index cbfc711d9..66f0b6eb1 100644 --- a/Lib/Protocols/IdUnixTimeServer.pas +++ b/Lib/Protocols/IdUnixTimeServer.pas @@ -21,10 +21,10 @@ } unit IdUnixTimeServer; -interface - {$i IdCompilerDefines.inc} +interface + uses {$IFDEF WORKAROUND_INLINE_CONSTRUCTORS} Classes, diff --git a/Lib/Protocols/IdUnixTimeUDP.pas b/Lib/Protocols/IdUnixTimeUDP.pas index e0cbb1313..09dfaecd8 100644 --- a/Lib/Protocols/IdUnixTimeUDP.pas +++ b/Lib/Protocols/IdUnixTimeUDP.pas @@ -22,15 +22,15 @@ unit IdUnixTimeUDP; -interface - {$i IdCompilerDefines.inc} +interface + uses {$IFDEF WORKAROUND_INLINE_CONSTRUCTORS} Classes, {$ENDIF} - IdAssignedNumbers, IdTimeUDP, IdUDPClient; + IdAssignedNumbers, IdTimeUDP; { This is based on a description at diff --git a/Lib/Protocols/IdUnixTimeUDPServer.pas b/Lib/Protocols/IdUnixTimeUDPServer.pas index 0c48ce1f6..fb8af5b0f 100644 --- a/Lib/Protocols/IdUnixTimeUDPServer.pas +++ b/Lib/Protocols/IdUnixTimeUDPServer.pas @@ -22,10 +22,10 @@ unit IdUnixTimeUDPServer; -interface - {$i IdCompilerDefines.inc} +interface + uses {$IFDEF WORKAROUND_INLINE_CONSTRUCTORS} Classes, diff --git a/Lib/Protocols/IdUserAccounts.pas b/Lib/Protocols/IdUserAccounts.pas index 2d75e677d..6b0fab7bc 100644 --- a/Lib/Protocols/IdUserAccounts.pas +++ b/Lib/Protocols/IdUserAccounts.pas @@ -43,16 +43,15 @@ - universal TIdUserManagerAuthenticationEvent> Sender: TObject } -interface {$i IdCompilerDefines.inc} +interface + uses Classes, - IdException, IdGlobal, IdBaseComponent, - IdComponent, - IdStrings; + IdComponent; type TIdUserHandle = UInt32;//ptr,object,collection.item.id or THandle diff --git a/Lib/Protocols/IdUserAccountsOTP.pas b/Lib/Protocols/IdUserAccountsOTP.pas index b073467e9..0eb703479 100644 --- a/Lib/Protocols/IdUserAccountsOTP.pas +++ b/Lib/Protocols/IdUserAccountsOTP.pas @@ -51,10 +51,10 @@ unit IdUserAccountsOTP; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdBaseComponent, diff --git a/Lib/Protocols/IdUserPassProvider.pas b/Lib/Protocols/IdUserPassProvider.pas index 096d309f9..23eebaa81 100644 --- a/Lib/Protocols/IdUserPassProvider.pas +++ b/Lib/Protocols/IdUserPassProvider.pas @@ -27,10 +27,10 @@ } unit IdUserPassProvider; -interface - {$i IdCompilerDefines.inc} +interface + uses IdBaseComponent; diff --git a/Lib/Protocols/IdVCard.pas b/Lib/Protocols/IdVCard.pas index e7ef7e5b2..bf93ca286 100644 --- a/Lib/Protocols/IdVCard.pas +++ b/Lib/Protocols/IdVCard.pas @@ -69,10 +69,10 @@ - Added QP Check & Decode of individual properties } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, @@ -460,7 +460,6 @@ implementation uses IdCoderQuotedPrintable, - IdException, IdGlobalProtocols, SysUtils; const VCardProperties : array [0..27] of string = ( diff --git a/Lib/Protocols/IdWebDAV.pas b/Lib/Protocols/IdWebDAV.pas index c96ceb9e8..86af5c968 100644 --- a/Lib/Protocols/IdWebDAV.pas +++ b/Lib/Protocols/IdWebDAV.pas @@ -26,10 +26,10 @@ todo change depth param from infinity to -1? also string>integer? } -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdHTTP; diff --git a/Lib/Protocols/IdWhoIsServer.pas b/Lib/Protocols/IdWhoIsServer.pas index ee085deca..37cdbd17c 100644 --- a/Lib/Protocols/IdWhoIsServer.pas +++ b/Lib/Protocols/IdWhoIsServer.pas @@ -68,9 +68,10 @@ Orig Author: Ozz Nixon (RFC 954) } -interface {$i IdCompilerDefines.inc} +interface + uses IdAssignedNumbers, IdContext, diff --git a/Lib/Protocols/IdWhois.pas b/Lib/Protocols/IdWhois.pas index 1b1410964..2fe2b78b7 100644 --- a/Lib/Protocols/IdWhois.pas +++ b/Lib/Protocols/IdWhois.pas @@ -52,9 +52,10 @@ Original Author: Hadi Hariri } -interface {$i IdCompilerDefines.inc} +interface + uses {$IFDEF WORKAROUND_INLINE_CONSTRUCTORS} Classes, diff --git a/Lib/Protocols/IdZLib.pas b/Lib/Protocols/IdZLib.pas index 70176d1c3..3a723b3a4 100644 --- a/Lib/Protocols/IdZLib.pas +++ b/Lib/Protocols/IdZLib.pas @@ -34,10 +34,10 @@ unit IdZLib; -interface - {$I IdCompilerDefines.inc} +interface + uses SysUtils, Classes, diff --git a/Lib/Protocols/IdZLibCompressorBase.pas b/Lib/Protocols/IdZLibCompressorBase.pas index c141fd385..0b010ac63 100644 --- a/Lib/Protocols/IdZLibCompressorBase.pas +++ b/Lib/Protocols/IdZLibCompressorBase.pas @@ -134,10 +134,10 @@ } unit IdZLibCompressorBase; -interface - {$i IdCompilerDefines.inc} +interface + uses Classes, IdBaseComponent, diff --git a/Lib/Protocols/IdZLibConst.pas b/Lib/Protocols/IdZLibConst.pas index 702817cba..fc063de4b 100644 --- a/Lib/Protocols/IdZLibConst.pas +++ b/Lib/Protocols/IdZLibConst.pas @@ -9,10 +9,10 @@ unit IdZLibConst; -interface - {$I IdCompilerDefines.inc} +interface + {$UNDEF STATICLOAD_ZLIB} {$IFNDEF FPC} {$IFDEF WINDOWS} diff --git a/Lib/Protocols/IdZLibHeaders.pas b/Lib/Protocols/IdZLibHeaders.pas index c2567fd2d..2d2e965d4 100644 --- a/Lib/Protocols/IdZLibHeaders.pas +++ b/Lib/Protocols/IdZLibHeaders.pas @@ -13,11 +13,10 @@ suppport external .obj files properly. It also makes it easier to support several different platforms in one file. } +{$I IdCompilerDefines.inc} interface -{$I IdCompilerDefines.inc} - {$WRITEABLECONST OFF} { TODO: Wait for Emb to decide how to approach ZLib for their 64-bit support diff --git a/Lib/System/IdBaseComponent.pas b/Lib/System/IdBaseComponent.pas index 3b5f35bc1..81a944c75 100644 --- a/Lib/System/IdBaseComponent.pas +++ b/Lib/System/IdBaseComponent.pas @@ -66,13 +66,12 @@ unit IdBaseComponent; +{$I IdCompilerDefines.inc} // Kudzu: This unit is permitted to viloate IFDEF restriction to harmonize // VCL / .Net difference at the base level. interface -{$I IdCompilerDefines.inc} - uses Classes {$IFDEF DOTNET} diff --git a/Lib/System/IdCTypes.pas b/Lib/System/IdCTypes.pas index 5d8623c9d..99a1d1879 100644 --- a/Lib/System/IdCTypes.pas +++ b/Lib/System/IdCTypes.pas @@ -1,9 +1,9 @@ unit IdCTypes; -interface - {$I IdCompilerDefines.inc} +interface + { This unit should not contain ANY program code. It is meant to be extremely thin. The idea is that the unit will contain type mappings that used for headers diff --git a/Lib/System/IdComponent.pas b/Lib/System/IdComponent.pas index 22c5eff86..9a6251313 100644 --- a/Lib/System/IdComponent.pas +++ b/Lib/System/IdComponent.pas @@ -57,10 +57,10 @@ unit IdComponent; -interface - {$i IdCompilerDefines.inc} +interface + uses {$IFNDEF USE_OBJECT_ARC} Classes, diff --git a/Lib/System/IdException.pas b/Lib/System/IdException.pas index 98cdb0139..d68df3eff 100644 --- a/Lib/System/IdException.pas +++ b/Lib/System/IdException.pas @@ -39,11 +39,10 @@ } unit IdException; +{$I IdCompilerDefines.inc} interface -{$I IdCompilerDefines.inc} - uses SysUtils; diff --git a/Lib/System/IdGlobal.pas b/Lib/System/IdGlobal.pas index adb01f990..23cf6177e 100644 --- a/Lib/System/IdGlobal.pas +++ b/Lib/System/IdGlobal.pas @@ -509,10 +509,10 @@ unit IdGlobal; -interface - {$I IdCompilerDefines.inc} +interface + uses SysUtils, {$IFDEF DOTNET} diff --git a/Lib/System/IdIDN.pas b/Lib/System/IdIDN.pas index 30e41080a..2823e2bd6 100644 --- a/Lib/System/IdIDN.pas +++ b/Lib/System/IdIDN.pas @@ -31,9 +31,8 @@ function provides support for IRI or Internationalized Domain Name (IDN) parsing AI_DISABLE_IDN_ENCODING flag discussed below. } -interface - {$I IdCompilerDefines.inc} +interface uses IdGlobal diff --git a/Lib/System/IdIconv.pas b/Lib/System/IdIconv.pas index d572e6cb0..3cad62946 100644 --- a/Lib/System/IdIconv.pas +++ b/Lib/System/IdIconv.pas @@ -1,9 +1,9 @@ unit IdIconv; -interface - {$I IdCompilerDefines.inc} +interface + uses {$IFDEF FPC} DynLibs, diff --git a/Lib/System/IdStack.pas b/Lib/System/IdStack.pas index 08639d503..83dcd5650 100644 --- a/Lib/System/IdStack.pas +++ b/Lib/System/IdStack.pas @@ -134,10 +134,10 @@ unit IdStack; -interface - {$I IdCompilerDefines.inc} +interface + uses Classes, IdException, IdStackConsts, IdGlobal, SysUtils; diff --git a/Lib/System/IdStackBSDBase.pas b/Lib/System/IdStackBSDBase.pas index 52f223934..7f0ae5d34 100644 --- a/Lib/System/IdStackBSDBase.pas +++ b/Lib/System/IdStackBSDBase.pas @@ -150,10 +150,10 @@ unit IdStackBSDBase; -interface - {$I IdCompilerDefines.inc} +interface + {$IFDEF DOTNET} Improper compile. This unit must NOT be linked into DotNet applications. @@ -358,7 +358,6 @@ implementation {$ENDIF} {$ENDIF} {$ENDIF} - IdResourceStrings, SysUtils; { TIdStackBSDBase } diff --git a/Lib/System/IdStackConsts.pas b/Lib/System/IdStackConsts.pas index d42681cc5..35bf93c88 100644 --- a/Lib/System/IdStackConsts.pas +++ b/Lib/System/IdStackConsts.pas @@ -68,10 +68,10 @@ unit IdStackConsts; -interface - {$I IdCompilerDefines.inc} +interface + { This should be the only unit except OS Stack units that reference Winsock or lnxsock } diff --git a/Lib/System/IdStackVCLPosix.pas b/Lib/System/IdStackVCLPosix.pas index 9f3639f93..ba18f1256 100644 --- a/Lib/System/IdStackVCLPosix.pas +++ b/Lib/System/IdStackVCLPosix.pas @@ -1,9 +1,9 @@ unit IdStackVCLPosix; -interface - {$I IdCompilerDefines.inc} +interface + {IMPORTANT!!! Platform warnings in this unit should be disabled because Indy we have no diff --git a/Lib/System/IdStackWindows.pas b/Lib/System/IdStackWindows.pas index 0123f9a5b..b80acc07a 100644 --- a/Lib/System/IdStackWindows.pas +++ b/Lib/System/IdStackWindows.pas @@ -188,10 +188,10 @@ } unit IdStackWindows; -interface - {$I IdCompilerDefines.inc} +interface + uses Classes, IdGlobal, IdException, IdStackBSDBase, IdStackConsts, IdWinsock2, IdStack, diff --git a/Lib/System/IdStream.pas b/Lib/System/IdStream.pas index fa449a398..d819c3f38 100644 --- a/Lib/System/IdStream.pas +++ b/Lib/System/IdStream.pas @@ -18,10 +18,10 @@ unit IdStream; -interface - {$I IdCompilerDefines.inc} +interface + uses {$IFDEF DOTNET} IdStreamNET diff --git a/Lib/System/IdStreamVCL.pas b/Lib/System/IdStreamVCL.pas index cb66f1f4f..0a784239b 100644 --- a/Lib/System/IdStreamVCL.pas +++ b/Lib/System/IdStreamVCL.pas @@ -18,10 +18,10 @@ unit IdStreamVCL; -interface - {$I IdCompilerDefines.inc} +interface + uses Classes, IdGlobal; diff --git a/Lib/System/IdStruct.pas b/Lib/System/IdStruct.pas index 085d2aa6b..b153d6084 100644 --- a/Lib/System/IdStruct.pas +++ b/Lib/System/IdStruct.pas @@ -18,10 +18,10 @@ unit IdStruct; -interface - {$i IdCompilerDefines.inc} +interface + uses IdGlobal; diff --git a/Lib/System/IdWinsock2.pas b/Lib/System/IdWinsock2.pas index 4f7df261f..238c6750c 100644 --- a/Lib/System/IdWinsock2.pas +++ b/Lib/System/IdWinsock2.pas @@ -135,10 +135,10 @@ unit IdWinsock2; -interface - {$I IdCompilerDefines.inc} +interface + { Important!!! diff --git a/Lib/System/IdWship6.pas b/Lib/System/IdWship6.pas index 4699f35b5..da4a6b17f 100644 --- a/Lib/System/IdWship6.pas +++ b/Lib/System/IdWship6.pas @@ -30,10 +30,10 @@ unit IdWship6; -interface - {$I IdCompilerDefines.inc} +interface + {$IFDEF FPC} {$IFDEF WIN32} {$ALIGN OFF}