From: Colin Clark Date: Sat, 17 Jun 2023 09:01:45 +0000 (+0100) Subject: Update create-shortcuts-xml.sh X-Git-Tag: v2.1~3 X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=a5857d6bbfc8cdad0e77d1f2d353799dd20e5818 Update create-shortcuts-xml.sh Update to take into account change from NULL to nullptr and change to use of static_cast. --- diff --git a/doc/create-shortcuts-xml.sh b/doc/create-shortcuts-xml.sh index d503044f..b3797043 100755 --- a/doc/create-shortcuts-xml.sh +++ b/doc/create-shortcuts-xml.sh @@ -81,10 +81,10 @@ awk_window='BEGIN { {FS=","} while ($0 !~ /^hard_coded_window_keys/) {getline} } -$0~/\{0, 0/ {exit} +$0~/\{static_cast\\(0\), 0/ {exit} { -gsub(/{0/, "", $1); -gsub(/{GDK_CONTROL_MASK \+ GDK_SHIFT_MASK/, "Ctrl + Shift +", $1); +gsub(/\{static_cast\\(0\)/, "", $1); +gsub(/\{static_cast\\(GDK_CONTROL_MASK \+ GDK_SHIFT_MASK\)/, "Ctrl + Shift +", $1); gsub(/{GDK_CONTROL_MASK/, "Ctrl +", $1); gsub(/{GDK_SHIFT_MASK/, "Shift +", $1); gsub(/{GDK_MOD1_MASK/, "Alt +", $1); @@ -103,7 +103,7 @@ awk_main_window='BEGIN { {FS=","} } $0 ~ /^ { "/ { - if ($4 !~ /NULL/) { + if ($4 !~ /nullptr/) { { gsub(/^[[:space:]]+|[[:space:]]+$/,"",$4); gsub(/^[[:space:]]+|[[:space:]]+$/,"",$5);