From 493b1231fdd21d965819df0c4d8304f062eb9dc1 Mon Sep 17 00:00:00 2001
From: Markus Gans <guru@server.home.net>
Date: Sun, 11 Oct 2020 23:22:53 +0200
Subject: [PATCH] Small fixes

---
 src/fapplication.cpp             | 30 +++++++++++++++---------------
 src/fbuttongroup.cpp             |  2 +-
 src/flistbox.cpp                 |  2 +-
 src/include/final/fbuttongroup.h |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/fapplication.cpp b/src/fapplication.cpp
index 65ce075e..b4170ee9 100644
--- a/src/fapplication.cpp
+++ b/src/fapplication.cpp
@@ -493,35 +493,35 @@ inline FApplication::CmdMap& FApplication::mapCmdOptions()
   static CmdMap cmd_map{};
 
   // --encoding
-  cmd_map['e'] = [enc] (char* arg) { enc(FString(arg)); };
+  cmd_map['e'] = [enc] (const char* arg) { enc(FString(arg)); };
   // --log-file
-  cmd_map['l'] = [log] (char* arg) { log(FString(arg)); };
+  cmd_map['l'] = [log] (const char* arg) { log(FString(arg)); };
   // --no-mouse
-  cmd_map['m'] = [opt] (char*) { opt().mouse_support = false; };
+  cmd_map['m'] = [opt] (const char*) { opt().mouse_support = false; };
   // --no-optimized-cursor
-  cmd_map['o'] = [opt] (char*) { opt().cursor_optimisation = false; };
+  cmd_map['o'] = [opt] (const char*) { opt().cursor_optimisation = false; };
   // --no-terminal-detection
-  cmd_map['d'] = [opt] (char*) { opt().terminal_detection = false; };
+  cmd_map['d'] = [opt] (const char*) { opt().terminal_detection = false; };
   // --no-terminal-data-request
-  cmd_map['r'] = [opt] (char*) { opt().terminal_data_request = false; };
+  cmd_map['r'] = [opt] (const char*) { opt().terminal_data_request = false; };
   // --no-color-change
-  cmd_map['c'] = [opt] (char*) { opt().color_change = false; };
+  cmd_map['c'] = [opt] (const char*) { opt().color_change = false; };
   // --no-sgr-optimizer
-  cmd_map['s'] = [opt] (char*) { opt().sgr_optimizer = false; };
+  cmd_map['s'] = [opt] (const char*) { opt().sgr_optimizer = false; };
   // --vgafont
-  cmd_map['v'] = [opt] (char*) { opt().vgafont = true; };
+  cmd_map['v'] = [opt] (const char*) { opt().vgafont = true; };
   // --newfont
-  cmd_map['n'] = [opt] (char*) { opt().newfont = true; };
+  cmd_map['n'] = [opt] (const char*) { opt().newfont = true; };
   // --dark-theme
-  cmd_map['t'] = [opt] (char*) { opt().dark_theme = true; };
+  cmd_map['t'] = [opt] (const char*) { opt().dark_theme = true; };
 #if defined(__FreeBSD__) || defined(__DragonFly__)
   // --no-esc-for-alt-meta
-  cmd_map['E'] = [opt] (char*) { opt().meta_sends_escape = false; };
+  cmd_map['E'] = [opt] (const char*) { opt().meta_sends_escape = false; };
   // --no-cursorstyle-change
-  cmd_map['C'] = [opt] (char*) { opt().change_cursorstyle = false; };
+  cmd_map['C'] = [opt] (const char*) { opt().change_cursorstyle = false; };
 #elif defined(__NetBSD__) || defined(__OpenBSD__)
   // --no-esc-for-alt-meta
-  cmd_map['E'] = [opt] (char*) { opt().meta_sends_escape = false; };
+  cmd_map['E'] = [opt] (const char*) { opt().meta_sends_escape = false; };
 #endif
   return cmd_map;
 }
@@ -836,7 +836,7 @@ bool FApplication::processAccelerator (const FWidget* const& widget) const
 {
   bool accpt{false};
 
-  if ( widget && widget->getAcceleratorList().empty() )
+  if ( widget || widget->getAcceleratorList().empty() )
     return accpt;
 
   for (auto&& item : widget->getAcceleratorList())
diff --git a/src/fbuttongroup.cpp b/src/fbuttongroup.cpp
index 85675a74..fa695dcd 100644
--- a/src/fbuttongroup.cpp
+++ b/src/fbuttongroup.cpp
@@ -451,7 +451,7 @@ void FButtonGroup::drawText ( const FString& label_text
 }
 
 //----------------------------------------------------------------------
-bool FButtonGroup::directFocusCheckedRadioButton (FToggleButton* item)
+bool FButtonGroup::directFocusCheckedRadioButton (FToggleButton* item) const
 {
   if ( ! isRadioButton(item) )
     return false;
diff --git a/src/flistbox.cpp b/src/flistbox.cpp
index 0d4d589b..c3eb068a 100644
--- a/src/flistbox.cpp
+++ b/src/flistbox.cpp
@@ -1622,7 +1622,7 @@ inline bool FListBox::deletePreviousCharacter()
 {
   const std::size_t inc_len = inc_search.getLength();
 
-  if ( inc_len <= 0 )
+  if ( inc_len == 0 )
     return false;
 
   inc_search.remove(inc_len - 1, 1);
diff --git a/src/include/final/fbuttongroup.h b/src/include/final/fbuttongroup.h
index 65a0c6b8..923dbff7 100644
--- a/src/include/final/fbuttongroup.h
+++ b/src/include/final/fbuttongroup.h
@@ -127,7 +127,7 @@ class FButtonGroup : public FScrollView
     // Methods
     void                init();
     void                drawText (const FString&, std::size_t);
-    bool                directFocusCheckedRadioButton (FToggleButton*);
+    bool                directFocusCheckedRadioButton (FToggleButton*) const;
     bool                directFocusRadioButton();
     void                directFocus();
     void                focusCheckedRadioButton (FToggleButton*, FFocusEvent*);