From ec91cfdc9aa52fe5ef2f2a33415d8d2720132abc Mon Sep 17 00:00:00 2001 From: juha Date: Wed, 12 Oct 2016 13:37:37 +0000 Subject: [PATCH] LCL: Use "out" parameter instead of "var" in Printer.Write() and derivatives. Issue #29950. git-svn-id: trunk@53102 - --- components/printers/carbon/carbonprinters.inc | 5 ++--- components/printers/carbon/carbonprinters_h.inc | 2 +- components/printers/cocoa/cocoaprinters.inc | 5 ++--- components/printers/cocoa/cocoaprinters_h.inc | 2 +- components/printers/qt/qtprinters.inc | 4 ++-- components/printers/qt/qtprinters_h.inc | 2 +- components/printers/unix/cupsprinters.inc | 2 +- components/printers/unix/cupsprinters_h.inc | 2 +- components/printers/win32/winprinters.inc | 3 +-- components/printers/win32/winprinters_h.inc | 2 +- lcl/printers.pas | 5 +++-- 11 files changed, 16 insertions(+), 18 deletions(-) diff --git a/components/printers/carbon/carbonprinters.inc b/components/printers/carbon/carbonprinters.inc index 42ffbe2c7f..b2e33531fc 100644 --- a/components/printers/carbon/carbonprinters.inc +++ b/components/printers/carbon/carbonprinters.inc @@ -293,12 +293,11 @@ begin inherited DoDestroy; end; -function TCarbonPrinter.Write(const Buffer; Count: Integer; - var Written: Integer): Boolean; +function TCarbonPrinter.Write(const Buffer; Count: Integer; out Written: Integer): Boolean; begin Result := False; CheckRawMode(True); - + Written := 0; DebugLn('TCarbonPrinter.Write Error: Raw mode is not supported for Carbon!'); end; diff --git a/components/printers/carbon/carbonprinters_h.inc b/components/printers/carbon/carbonprinters_h.inc index c1de033160..0f14a385d5 100644 --- a/components/printers/carbon/carbonprinters_h.inc +++ b/components/printers/carbon/carbonprinters_h.inc @@ -89,7 +89,7 @@ type procedure UpdatePrinter; public constructor Create; override; - function Write(const {%H-}Buffer; {%H-}Count:Integer; var {%H-}Written: Integer): Boolean; override; + function Write(const {%H-}Buffer; {%H-}Count:Integer; out Written: Integer): Boolean; override; // Warning not portable functions here property CurrentPrinterName: String read GetCurrentPrinterName; property PrintSession: PMPrintSession read FPrintSession; diff --git a/components/printers/cocoa/cocoaprinters.inc b/components/printers/cocoa/cocoaprinters.inc index 2ba3275c6b..50064f9b29 100644 --- a/components/printers/cocoa/cocoaprinters.inc +++ b/components/printers/cocoa/cocoaprinters.inc @@ -292,12 +292,11 @@ begin inherited DoDestroy; end; -function TCocoaPrinter.Write(const Buffer; Count: Integer; - var Written: Integer): Boolean; +function TCocoaPrinter.Write(const Buffer; Count: Integer; out Written: Integer): Boolean; begin Result := False; CheckRawMode(True); - + Written := 0; DebugLn('TCocoaPrinter.Write Error: Raw mode is not supported for Cocoa!'); end; diff --git a/components/printers/cocoa/cocoaprinters_h.inc b/components/printers/cocoa/cocoaprinters_h.inc index f348b58fac..5a15a33d97 100644 --- a/components/printers/cocoa/cocoaprinters_h.inc +++ b/components/printers/cocoa/cocoaprinters_h.inc @@ -98,7 +98,7 @@ type procedure UpdatePrinter; public constructor Create; override; - function Write(const {%H-}Buffer; {%H-}Count:Integer; var {%H-}Written: Integer): Boolean; override; + function Write(const {%H-}Buffer; {%H-}Count:Integer; out Written: Integer): Boolean; override; // Warning not portable properties here //property CurrentPrinterName: String read GetCurrentPrinterName; property PrintSession: PMPrintSession read GetPrintSession; diff --git a/components/printers/qt/qtprinters.inc b/components/printers/qt/qtprinters.inc index 7a5263c6ad..77dbcab787 100644 --- a/components/printers/qt/qtprinters.inc +++ b/components/printers/qt/qtprinters.inc @@ -154,11 +154,11 @@ begin inherited DoDestroy; end; -function TQtPrinters.Write(const Buffer; Count: Integer; - var Written: Integer): Boolean; +function TQtPrinters.Write(const Buffer; Count: Integer; out Written: Integer): Boolean; begin Result := False; CheckRawMode(True); + Written := 0; {$IFDEF VERBOSE_QT_PRINTING} DebugLn('TQtPrinters.Write(): Raw mode is not yet supported'); {$ENDIF} diff --git a/components/printers/qt/qtprinters_h.inc b/components/printers/qt/qtprinters_h.inc index 4f0f4e12bf..8619055d33 100644 --- a/components/printers/qt/qtprinters_h.inc +++ b/components/printers/qt/qtprinters_h.inc @@ -57,7 +57,7 @@ type function GetPaperSize(Const Str: String): QPrinterPageSize; public constructor Create; override; - function Write(const {%H-}Buffer; {%H-}Count:Integer; var {%H-}Written: Integer): Boolean; override; + function Write(const {%H-}Buffer; {%H-}Count:Integer; out Written: Integer): Boolean; override; property ColorMode: QPrinterColorMode read GetColorMode write SetColorMode; property FullPage: Boolean read GetFullPage write SetFullPage; diff --git a/components/printers/unix/cupsprinters.inc b/components/printers/unix/cupsprinters.inc index 0974d367c9..a933e55604 100644 --- a/components/printers/unix/cupsprinters.inc +++ b/components/printers/unix/cupsprinters.inc @@ -96,7 +96,7 @@ begin end; //write count bytes from buffer to raw mode stream -function TCUPSPrinter.Write(const Buffer; Count: Integer; var Written: Integer +function TCUPSPrinter.Write(const Buffer; Count: Integer; out Written: Integer ): Boolean; begin result := False; diff --git a/components/printers/unix/cupsprinters_h.inc b/components/printers/unix/cupsprinters_h.inc index 9c5f9e7d32..139d0da2af 100644 --- a/components/printers/unix/cupsprinters_h.inc +++ b/components/printers/unix/cupsprinters_h.inc @@ -161,7 +161,7 @@ type procedure DoDestroy; override; public constructor Create; override; - function Write(const Buffer; Count:Integer; var Written: Integer): Boolean; override; + function Write(const Buffer; Count:Integer; out Written: Integer): Boolean; override; {------------------------------------------------- SPECIFIC CUPS METHODS OR PROPERTIES diff --git a/components/printers/win32/winprinters.inc b/components/printers/win32/winprinters.inc index b704529943..965e66e9f8 100644 --- a/components/printers/win32/winprinters.inc +++ b/components/printers/win32/winprinters.inc @@ -47,8 +47,7 @@ begin inherited DoDestroy; end; -function TWinPrinter.Write(const Buffer; Count: Integer; - var Written: Integer): Boolean; +function TWinPrinter.Write(const Buffer; Count: Integer; out Written: Integer): Boolean; begin CheckRawMode(True); Result := WritePrinter(FPrinterHandle, @Buffer, Count, pdword(@Written)); diff --git a/components/printers/win32/winprinters_h.inc b/components/printers/win32/winprinters_h.inc index b967ff31d9..35b1146384 100644 --- a/components/printers/win32/winprinters_h.inc +++ b/components/printers/win32/winprinters_h.inc @@ -83,7 +83,7 @@ Type public constructor Create; override; - function Write(const Buffer; Count:Integer; var Written: Integer): Boolean; override; + function Write(const Buffer; Count:Integer; out Written: Integer): Boolean; override; //Warning not portable functions here procedure AdvancedProperties; diff --git a/lcl/printers.pas b/lcl/printers.pas index 3f9cb42695..32edd0d628 100644 --- a/lcl/printers.pas +++ b/lcl/printers.pas @@ -276,7 +276,7 @@ type procedure Refresh; procedure SetPrinter(aName : String); Procedure RestoreDefaultBin; virtual; - function Write(const Buffer; Count:Integer; var Written: Integer): Boolean; virtual; + function Write(const Buffer; Count:Integer; out Written: Integer): Boolean; virtual; function Write(const s: ansistring): boolean; overload; property PrinterIndex : integer read GetPrinterIndex write SetPrinterIndex; @@ -479,9 +479,10 @@ begin DoSetBinName(DoGetDefaultBinName); end; -function TPrinter.Write(const Buffer; Count:Integer; var Written: Integer): Boolean; +function TPrinter.Write(const Buffer; Count: Integer; out Written: Integer): Boolean; begin result := False; + Written := 0; end; function TPrinter.Write(const S: ansistring): Boolean; overload;