Code cleanup and minor fixes

SneWs · Jul 14, 2024 · 0e394d1 · 0e394d1
1 parent ac2d2ba
commit 0e394d1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 29 deletions.
diff --git a/MainWindow.cpp b/MainWindow.cpp
@@ -38,6 +38,7 @@ this, &MainWindow::settingsClosed);
 
 MainWindow::~MainWindow()
 {
+    delete accountsTabUi;
     delete pCurrentExecution;
     delete pTailStatus;
     delete pTrayManager;
@@ -74,7 +75,7 @@ void MainWindow::settingsClosed() {
     hide();
 }
 
-void MainWindow::loginFlowCompleted() {
+void MainWindow::loginFlowCompleted() const {
     pCurrentExecution->start();
 }
 
@@ -119,7 +120,7 @@ void MainWindow::onTailStatusChanged(TailStatus* pNewStatus)
     accountsTabUi->onTailStatusChanged(pTailStatus);
 }
 
-void MainWindow::syncSettingsToUi() {
+void MainWindow::syncSettingsToUi() const {
     ui->chkAllowIncomingCnx->setChecked(settings.allowIncomingConnections());
     ui->chkUseTailscaleDns->setChecked(settings.useTailscaleDns());
     ui->chkUseTailscaleSubnets->setChecked(settings.useSubnets());

diff --git a/MainWindow.h b/MainWindow.h
@@ -28,7 +28,7 @@ class MainWindow : public QMainWindow
     void showAccountsTab();
     void showAboutTab();
 
-    void syncSettingsToUi();
+    void syncSettingsToUi() const;
     void syncSettingsFromUi();
 
     void userLoggedOut() { changeToState(TailState::NotLoggedIn); }
@@ -47,7 +47,7 @@ class MainWindow : public QMainWindow
 private slots:
     void onAccountsListed(const QList<TailAccountInfo>& foundAccounts);
     void settingsClosed();
-    void loginFlowCompleted();
+    void loginFlowCompleted() const;
 
 private:
     // Switch to the new state and return the prev (old) state back to caller

diff --git a/TrayMenuManager.cpp b/TrayMenuManager.cpp
@@ -93,7 +93,7 @@ void TrayMenuManager::onAccountsListed(const QList<TailAccountInfo>& foundAccoun
     accounts = foundAccounts;
 }
 
-void TrayMenuManager::stateChangedTo(TailState newState, TailStatus const* pTailStatus)
+void TrayMenuManager::stateChangedTo(TailState newState, TailStatus const* pTailStatus) const
 {
     switch (newState) {
         case TailState::Connected:
@@ -113,16 +113,12 @@ void TrayMenuManager::stateChangedTo(TailState newState, TailStatus const* pTail
             pStatusCheckTimer->stop();
             break;
         }
-        case TailState::ConnectedWithExitNode:
-            buildConnectedExitNodeMenu(pTailStatus);
-            break;
         default:
             assert(!"Unhandled TailState status!");
     }
 }
 
-void TrayMenuManager::buildNotLoggedInMenu()
-{
+void TrayMenuManager::buildNotLoggedInMenu() const {
     pTrayMenu->clear();
     pTrayMenu->addAction(pLoginAction);
     pTrayMenu->addSeparator();
@@ -134,7 +130,7 @@ void TrayMenuManager::buildNotLoggedInMenu()
     pSysTray->setIcon(QIcon(":/icons/tray-off.png"));
 }
 
-void TrayMenuManager::buildNotConnectedMenu(TailStatus const* pTailStatus)
+void TrayMenuManager::buildNotConnectedMenu(TailStatus const* pTailStatus) const
 {
     pTrayMenu->clear();
     pTrayMenu->addAction(pConnect);
@@ -152,7 +148,7 @@ void TrayMenuManager::buildNotConnectedMenu(TailStatus const* pTailStatus)
     buildAccountsMenu();
 }
 
-void TrayMenuManager::buildConnectedMenu(TailStatus const* pTailStatus)
+void TrayMenuManager::buildConnectedMenu(TailStatus const* pTailStatus) const
 {
     pTrayMenu->clear();
     pTrayMenu->addAction(pConnected);
@@ -236,12 +232,7 @@ void TrayMenuManager::buildConnectedMenu(TailStatus const* pTailStatus)
     buildAccountsMenu();
 }
 
-void TrayMenuManager::buildConnectedExitNodeMenu(TailStatus const* pTailStatus)
-{
-
-}
-
-void TrayMenuManager::buildAccountsMenu() {
+void TrayMenuManager::buildAccountsMenu() const {
     if (pThisDevice->menu() == nullptr) {
         pThisDevice->setMenu(new QMenu());
     }
@@ -256,7 +247,7 @@ void TrayMenuManager::buildAccountsMenu() {
     }
 }
 
-void TrayMenuManager::setupWellKnownActions() {
+void TrayMenuManager::setupWellKnownActions() const {
     connect(pLoginAction, &QAction::triggered, this, [this](bool) {
         pTailRunner->login();
     });

diff --git a/TrayMenuManager.h b/TrayMenuManager.h
@@ -21,7 +21,7 @@ class TrayMenuManager : public QObject
     virtual ~TrayMenuManager();
 
     void onAccountsListed(const QList<TailAccountInfo>& foundAccounts);
-    void stateChangedTo(TailState newState, TailStatus const* pTailStatus);
+    void stateChangedTo(TailState newState, TailStatus const* pTailStatus) const;
 
     QSystemTrayIcon* trayIcon() const { return pSysTray; }
 
@@ -44,14 +44,12 @@ class TrayMenuManager : public QObject
     QAction* pExitNodeNone;
 
 private:
-    void buildNotLoggedInMenu();
-    void buildNotConnectedMenu(TailStatus const* pTailStatus);
-    void buildConnectedMenu(TailStatus const* pTailStatus);
-    void buildConnectedExitNodeMenu(TailStatus const* pTailStatus);
+    void buildNotLoggedInMenu() const;
+    void buildNotConnectedMenu(TailStatus const* pTailStatus) const;
+    void buildConnectedMenu(TailStatus const* pTailStatus) const;
+    void buildAccountsMenu() const;
 
-    void buildAccountsMenu();
-
-    void setupWellKnownActions();
+    void setupWellKnownActions() const;
 };
 
 

diff --git a/models.h b/models.h
@@ -17,8 +17,7 @@ enum class TailState {
     NotLoggedIn,
     LoggedIn,
     NotConnected,
-    Connected,
-    ConnectedWithExitNode
+    Connected
 };
 
 class TailAccountInfo : public QObject