- next unless my ($name) = /\W+QIcon::fromTheme\(\"([-\w]+)/;
- $req_icons{$name} = 1
- unless exists $blacklist{$name};
-}
-
-# Add whitelist icons
-open WHITELIST, "<$whitelistfile" or die "Could not open $whitelistfile\n";
-while(<WHITELIST>) {
- s/#.*//;
- next unless my ($name) = /([-\w]+)\s*/;
- $req_icons{$name} = 1
- unless exists $themeblacklist{$name};
-}
-close WHITELIST;
-
-# Read in extra-icons
-my $hasthemeextrafile = 1;
-local $/;
-open EXTRAFILE, "<$extrafile" or $hasthemeextrafile = 0;
-if($hasthemeextrafile) {
- binmode EXTRAFILE;
- $extrafilecontent = <EXTRAFILE>;
- close EXTRAFILE;
-} else {
- $extrafilecontent = "";
+ next unless my (@names) = /\W+icon::get\((?:\"([-\w]+)\")|(?:\{\s*\"([-\w]+)\"(?:,\s*\"([-\w]+)\")*\s*\})/;
+ foreach(@names) {
+ $req_icons{$_} = 1 unless not defined or exists $blacklist{$_};
+ }