From 1969fac0a47fd75ec9de538c8d9180a3856ac29c Mon Sep 17 00:00:00 2001
From: sgourdas <jim31700@gmail.com>
Date: Tue, 23 Jul 2024 14:03:46 +0300
Subject: [PATCH] code cleanup with auxiliary local variables

---
 src/kiwixapp.cpp  | 17 +++++++++--------
 src/topwidget.cpp | 17 +++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/kiwixapp.cpp b/src/kiwixapp.cpp
index 0374c9a..7e26cd1 100644
--- a/src/kiwixapp.cpp
+++ b/src/kiwixapp.cpp
@@ -504,17 +504,18 @@ void KiwixApp::handleItemsState(TabType tabType)
 {
     auto libraryOrSettingsTab =  (tabType == TabType::LibraryTab || tabType == TabType::SettingsTab);
     auto notBookmarkableTab = libraryOrSettingsTab || getTabWidget()->currentArticleUrl().isEmpty();
-    KiwixApp::instance()->getAction(KiwixApp::ToggleReadingListAction)->setDisabled(libraryOrSettingsTab);
-    KiwixApp::instance()->getAction(KiwixApp::ToggleAddBookmarkAction)->setDisabled(notBookmarkableTab);
-    KiwixApp::instance()->getAction(KiwixApp::FindInPageAction)->setDisabled(libraryOrSettingsTab);
-    KiwixApp::instance()->getAction(KiwixApp::ZoomInAction)->setDisabled(libraryOrSettingsTab);
-    KiwixApp::instance()->getAction(KiwixApp::ZoomOutAction)->setDisabled(libraryOrSettingsTab);
-    KiwixApp::instance()->getAction(KiwixApp::ZoomResetAction)->setDisabled(libraryOrSettingsTab);
-    KiwixApp::instance()->getAction(KiwixApp::RandomArticleAction)->setDisabled(libraryOrSettingsTab);
+    auto app = KiwixApp::instance();
+    app->getAction(KiwixApp::ToggleReadingListAction)->setDisabled(libraryOrSettingsTab);
+    app->getAction(KiwixApp::ToggleAddBookmarkAction)->setDisabled(notBookmarkableTab);
+    app->getAction(KiwixApp::FindInPageAction)->setDisabled(libraryOrSettingsTab);
+    app->getAction(KiwixApp::ZoomInAction)->setDisabled(libraryOrSettingsTab);
+    app->getAction(KiwixApp::ZoomOutAction)->setDisabled(libraryOrSettingsTab);
+    app->getAction(KiwixApp::ZoomResetAction)->setDisabled(libraryOrSettingsTab);
+    app->getAction(KiwixApp::RandomArticleAction)->setDisabled(libraryOrSettingsTab);
 
     /* Non-Zim tabs are not bookmarkable therefore never in reading list. */
     if (notBookmarkableTab)
-        KiwixApp::instance()->getAction(KiwixApp::ToggleAddBookmarkAction)->setChecked(false);
+        app->getAction(KiwixApp::ToggleAddBookmarkAction)->setChecked(false);
 }
 
 void KiwixApp::updateNameMapper()
diff --git a/src/topwidget.cpp b/src/topwidget.cpp
index f8d591f..3190e63 100644
--- a/src/topwidget.cpp
+++ b/src/topwidget.cpp
@@ -16,14 +16,14 @@ TopWidget::TopWidget(QWidget *parent) :
     auto app = KiwixApp::instance();
 
     QAction *back = app->getAction(KiwixApp::HistoryBackAction);
-    connect(back, &QAction::triggered, [](){
-        KiwixApp::instance()->getTabWidget()->triggerWebPageAction(QWebEnginePage::Back);
+    connect(back, &QAction::triggered, [app](){
+        app->getTabWidget()->triggerWebPageAction(QWebEnginePage::Back);
     });
     addAction(back);
 
     QAction *forward = app->getAction(KiwixApp::HistoryForwardAction);
-    connect(forward, &QAction::triggered, [](){
-        KiwixApp::instance()->getTabWidget()->triggerWebPageAction(QWebEnginePage::Forward);
+    connect(forward, &QAction::triggered, [app](){
+        app->getTabWidget()->triggerWebPageAction(QWebEnginePage::Forward);
     });
     addAction(forward);
 
@@ -42,11 +42,12 @@ TopWidget::TopWidget(QWidget *parent) :
     addSeparator();
 
     addWidget(&m_searchEntry);
-    addAction(KiwixApp::instance()->getAction(KiwixApp::ToggleReadingListAction));
+
+    addAction(app->getAction(KiwixApp::ToggleReadingListAction));
 
     addSeparator();
 
-    addAction(KiwixApp::instance()->getAction(KiwixApp::OpenFileAction));
+    addAction(app->getAction(KiwixApp::OpenFileAction));
 
     QMenu* menu = new MainMenu();
     QToolButton *toolButton = new QToolButton(menu);
@@ -61,8 +62,8 @@ TopWidget::TopWidget(QWidget *parent) :
 #if !SYSTEMTITLEBAR
     addAction(QIcon(":/icons/minimize.svg"), "minimize", parent, SLOT(showMinimized()));
 #endif
-    addAction(KiwixApp::instance()->getAction(KiwixApp::ToggleFullscreenAction));
-    widgetForAction(KiwixApp::instance()->getAction(KiwixApp::ToggleFullscreenAction))->setObjectName("fullScreenButton");
+    addAction(app->getAction(KiwixApp::ToggleFullscreenAction));
+    widgetForAction(app->getAction(KiwixApp::ToggleFullscreenAction))->setObjectName("fullScreenButton");
 #if !SYSTEMTITLEBAR
     addAction(QIcon(":/icons/close.svg"), "close", parent, SLOT(close()));
 #endif