Change custom icons to an array

[chaz/p5-File-KDBX] / lib / File / KDBX / Dumper / KDB.pm

diff --git a/lib/File/KDBX/Dumper/KDB.pm b/lib/File/KDBX/Dumper/KDB.pm
index b1d5ba7d4a49f9e18c8b2be9cb2fd41b5df2b68c..d2cb891e8b83e0603b6981de5e0b5a9fc8b606df 100644 (file)
--- a/lib/File/KDBX/Dumper/KDB.pm
+++ b/lib/File/KDBX/Dumper/KDB.pm
@@ -9,10 +9,10 @@ use Encode qw(encode);
 use File::KDBX::Constants qw(:magic);
 use File::KDBX::Error;
 use File::KDBX::Loader::KDB;
-use File::KDBX::Util qw(:uuid load_optional);
+use File::KDBX::Util qw(:class :uuid load_optional);
 use namespace::clean;
 
-use parent 'File::KDBX::Dumper';
+extends 'File::KDBX::Dumper';
 
 our $VERSION = '999.999'; # VERSION
 
@@ -64,8 +64,8 @@ sub _write_custom_icons {
     my %groups;     # id -> index
     my %gid;
 
-    for my $uuid (sort keys %{$kdbx->custom_icons}) {
-        my $icon = $kdbx->custom_icons->{$uuid};
+    for my $icon (@{$kdbx->custom_icons}) {
+        my $uuid = $icon->{uuid};
         my $data = $icon->{data} or next;
         push @icons, $data;
         $icons{$uuid} = $#icons;