From e72ec3e01dd7a199e629b21b5c0a99480eab7572 Mon Sep 17 00:00:00 2001
From: Sander Speetjens <sander.speetjens@gmail.com>
Date: Fri, 6 Sep 2024 12:00:53 +0200
Subject: [PATCH] mainwindow

rename member vars
---
 Qt/mainwindow.cpp | 28 ++++++++++++++--------------
 Qt/mainwindow.h   | 12 ++++++------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Qt/mainwindow.cpp b/Qt/mainwindow.cpp
index 3386567..ca4647c 100644
--- a/Qt/mainwindow.cpp
+++ b/Qt/mainwindow.cpp
@@ -10,8 +10,8 @@ MainWindow::MainWindow(QWidget *parent) :
       QMainWindow(parent),
       ui(new Ui::MainWindow),
       m_web_socket(new Web_socket_wrapper(QUrl("ws://localhost:9002"), this)),
-      error_dialog(new NetworkError(this)),
-      sims{{"Can_Debugger", new Can_Debugger(m_web_socket, this)},
+      m_error_dialog(new NetworkError(this)),
+      m_sims{{"Can_Debugger", new Can_Debugger(m_web_socket, this)},
            {"Scope_Mux_Tester", new Scope_Mux_Tester(m_web_socket, this)},
            {"CVS_I10", new CVS_I10(m_web_socket, this)},
            {"Test_Sim", new Test_Sim(m_web_socket, this)}}
@@ -30,7 +30,7 @@ MainWindow::~MainWindow()
 {
     delete ui;
     delete m_web_socket;
-    delete error_dialog;
+    delete m_error_dialog;
 }
 
 void MainWindow::setup_cb(void)
@@ -53,8 +53,8 @@ void MainWindow::hideEvent(QHideEvent* event)
 
 void MainWindow::defaultSim(QString name)
 {
-    this->selected_sim_name = name;
-    this->default_sim = true;
+    this->m_selected_sim_name = name;
+    this->m_default_sim = true;
 }
 
 void MainWindow::pase_sim_names(json& sims)
@@ -66,10 +66,10 @@ void MainWindow::pase_sim_names(json& sims)
 
     QThread::msleep(30);
 
-    if (this->default_sim)
+    if (this->m_default_sim)
     {
-        ui->comboBox->setCurrentText(this->selected_sim_name);
-        open_sim(this->selected_sim_name);
+        ui->comboBox->setCurrentText(this->m_selected_sim_name);
+        open_sim(this->m_selected_sim_name);
     }
 }
 
@@ -77,8 +77,8 @@ void MainWindow::open_sim(QString sim_name)
 {
     try
     {
-        selected_sim = sims.at(sim_name);
-        this->selected_sim_name = sim_name;
+        m_selected_sim = m_sims.at(sim_name);
+        this->m_selected_sim_name = sim_name;
     }
     catch (const std::out_of_range& ex)
     {
@@ -92,7 +92,7 @@ void MainWindow::open_sim(QString sim_name)
 void MainWindow::open_sim_window(void)
 {
     this->hide();
-    selected_sim->show();
+    m_selected_sim->show();
 }
 
 void MainWindow::check_active_sim(QString name)
@@ -100,13 +100,13 @@ void MainWindow::check_active_sim(QString name)
         if (name == "")
         {
             QD << "Name not set";
-            m_web_socket->send_command(Web_socket_wrapper::Command::switch_simulator, selected_sim_name);
+            m_web_socket->send_command(Web_socket_wrapper::Command::switch_simulator, m_selected_sim_name);
             return;
         }
 
          QD << "Current sim:" << name;
 
-        if (name == selected_sim_name)
+        if (name == m_selected_sim_name)
         {
             QD << "Name set and right";
             open_sim_window();
@@ -114,7 +114,7 @@ void MainWindow::check_active_sim(QString name)
         }
 
         QD << "Name set and wrong";
-        m_web_socket->send_command(Web_socket_wrapper::Command::switch_simulator, selected_sim_name);
+        m_web_socket->send_command(Web_socket_wrapper::Command::switch_simulator, m_selected_sim_name);
 }
 
 void MainWindow::on_cmd_cb(json& j)
diff --git a/Qt/mainwindow.h b/Qt/mainwindow.h
index f8787d3..a08761c 100644
--- a/Qt/mainwindow.h
+++ b/Qt/mainwindow.h
@@ -35,14 +35,14 @@ class MainWindow : public QMainWindow
 
     void on_cmd_cb(json& j);
 
-    bool default_sim = false;
-    QString selected_sim_name;
-    QMainWindow* selected_sim;
-    Ui::MainWindow *ui;
+    bool m_default_sim = false;
+    QString m_selected_sim_name;
+    QMainWindow* m_selected_sim;
+    Ui::MainWindow* ui;
     Web_socket_wrapper *m_web_socket;
-    NetworkError* error_dialog;
+    NetworkError* m_error_dialog;
 
-    std::map<QString, SimulatorBase*> sims;
+    std::map<QString, SimulatorBase*> m_sims;
 };
 
 #endif // MAINWINDOW_H