paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-26 12:09:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 43503 #1749b9b22a, 43505 #1ef55617f3 from trunk:

Browse Source 
Fix typo. Emtpy -> Empty
........
IDE: fixed resourcestring name: lisEMDEmtpyMethods -> lisEMDEmptyMethods
........

git-svn-id: branches/fixes_1_2@43507 -
This commit is contained in:
maxim 2013-11-30 15:57:24 +00:00
parent f94bd23d9b
commit 8b06203910
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/codetools/codecompletiontool.pas
View File

@ -778,7 +778,7 @@ begin
NearestAVLNodeBehind:=NearestAVLNode; NearestAVLNodeBehind:=NearestAVLNode;
end; end;
// choose the nearest of both (distance measured in emtpy lines, // choose the nearest of both (distance measured in empty lines,
// this way blocks of procs are kept) // this way blocks of procs are kept)
if (NearestAVLNodeInFront<>nil) and (NearestAVLNodeBehind<>nil) then if (NearestAVLNodeInFront<>nil) and (NearestAVLNodeBehind<>nil) then
begin begin
@ -5521,7 +5521,7 @@ begin
ProcBodyNodes:=GatherProcNodes(TypeSectionNode, ProcBodyNodes:=GatherProcNodes(TypeSectionNode,
[phpInUpperCase,phpIgnoreForwards,phpOnlyWithClassname], [phpInUpperCase,phpIgnoreForwards,phpOnlyWithClassname],
ExtractClassName(CodeCompleteClassNode,true)); ExtractClassName(CodeCompleteClassNode,true));
// collect all emtpy bodies // collect all empty bodies
AVLNode:=ProcBodyNodes.FindLowest; AVLNode:=ProcBodyNodes.FindLowest;
while AVLNode<>nil do begin while AVLNode<>nil do begin
NextAVLNode:=ProcBodyNodes.FindSuccessor(AVLNode); NextAVLNode:=ProcBodyNodes.FindSuccessor(AVLNode);

4
ide/checklfmdlg.pas
View File

@ -340,7 +340,7 @@ end;
procedure ClearDanglingEvents(ListOfPInstancePropInfo: TFPList); procedure ClearDanglingEvents(ListOfPInstancePropInfo: TFPList);
const const
EmtpyMethod: TMethod = (code:nil; data:nil); EmptyMethod: TMethod = (code:nil; data:nil);
var var
i: Integer; i: Integer;
p: PInstancePropInfo; p: PInstancePropInfo;
@ -349,7 +349,7 @@ begin
for i:=0 to ListOfPInstancePropInfo.Count-1 do begin for i:=0 to ListOfPInstancePropInfo.Count-1 do begin
p:=PInstancePropInfo(ListOfPInstancePropInfo[i]); p:=PInstancePropInfo(ListOfPInstancePropInfo[i]);
debugln('ClearDanglingEvents ',DbgSName(p^.Instance),' ',p^.PropInfo^.Name); debugln('ClearDanglingEvents ',DbgSName(p^.Instance),' ',p^.PropInfo^.Name);
SetMethodProp(p^.Instance,p^.PropInfo,EmtpyMethod); SetMethodProp(p^.Instance,p^.PropInfo,EmptyMethod);
end; end;
end; end;

2
ide/emptymethodsdlg.pas
View File

@ -313,7 +313,7 @@ end;
procedure TEmptyMethodsDialog.FormCreate(Sender: TObject); procedure TEmptyMethodsDialog.FormCreate(Sender: TObject);
begin begin
Caption:=lisEMDEmtpyMethods; Caption:=lisEMDEmptyMethods;
SectionsGroupBox.Caption:=lisEMDSearchInTheseClassSections; SectionsGroupBox.Caption:=lisEMDSearchInTheseClassSections;
PrivateCheckBox.Caption:=lisPrivate; PrivateCheckBox.Caption:=lisPrivate;
ProtectedCheckBox.Caption:=lisProtected; ProtectedCheckBox.Caption:=lisProtected;

2
ide/lazarusidestrconsts.pas
View File

@ -2106,7 +2106,7 @@ resourcestring
lisErrorLoadingFile2 = 'Error loading file "%s":%s%s'; lisErrorLoadingFile2 = 'Error loading file "%s":%s%s';
lisNoneClickToChooseOne = 'none, click to choose one'; lisNoneClickToChooseOne = 'none, click to choose one';
lisTreeNeedsRefresh = 'Tree needs refresh'; lisTreeNeedsRefresh = 'Tree needs refresh';
lisEMDEmtpyMethods = 'Emtpy Methods'; lisEMDEmptyMethods = 'Empty Methods';
lisEMDSearchInTheseClassSections = 'Search in these class sections:'; lisEMDSearchInTheseClassSections = 'Search in these class sections:';
lisUnableToLoadPackage = 'Unable to load package %s%s%s'; lisUnableToLoadPackage = 'Unable to load package %s%s%s';
lisSAMThisMethodCanNotBeOverriddenBecauseItIsDefinedInTh = 'This method can ' lisSAMThisMethodCanNotBeOverriddenBecauseItIsDefinedInTh = 'This method can '