From 0973660a484ab6dfa6e8d19abd8a1780200e992a Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Sun, 16 Oct 2016 20:06:33 +0000
Subject: [PATCH] LazUtils: Unify formatting between FileIsReadable and
 FileIsWritable + other formatting.

git-svn-id: trunk@53127 -
---
 components/lazutils/unixlazfileutils.inc | 4 ++--
 designer/designer.pp                     | 6 ++----
 ide/customformeditor.pp                  | 5 ++---
 packager/pkgmanager.pas                  | 8 ++++----
 packager/projpackbase.pas                | 2 +-
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/components/lazutils/unixlazfileutils.inc b/components/lazutils/unixlazfileutils.inc
index 7053e1eb2a..3deec16a0a 100644
--- a/components/lazutils/unixlazfileutils.inc
+++ b/components/lazutils/unixlazfileutils.inc
@@ -344,12 +344,12 @@ end;
 
 function FileIsReadable(const AFilename: string): boolean;
 begin
-  Result:= BaseUnix.FpAccess(AFilename,BaseUnix.R_OK)=0;
+  Result := BaseUnix.FpAccess(AFilename, BaseUnix.R_OK) = 0;
 end;
 
 function FileIsWritable(const AFilename: string): boolean;
 begin
-  Result := (BaseUnix.FpAccess(AFilename, BaseUnix.W_OK) = 0);
+  Result := BaseUnix.FpAccess(AFilename, BaseUnix.W_OK) = 0;
 end;
 
 
diff --git a/designer/designer.pp b/designer/designer.pp
index 76a7a9ef40..c2f276c17b 100644
--- a/designer/designer.pp
+++ b/designer/designer.pp
@@ -3091,18 +3091,16 @@ Begin
   // remove all child controls owned by the LookupRoot
   if (APersistent is TWinControl) then begin
     AWinControl:=TWinControl(APersistent);
-    // Component may to auto-create new components during deletion unless informed.
+    // Component may auto-create new components during deletion unless informed.
     // ComponentState does not have csDestroying yet when removing children.
     AWinControl.DesignerDeleting := True;
     i:=AWinControl.ControlCount-1;
     while (i>=0) do begin
       ChildControl:=AWinControl.Controls[i];
-//      if (GetLookupRootForComponent(ChildControl)=FLookupRoot)
       if ChildControl.Owner=FLookupRoot then begin
         //Debugln(['[TDesigner.RemoveComponentAndChilds] B ',dbgsName(APersistent),' Child=',dbgsName(ChildControl),' i=',i,' ',TheFormEditor.FindComponent(ChildControl)<>nil]);
         RemovePersistentAndChilds(ChildControl);
-        // the component list of the form has changed
-        // -> restart the search
+        // the component list of the form has changed -> restart the search
         i:=AWinControl.ControlCount-1;
       end else
         dec(i);
diff --git a/ide/customformeditor.pp b/ide/customformeditor.pp
index 127806efae..a7a9f10a06 100644
--- a/ide/customformeditor.pp
+++ b/ide/customformeditor.pp
@@ -564,9 +564,8 @@ Begin
       // free/unbind a non form component and its designer form
       aForm:=GetDesignerForm(AComponent);
       if (AForm<>nil) and (not (AForm is TNonFormProxyDesignerForm)) then
-        RaiseException(Format(
-          lisCFETCustomFormEditorDeleteComponentWhereIsTheTCustomN, [AComponent.
-          ClassName]));
+        RaiseException(Format(lisCFETCustomFormEditorDeleteComponentWhereIsTheTCustomN,
+                              [AComponent.ClassName]));
 
       if (AForm <> nil) then
       begin
diff --git a/packager/pkgmanager.pas b/packager/pkgmanager.pas
index 83d89a28ad..9a0ef610cb 100644
--- a/packager/pkgmanager.pas
+++ b/packager/pkgmanager.pas
@@ -2993,14 +2993,14 @@ end;
 procedure TPkgManager.ConnectMainBarEvents;
 begin
   with MainIDEBar do begin
-    itmPkgNewPackage.OnClick :=@MainIDEitmPkgNewPackageClick;
-    itmPkgOpenLoadedPackage.OnClick :=@MainIDEitmPkgOpenLoadedPackageClicked;
+    itmPkgNewPackage.OnClick:=@MainIDEitmPkgNewPackageClick;
+    itmPkgOpenLoadedPackage.OnClick:=@MainIDEitmPkgOpenLoadedPackageClicked;
     itmPkgOpenPackageFile.OnClick:=@MainIDEitmPkgOpenPackageFileClick;
-    itmPkgOpenPackageOfCurUnit.OnClick :=@MainIDEitmPkgOpenPackageOfCurUnitClicked;
+    itmPkgOpenPackageOfCurUnit.OnClick:=@MainIDEitmPkgOpenPackageOfCurUnitClicked;
     itmPkgAddCurFileToPkg.OnClick:=@MainIDEitmPkgAddCurFileToPkgClick;
     itmPkgAddNewComponentToPkg.OnClick:=@MainIDEitmPkgNewComponentClick;
     itmPkgPkgGraph.OnClick:=@MainIDEitmPkgPkgGraphClick;
-    itmPkgPackageLinks.OnClick := @MainIDEitmPackageLinksClicked;
+    itmPkgPackageLinks.OnClick:=@MainIDEitmPackageLinksClicked;
     itmPkgEditInstallPkgs.OnClick:=@MainIDEitmPkgEditInstallPkgsClick;
     {$IFDEF CustomIDEComps}
     itmCompsConfigCustomComps.OnClick :=@MainIDEitmConfigCustomCompsClicked;
diff --git a/packager/projpackbase.pas b/packager/projpackbase.pas
index 813cf97ac7..0e4b9a7b3f 100644
--- a/packager/projpackbase.pas
+++ b/packager/projpackbase.pas
@@ -136,7 +136,7 @@ end;
 
 procedure TProjPackDefineTemplates.EndUpdate;
 begin
-  if FUpdateLock=0 then RaiseException('TProjectDefineTemplates.EndUpdate');
+  if FUpdateLock=0 then RaiseException('TProjPackDefineTemplates.EndUpdate');
   dec(FUpdateLock);
   if FUpdateLock=0 then begin
     if ptfIsPackageTemplate in FFlags then begin