@@ -118,7 +118,7 @@ namespace
118118 EndOfText
119119 };
120120
121- class KeyboardRenderer
121+ class KeyboardRenderer final
122122 {
123123 public:
124124 KeyboardRenderer ( fheroes2::Display & output, std::string & info, const size_t lengthLimit, const bool evilInterface )
@@ -326,7 +326,7 @@ namespace
326326 }
327327 };
328328
329- struct KeyboardButton
329+ struct KeyboardButton final
330330 {
331331 KeyboardButton () = default ;
332332
@@ -600,7 +600,7 @@ namespace
600600 lastButtonRow.emplace_back ( _ ( " Keyboard|123" ), defaultSpecialButtonSize, isEvilInterface,
601601 []( const KeyboardRenderer & ) { return DialogAction::AlphaNumeric; } );
602602
603- lastButtonRow.emplace_back ( _ ( " Keyboard|SPACE" ), spacebarButtonSize, isEvilInterface, []( KeyboardRenderer & renderer ) {
603+ lastButtonRow.emplace_back ( _ ( " Keyboard|SPACE" ), fheroes2::Key::KEY_SPACE, spacebarButtonSize, isEvilInterface, []( KeyboardRenderer & renderer ) {
604604 renderer.insertCharacter ( ' ' );
605605 return DialogAction::DoNothing;
606606 } );
@@ -610,7 +610,7 @@ namespace
610610 lastButtonRow.back ().button .hide ();
611611 }
612612
613- lastButtonRow.emplace_back ( " ~" , defaultSpecialButtonSize, isEvilInterface, []( KeyboardRenderer & renderer ) {
613+ lastButtonRow.emplace_back ( " ~" , fheroes2::Key::KEY_BACKSPACE, defaultSpecialButtonSize, isEvilInterface, []( KeyboardRenderer & renderer ) {
614614 renderer.removeCharacter ();
615615 return DialogAction::DoNothing;
616616 } );
@@ -622,7 +622,7 @@ namespace
622622 lastButtonRow.emplace_back ( _ ( " Keyboard|123" ), defaultSpecialButtonSize, isEvilInterface,
623623 []( const KeyboardRenderer & ) { return DialogAction::AlphaNumeric; } );
624624
625- lastButtonRow.emplace_back ( _ ( " Keyboard|SPACE" ), spacebarButtonSize, isEvilInterface, []( KeyboardRenderer & renderer ) {
625+ lastButtonRow.emplace_back ( _ ( " Keyboard|SPACE" ), fheroes2::Key::KEY_SPACE, spacebarButtonSize, isEvilInterface, []( KeyboardRenderer & renderer ) {
626626 renderer.insertCharacter ( ' ' );
627627 return DialogAction::DoNothing;
628628 } );
@@ -632,7 +632,7 @@ namespace
632632 lastButtonRow.back ().button .hide ();
633633 }
634634
635- lastButtonRow.emplace_back ( " ~" , defaultSpecialButtonSize, isEvilInterface, []( KeyboardRenderer & renderer ) {
635+ lastButtonRow.emplace_back ( " ~" , fheroes2::Key::KEY_BACKSPACE, defaultSpecialButtonSize, isEvilInterface, []( KeyboardRenderer & renderer ) {
636636 renderer.removeCharacter ();
637637 return DialogAction::DoNothing;
638638 } );
@@ -644,15 +644,15 @@ namespace
644644 lastButtonRow.emplace_back ( _ ( " Keyboard|ABC" ), defaultSpecialButtonSize, isEvilInterface,
645645 []( const KeyboardRenderer & ) { return DialogAction::LowerCase; } );
646646
647- lastButtonRow.emplace_back ( _ ( " Keyboard|SPACE" ), spacebarButtonSize, isEvilInterface, []( KeyboardRenderer & renderer ) {
647+ lastButtonRow.emplace_back ( _ ( " Keyboard|SPACE" ), fheroes2::Key::KEY_SPACE, spacebarButtonSize, isEvilInterface, []( KeyboardRenderer & renderer ) {
648648 renderer.insertCharacter ( ' ' );
649649 return DialogAction::DoNothing;
650650 } );
651651
652652 lastButtonRow.emplace_back ( " \x7F " , defaultSpecialButtonSize, isEvilInterface, []( const KeyboardRenderer & ) { return DialogAction::DoNothing; } );
653653 lastButtonRow.back ().button .hide ();
654654
655- lastButtonRow.emplace_back ( " ~" , defaultSpecialButtonSize, isEvilInterface, []( KeyboardRenderer & renderer ) {
655+ lastButtonRow.emplace_back ( " ~" , fheroes2::Key::KEY_BACKSPACE, defaultSpecialButtonSize, isEvilInterface, []( KeyboardRenderer & renderer ) {
656656 renderer.removeCharacter ();
657657 return DialogAction::DoNothing;
658658 } );
0 commit comments