Update create-shortcuts-xml.sh
authorColin Clark <colin.clark@cclark.uk>
Sat, 17 Jun 2023 09:01:45 +0000 (10:01 +0100)
committerColin Clark <colin.clark@cclark.uk>
Sat, 17 Jun 2023 09:01:45 +0000 (10:01 +0100)
Update to take into account change from NULL to nullptr and change to
use of static_cast.

doc/create-shortcuts-xml.sh

index d503044..b379704 100755 (executable)
@@ -81,10 +81,10 @@ awk_window='BEGIN {
        {FS=","}
        while ($0 !~ /^hard_coded_window_keys/) {getline}
 }
-$0~/\{0, 0/ {exit}
+$0~/\{static_cast\<GdkModifierType\>\(0\), 0/ {exit}
 {
-gsub(/{0/, "", $1);
-gsub(/{GDK_CONTROL_MASK \+ GDK_SHIFT_MASK/, "Ctrl + Shift +", $1);
+gsub(/\{static_cast\<GdkModifierType\>\(0\)/, "", $1);
+gsub(/\{static_cast\<GdkModifierType\>\(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);