From 508a89d4af0cfa72241755b1e6e39d122854efa3 Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Mon, 10 Sep 2018 22:27:55 +0000
Subject: [PATCH] LCL: Rename function NewLine -> NewLineMI to avoid name
 clashes and confusion.

git-svn-id: trunk@58939 -
---
 components/ideintf/objectinspector.pp | 8 ++++----
 lcl/menus.pp                          | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/ideintf/objectinspector.pp b/components/ideintf/objectinspector.pp
index a65b2ee8eb..1522e7116d 100644
--- a/components/ideintf/objectinspector.pp
+++ b/components/ideintf/objectinspector.pp
@@ -5666,7 +5666,7 @@ var
     // insert the separator
     if VerbCount > 0 then
     begin
-      PropertyEditorVerbSeparator := Menus.NewLine;
+      PropertyEditorVerbSeparator := Menus.NewLineMI;
       PropertyEditorVerbSeparator.Name := PropertyEditorMIPrefix + IntToStr(VerbCount);
       MainPopupMenu.Items.Insert(VerbCount, PropertyEditorVerbSeparator);
     end;
@@ -5699,7 +5699,7 @@ var
     // insert the separator
     if VerbCount > 0 then
     begin
-      ComponentEditorVerbSeparator := Menus.NewLine;
+      ComponentEditorVerbSeparator := Menus.NewLineMI;
       ComponentEditorVerbSeparator.Name := ComponentEditorMIPrefix + IntToStr(VerbCount);
       MainPopupMenu.Items.Insert(VerbCount, ComponentEditorVerbSeparator);
     end;
@@ -5712,7 +5712,7 @@ var
     Item := NewItem(oisAddCollectionItem, 0, False, True,
       @CollectionAddItem, 0, ComponentEditorMIPrefix+'0');
     MainPopupMenu.Items.Insert(0, Item);
-    ComponentEditorVerbSeparator := NewLine;
+    ComponentEditorVerbSeparator := NewLineMI;
     ComponentEditorVerbSeparator.Name := ComponentEditorMIPrefix+'1';
     MainPopupMenu.Items.Insert(1, ComponentEditorVerbSeparator);
   end;
@@ -5742,7 +5742,7 @@ var
       MainPopupMenu.Items.Insert(ComponentEditorVerbSeparator.MenuIndex + 1, ZItem)
     else
       MainPopupMenu.Items.Insert(0, ZItem);
-    Item := NewLine;
+    Item := NewLineMI;
     Item.Name := ComponentEditorMIPrefix+'ZOrderSeparator';
     MainPopupMenu.Items.Insert(ZItem.MenuIndex + 1, Item);
   end;
diff --git a/lcl/menus.pp b/lcl/menus.pp
index 5bf478c813..bcfec133b6 100644
--- a/lcl/menus.pp
+++ b/lcl/menus.pp
@@ -460,7 +460,7 @@ function NewSubMenu(const ACaption: string; hCtx: THelpContext;
 function NewItem(const ACaption: string; AShortCut: TShortCut;
                  AChecked, TheEnabled: Boolean; TheOnClick: TNotifyEvent;
                  hCtx: THelpContext; const AName: string): TMenuItem;
-function NewLine: TMenuItem;
+function NewLineMI: TMenuItem;
 
 function StripHotkey(const Text: string): string;
 
@@ -609,7 +609,7 @@ begin
   end;
 end;
 
-function NewLine: TMenuItem;
+function NewLineMI: TMenuItem;
 begin
   Result := TMenuItem.Create(nil);
   Result.Caption := cLineCaption;