forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libman, replace usage of branches-bloated-findCaption with the simpler version

This commit is contained in:
Basile Burg 2016-12-04 15:19:43 +01:00
parent 1524c43f7d
commit 40369f219a
No known key found for this signature in database
GPG Key ID: 1868039F415CB8CF
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ce_libmaneditor.pas
View File

@ -415,7 +415,7 @@ var
begin begin
if TDubPackageQueryForm.showAndWait(nme, ver) <> mrOk then if TDubPackageQueryForm.showAndWait(nme, ver) <> mrOk then
exit; exit;
if List.Items.FindCaption(0, nme, false, false, false).isNotNil then if List.Items.findCaption(nme, row) then
begin begin
if dlgYesNo(format('a library item with the alias "%s" already exists, do you wish to update it ?', if dlgYesNo(format('a library item with the alias "%s" already exists, do you wish to update it ?',
[nme])) <> mrYes then exit [nme])) <> mrYes then exit
@ -522,9 +522,7 @@ begin
and (TJSONObject(prj.json).Find('targetType').AsString = 'sourceLibrary') and (TJSONObject(prj.json).Find('targetType').AsString = 'sourceLibrary')
then then
begin begin
if ovw then if ovw and not List.items.findCaption(nme, row) then
row := List.FindCaption(0, nme, true, true, true);
if row.isNil then
row := List.Items.Add; row := List.Items.Add;
if row.Data.isNil then if row.Data.isNil then
row.Data := LibMan.libraries.Add; row.Data := LibMan.libraries.Add;
@ -557,9 +555,7 @@ begin
prj.loadFromFile(dfn); prj.loadFromFile(dfn);
if prj.filename.isNotEmpty and (prj.binaryKind = staticlib) then if prj.filename.isNotEmpty and (prj.binaryKind = staticlib) then
begin begin
if ovw then if ovw and not List.items.findCaption(nme, row) then
row := List.FindCaption(0, nme, true, true, true);
if row.isNil then
row := List.Items.Add; row := List.Items.Add;
if row.Data.isNil then if row.Data.isNil then
row.Data := LibMan.libraries.Add; row.Data := LibMan.libraries.Add;
@ -663,7 +659,7 @@ begin
// //
fname := fProj.filename; fname := fProj.filename;
lalias := ExtractFileNameOnly(fname); lalias := ExtractFileNameOnly(fname);
if List.Items.FindCaption(0, lalias, false, false, false) <> nil then if List.Items.findCaption(lalias, row) then
begin begin
dlgOkInfo(format('a library item with the alias "%s" already exists, delete it before trying again.', dlgOkInfo(format('a library item with the alias "%s" already exists, delete it before trying again.',
[lalias])); [lalias]));