Cleanup: Implemented some SonarCloud suggestions

kitswas · Dec 25, 2023 · 56ba328 · 56ba328
1 parent 09731a4
commit 56ba328
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 45 deletions.
diff --git a/src/mainwindow.hpp b/src/mainwindow.hpp
@@ -16,7 +16,7 @@ class MainWindow final : public QMainWindow
 
   public:
 	explicit MainWindow(QWidget *parent = nullptr);
-	~MainWindow() final;
+	~MainWindow() override;
 
   private slots:
 	void launch_server();

diff --git a/src/preferences.h b/src/preferences.h
@@ -17,11 +17,11 @@ class Preferences final : public QDialog
   public:
 	explicit Preferences(QWidget *parent = nullptr);
 	void load_keys();
-	~Preferences() final;
+	~Preferences() override;
 
   protected:
-	bool eventFilter(QObject *sender, QEvent *event) final;
-	void keyPressEvent(QKeyEvent *e) final;
+	bool eventFilter(QObject *sender, QEvent *event) override;
+	void keyPressEvent(QKeyEvent *e) override;
 
   private:
 	Ui::Preferences *ui;

diff --git a/src/settings.cpp b/src/settings.cpp
@@ -10,7 +10,7 @@ QSettings *settings;
 
 QString setting_keys::Mouse_sensitivity = "mouse_setting/mouse_sensitivity";
 
-void (*load_functions[3])(void) = {
+void (*load_functions[])(void) = {
 	load_mouse_setting, load_port_number,
 	load_key_maps}; // an array of pointer to functions that needs to run on startup to load settings.
 

diff --git a/src/settings.h b/src/settings.h
@@ -41,18 +41,18 @@ inline QList<QString> server_settings = {"port"};
 /**
  * A Qmap to map the keys in namespace to corresponding settings name in string format.
  */
-inline QMap<setting_keys::keys, QString> keymaps = {{setting_keys::keys::A, "keymaps/A"},
-													{setting_keys::keys::B, "keymaps/B"},
-													{setting_keys::keys::X, "keymaps/X"},
-													{setting_keys::keys::Y, "keymaps/Y"},
-													{setting_keys::keys::RSHDR, "keymaps/RT"},
-													{setting_keys::keys::LSHDR, "keymaps/LT"},
-													{setting_keys::keys::DPADDOWN, "keymaps/DPADDOWN"},
-													{setting_keys::keys::DPADUP, "keymaps/DPADUP"},
-													{setting_keys::keys::DPADRIGHT, "keymaps/DPADRIGHT"},
-													{setting_keys::keys::DPADLEFT, "keymaps/DPADLEFT"},
-													{setting_keys::keys::VIEW, "keymaps/VIEW"},
-													{setting_keys::keys::MENU, "keymaps/MENU"}};
+const inline QMap<setting_keys::keys, QString> keymaps = {{setting_keys::keys::A, "keymaps/A"},
+														  {setting_keys::keys::B, "keymaps/B"},
+														  {setting_keys::keys::X, "keymaps/X"},
+														  {setting_keys::keys::Y, "keymaps/Y"},
+														  {setting_keys::keys::RSHDR, "keymaps/RT"},
+														  {setting_keys::keys::LSHDR, "keymaps/LT"},
+														  {setting_keys::keys::DPADDOWN, "keymaps/DPADDOWN"},
+														  {setting_keys::keys::DPADUP, "keymaps/DPADUP"},
+														  {setting_keys::keys::DPADRIGHT, "keymaps/DPADRIGHT"},
+														  {setting_keys::keys::DPADLEFT, "keymaps/DPADLEFT"},
+														  {setting_keys::keys::VIEW, "keymaps/VIEW"},
+														  {setting_keys::keys::MENU, "keymaps/MENU"}};
 
 void save_setting(const QString &key, const QVariant &value);
 QVariant load_setting(const QString &key);

diff --git a/src/settings_key_variables.cpp b/src/settings_key_variables.cpp
@@ -18,8 +18,6 @@ std::map<GamepadButtons, Input> GAMEPAD_BUTTONS = {{GamepadButtons::GamepadButto
 												   {GamepadButtons::GamepadButtons_DPadRight, Input{VK_RIGHT, 0}},
 												   {GamepadButtons::GamepadButtons_LeftShoulder, Input{VK_LBUTTON, 1}},
 												   {GamepadButtons::GamepadButtons_RightShoulder, Input{VK_NEXT, 0}}};
-// {GamepadButtons::GamepadButtons_LeftThumbstick, Input{VK_LBUTTON, 1}},
-// {GamepadButtons::GamepadButtons_RightThumbstick, Input{VK_NEXT, 0}}};
 
 /**
  * Maps the joystick movements.
@@ -33,32 +31,32 @@ std::map<Thumbstick, WORD> THUMBSTICK_KEYS = {
 /**
  * A std::map to map the virtual key codes to corresponding key names
  */
-std::map<UINT, const char *> vk_maps = {{VK_LBUTTON, "LMButton"},
-										{VK_RBUTTON, "RMButton"},
-										{VK_MBUTTON, "MMButton"},
-										{VK_BACK, "BACKSPACE"},
-										{VK_TAB, "TAB"},
-										{VK_RETURN, "ENTER"},
-										{VK_SHIFT, "SHIFT"},
-										{VK_CONTROL, "CTRL"},
-										{VK_CAPITAL, "CAPITAL"},
-										{VK_ESCAPE, "ESCAPE"},
-										{VK_SPACE, "SPACE"},
-										{VK_PRIOR, "PageUP"},
-										{VK_NEXT, "PageDOWN"},
-										{VK_END, "END"},
-										{VK_HOME, "HOME"},
-										{VK_LEFT, "LEFT"},
-										{VK_UP, "UP"},
-										{VK_RIGHT, "RIGHT"},
-										{VK_DOWN, "DOWN"},
-										{VK_INSERT, "INS"},
-										{VK_DELETE, "DEL"},
-										{VK_OEM_PERIOD, "."},
-										{VK_OEM_COMMA, ","},
-										{VK_OEM_MINUS, "-"},
-										{VK_OEM_PLUS, "+"},
-										{VK_MENU, "MENU"}};
+const std::map<UINT, const char *> vk_maps = {{VK_LBUTTON, "LMButton"},
+											  {VK_RBUTTON, "RMButton"},
+											  {VK_MBUTTON, "MMButton"},
+											  {VK_BACK, "BACKSPACE"},
+											  {VK_TAB, "TAB"},
+											  {VK_RETURN, "ENTER"},
+											  {VK_SHIFT, "SHIFT"},
+											  {VK_CONTROL, "CTRL"},
+											  {VK_CAPITAL, "CAPITAL"},
+											  {VK_ESCAPE, "ESCAPE"},
+											  {VK_SPACE, "SPACE"},
+											  {VK_PRIOR, "PageUP"},
+											  {VK_NEXT, "PageDOWN"},
+											  {VK_END, "END"},
+											  {VK_HOME, "HOME"},
+											  {VK_LEFT, "LEFT"},
+											  {VK_UP, "UP"},
+											  {VK_RIGHT, "RIGHT"},
+											  {VK_DOWN, "DOWN"},
+											  {VK_INSERT, "INS"},
+											  {VK_DELETE, "DEL"},
+											  {VK_OEM_PERIOD, "."},
+											  {VK_OEM_COMMA, ","},
+											  {VK_OEM_MINUS, "-"},
+											  {VK_OEM_PLUS, "+"},
+											  {VK_MENU, "MENU"}};
 
 /**
  * A list containing the Mouse Buttons.