paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-04 10:39:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleaned up

Browse Source 
git-svn-id: trunk@50177 -
This commit is contained in:
mattias 2015-10-26 21:41:56 +00:00
parent 9b0d4c01b6
commit 2c929b55db
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/codetools/codetoolscfgscript.pas
View File

@ -452,7 +452,7 @@ begin
CheckCTCSVariable(Left); CheckCTCSVariable(Left);
CheckCTCSVariable(Right); CheckCTCSVariable(Right);
{$ENDIF} {$ENDIF}
//debugln(['CompareCTCSVariables AAA1 Left=',dbgs(Left),' Right=',dbgs(Right)]); //debugln(['CompareCTCSVariables START Left=',dbgs(Left),' Right=',dbgs(Right)]);
Result:=false; Result:=false;
Equal:=false; Equal:=false;
LeftIsLowerThanRight:=false; LeftIsLowerThanRight:=false;

8
components/codetools/examples/scanexamples/modemacpas.pas
View File

@ -11,11 +11,11 @@ uses
{$DEFINE bogus4} {$DEFINE bogus4}
{$ifc defined test1} {$ifc defined test1}
type aaa1 = integer; type mmp1 = integer;
{$elifc defined test2} {$elifc defined test2}
type aaa2 = integer; type mmp2 = integer;
{$elifc defined test3} {$elifc defined test3}
type aaa3 = integer; type mmp3 = integer;
{$ifc defined bogus1} {$ifc defined bogus1}
type bogus1 = integer; type bogus1 = integer;
{$elifc defined bogus2} {$elifc defined bogus2}
@ -27,7 +27,7 @@ type aaa3 = integer;
{$error Neither bogus1 nor bogus2 nor bogus3 are defined.} {$error Neither bogus1 nor bogus2 nor bogus3 are defined.}
{$endc} {$endc}
{$elsec} {$elsec}
type aaaELSE = integer; type mmpELSE = integer;
{$error Neither test1 nor test2 nor test3 are defined.} {$error Neither test1 nor test2 nor test3 are defined.}
{$endc} {$endc}

6
components/h2pas/h2pasconvert.pas
View File

@ -2726,7 +2726,7 @@ begin
repeat repeat
CurAtom:=ReadNextPascalAtom(Src,Position,AtomStart); CurAtom:=ReadNextPascalAtom(Src,Position,AtomStart);
if CurAtom='' then break; if CurAtom='' then break;
//DebugLn(['TReplaceImplicitTypes.FindNextImplicitType AAA1 ',CurAtom]); //DebugLn(['TReplaceImplicitTypes.FindNextImplicitType atom ',CurAtom]);
if CurAtom=':' then begin if CurAtom=':' then begin
// var, const, out declaration // var, const, out declaration
CurAtom:=ReadNextPascalAtom(Src,Position,AtomStart); CurAtom:=ReadNextPascalAtom(Src,Position,AtomStart);
@ -4253,8 +4253,8 @@ var
Identifier:=@Tool.Src[Position+Count]; Identifier:=@Tool.Src[Position+Count];
AVLNode:=NeededPointerTypes.FindKey(Identifier, AVLNode:=NeededPointerTypes.FindKey(Identifier,
@CompareImplicitTypeStringAndName); @CompareImplicitTypeStringAndName);
DebugLn(['AddNeededPointerType ',GetIdentifier(Identifier),' Position=',Position,' Count=',Count]); DebugLn(['AddNeededPointerType Identifier ',GetIdentifier(Identifier),' Position=',Position,' Count=',Count]);
DebugLn(['AddNeededPointerType AAA1 ',copy(Tool.Src,Position,100)]); DebugLn(['AddNeededPointerType Position ',copy(Tool.Src,Position,100)]);
if AVLNode<>nil then begin if AVLNode<>nil then begin
Item:=TImplicitType(AVLNode.Data); Item:=TImplicitType(AVLNode.Data);
if Item.MaxPosition<Count then if Item.MaxPosition<Count then

6
lcl/include/speedbutton.inc
View File

@ -543,7 +543,7 @@ begin
end; end;
ClientSize.cx:= PaintRect.Right - PaintRect.Left; ClientSize.cx:= PaintRect.Right - PaintRect.Left;
ClientSize.cy:= PaintRect.Bottom - PaintRect.Top; ClientSize.cy:= PaintRect.Bottom - PaintRect.Top;
//debugln(['TCustomSpeedButton.MeasureDraw AAA1 ',DbgSName(Self),' PaintRect=',dbgs(PaintRect)]); //debugln(['TCustomSpeedButton.MeasureDraw Step1 ',DbgSName(Self),' PaintRect=',dbgs(PaintRect)]);
// compute size of glyph // compute size of glyph
GlyphSize := GetGlyphSize(Draw,PaintRect); GlyphSize := GetGlyphSize(Draw,PaintRect);
GlyphWidth := GlyphSize.CX; GlyphWidth := GlyphSize.CX;
@ -551,7 +551,7 @@ begin
GlyphWidth:=GlyphWidth div NumGlyphs; GlyphWidth:=GlyphWidth div NumGlyphs;
GlyphHeight := GlyphSize.CY; GlyphHeight := GlyphSize.CY;
HasGlyph:=(GlyphWidth<>0) and (GlyphHeight<>0); HasGlyph:=(GlyphWidth<>0) and (GlyphHeight<>0);
//debugln(['TCustomSpeedButton.MeasureDraw AAA2 ',DbgSName(Self),' PaintRect=',dbgs(PaintRect),' GlyphSize=',GlyphWidth,'x',GlyphHeight]); //debugln(['TCustomSpeedButton.MeasureDraw Step2 ',DbgSName(Self),' PaintRect=',dbgs(PaintRect),' GlyphSize=',GlyphWidth,'x',GlyphHeight]);
// compute size of text // compute size of text
CurLayout:=BidiAdjustButtonLayout(UseRightToLeftReading, Layout); CurLayout:=BidiAdjustButtonLayout(UseRightToLeftReading, Layout);
@ -644,7 +644,7 @@ begin
end; end;
end; end;
//debugln(['TCustomSpeedButton.MeasureDraw AAA3 ',DbgSName(Self),' PaintRect=',dbgs(PaintRect),' GlyphSize=',GlyphWidth,'x',GlyphHeight,' TextSize=',TextSize.cx,'x',TextSize.cy,' S=',S,' M=',M]); //debugln(['TCustomSpeedButton.MeasureDraw Step3 ',DbgSName(Self),' PaintRect=',dbgs(PaintRect),' GlyphSize=',GlyphWidth,'x',GlyphHeight,' TextSize=',TextSize.cx,'x',TextSize.cy,' S=',S,' M=',M]);
if Draw then if Draw then
begin begin

4
packager/packagelinks.pas
View File

@ -890,8 +890,10 @@ begin
DebugLn(['TPackageLinks.FindLinkWithDependencyInTree Dependency makes no sense']); DebugLn(['TPackageLinks.FindLinkWithDependencyInTree Dependency makes no sense']);
exit; exit;
end; end;
{$IFDEF VerbosePkgLinkSameName}
if CompareText(Dependency.PackageName,'tstver')=0 then if CompareText(Dependency.PackageName,'tstver')=0 then
debugln(['TPackageLinks.FindLinkWithDependencyInTree AAA1 ',Dependency.AsString(true)]); debugln(['TPackageLinks.FindLinkWithDependencyInTree START ',Dependency.AsString(true)]);
{$ENDIF}
// if there are several fitting the description, use the last used // if there are several fitting the description, use the last used
// and highest version // and highest version
CurNode:=FindLeftMostNode(LinkTree,Dependency.PackageName); CurNode:=FindLeftMostNode(LinkTree,Dependency.PackageName);