From c77bfbbc7b55f9d1ba500ba1f76c589673fb5d34 Mon Sep 17 00:00:00 2001
From: yggverse <yggverse@project>
Date: Thu, 5 Sep 2024 02:50:41 +0300
Subject: [PATCH] update methods namespace

---
 src/app/browser.cpp                           |  8 ++---
 src/app/browser/main.cpp                      | 32 ++++++++++++++-----
 src/app/browser/main.hpp                      |  6 ++--
 src/app/browser/main/tab.cpp                  | 12 +++----
 src/app/browser/main/tab.hpp                  |  4 +--
 src/app/browser/main/tab/page.cpp             |  8 ++---
 src/app/browser/main/tab/page.hpp             |  4 +--
 src/app/browser/main/tab/page/navigation.cpp  | 12 +++++--
 src/app/browser/main/tab/page/navigation.hpp  |  5 ++-
 .../main/tab/page/navigation/history/back.cpp |  2 +-
 .../tab/page/navigation/history/forward.cpp   |  2 +-
 11 files changed, 60 insertions(+), 35 deletions(-)

diff --git a/src/app/browser.cpp b/src/app/browser.cpp
index d2c33dce..b670a6ae 100644
--- a/src/app/browser.cpp
+++ b/src/app/browser.cpp
@@ -85,18 +85,18 @@ Browser::Browser(
 
         // History
         add_action(
-            "main_tab_page_navigation_history_back",
+            "main_tab_page_navigation_history_try_back",
             [this]
             {
-                browserMain->tab_page_navigation_history_back();
+                browserMain->tab_page_navigation_history_try_back();
             }
         );
 
         add_action(
-            "main_tab_page_navigation_history_forward",
+            "main_tab_page_navigation_history_try_forward",
             [this]
             {
-                browserMain->tab_page_navigation_history_forward();
+                browserMain->tab_page_navigation_history_try_forward();
             }
         );
 
diff --git a/src/app/browser/main.cpp b/src/app/browser/main.cpp
index 6d41be66..8a3e69d5 100644
--- a/src/app/browser/main.cpp
+++ b/src/app/browser/main.cpp
@@ -74,18 +74,34 @@ void Main::tab_close_all()
     mainTab->close_all();
 };
 
-void Main::tab_page_navigation_history_back()
+bool Main::tab_page_navigation_history_try_back()
 {
-    mainTab->page_navigation_history_back(
-        mainTab->get_current_page()
-    );
+    const int & PAGE_NUMBER = mainTab->get_current_page();
+
+    if (PAGE_NUMBER >= 0)
+    {
+        return mainTab->page_navigation_history_try_back(
+            PAGE_NUMBER
+        );
+    }
+
+    return false;
 };
 
-void Main::tab_page_navigation_history_forward()
+bool Main::tab_page_navigation_history_try_forward()
 {
-    mainTab->page_navigation_history_forward(
-        mainTab->get_current_page()
-    );
+    const int & PAGE_NUMBER = mainTab->get_current_page();
+
+    if (PAGE_NUMBER >= 0)
+    {
+        return mainTab->page_navigation_history_try_forward(
+            PAGE_NUMBER
+        );
+
+        return true;
+    }
+
+    return false;
 };
 
 void Main::refresh()
diff --git a/src/app/browser/main.hpp b/src/app/browser/main.hpp
index a41b80ff..5553f2f3 100644
--- a/src/app/browser/main.hpp
+++ b/src/app/browser/main.hpp
@@ -35,10 +35,12 @@ namespace app::browser
             void tab_close_left();
             void tab_close_right();
             void tab_close();
-            void tab_page_navigation_history_back();
-            void tab_page_navigation_history_forward();
+
             void tab_update();
 
+            bool tab_page_navigation_history_try_back();
+            bool tab_page_navigation_history_try_forward();
+
             void refresh();
     };
 }
diff --git a/src/app/browser/main/tab.cpp b/src/app/browser/main/tab.cpp
index cce5f4b9..63975488 100644
--- a/src/app/browser/main/tab.cpp
+++ b/src/app/browser/main/tab.cpp
@@ -96,20 +96,20 @@ void Tab::close_all()
     }
 }
 
-void Tab::page_navigation_history_back(
+bool Tab::page_navigation_history_try_back(
     const int & PAGE_NUMBER
 ) {
-    get_tabPage(
+    return get_tabPage(
         PAGE_NUMBER
-    )->navigation_history_back();
+    )->navigation_history_try_back();
 }
 
-void Tab::page_navigation_history_forward(
+bool Tab::page_navigation_history_try_forward(
     const int & PAGE_NUMBER
 ) {
-    get_tabPage(
+    return get_tabPage(
         PAGE_NUMBER
-    )->navigation_history_forward();
+    )->navigation_history_try_forward();
 }
 
 void Tab::refresh(
diff --git a/src/app/browser/main/tab.hpp b/src/app/browser/main/tab.hpp
index 86ccddb2..b0569fa5 100644
--- a/src/app/browser/main/tab.hpp
+++ b/src/app/browser/main/tab.hpp
@@ -54,11 +54,11 @@ namespace app::browser::main
             void close_right();
             void close_all();
 
-            void page_navigation_history_back(
+            bool page_navigation_history_try_back(
                 const int & PAGE_NUMBER
             );
 
-            void page_navigation_history_forward(
+            bool page_navigation_history_try_forward(
                 const int & PAGE_NUMBER
             );
 
diff --git a/src/app/browser/main/tab/page.cpp b/src/app/browser/main/tab/page.cpp
index bc076c5e..812af0f6 100644
--- a/src/app/browser/main/tab/page.cpp
+++ b/src/app/browser/main/tab/page.cpp
@@ -73,14 +73,14 @@ Glib::ustring Page::get_subtitle()
 }
 
 // Actions
-void Page::navigation_history_back()
+bool Page::navigation_history_try_back()
 {
-    pageNavigation->history_back();
+    return pageNavigation->history_try_back();
 }
 
-void Page::navigation_history_forward()
+bool Page::navigation_history_try_forward()
 {
-    pageNavigation->history_forward();
+    return pageNavigation->history_try_forward();
 }
 
 void Page::refresh(
diff --git a/src/app/browser/main/tab/page.hpp b/src/app/browser/main/tab/page.hpp
index 53684e1a..bd5dea7a 100644
--- a/src/app/browser/main/tab/page.hpp
+++ b/src/app/browser/main/tab/page.hpp
@@ -54,8 +54,8 @@ namespace app::browser::main::tab
             Glib::ustring get_subtitle();
 
             // Actions
-            void navigation_history_back();
-            void navigation_history_forward();
+            bool navigation_history_try_back();
+            bool navigation_history_try_forward();
 
             void refresh(
                 const Glib::ustring & TITLE,
diff --git a/src/app/browser/main/tab/page/navigation.cpp b/src/app/browser/main/tab/page/navigation.cpp
index 5f233236..53a478ca 100644
--- a/src/app/browser/main/tab/page/navigation.cpp
+++ b/src/app/browser/main/tab/page/navigation.cpp
@@ -87,7 +87,7 @@ Navigation::Navigation(
 }
 
 // Actions
-void Navigation::history_back()
+bool Navigation::history_try_back()
 {
     navigation::History::Memory match;
 
@@ -98,10 +98,14 @@ void Navigation::history_back()
         );
 
         navigationUpdate->activate();
+
+        return true;
     }
+
+    return false;
 }
 
-void Navigation::history_forward()
+bool Navigation::history_try_forward()
 {
     navigation::History::Memory match;
 
@@ -112,7 +116,11 @@ void Navigation::history_forward()
         );
 
         navigationUpdate->activate();
+
+        return true;
     }
+
+    return false;
 }
 
 void Navigation::history_add(
diff --git a/src/app/browser/main/tab/page/navigation.hpp b/src/app/browser/main/tab/page/navigation.hpp
index 7d77df44..14455a79 100644
--- a/src/app/browser/main/tab/page/navigation.hpp
+++ b/src/app/browser/main/tab/page/navigation.hpp
@@ -41,9 +41,8 @@ namespace app::browser::main::tab::page
                 const Glib::ustring & VALUE
             );
 
-            void history_back();
-            void history_forward();
-
+            bool history_try_back();
+            bool history_try_forward();
 
             void refresh();
 
diff --git a/src/app/browser/main/tab/page/navigation/history/back.cpp b/src/app/browser/main/tab/page/navigation/history/back.cpp
index e49d1103..d4b6f49f 100644
--- a/src/app/browser/main/tab/page/navigation/history/back.cpp
+++ b/src/app/browser/main/tab/page/navigation/history/back.cpp
@@ -5,7 +5,7 @@ using namespace app::browser::main::tab::page::navigation::history;
 Back::Back()
 {
     set_action_name(
-        "win.main_tab_page_navigation_history_back"
+        "win.main_tab_page_navigation_history_try_back"
     );
 
     set_icon_name(
diff --git a/src/app/browser/main/tab/page/navigation/history/forward.cpp b/src/app/browser/main/tab/page/navigation/history/forward.cpp
index f261545f..4091032b 100644
--- a/src/app/browser/main/tab/page/navigation/history/forward.cpp
+++ b/src/app/browser/main/tab/page/navigation/history/forward.cpp
@@ -5,7 +5,7 @@ using namespace app::browser::main::tab::page::navigation::history;
 Forward::Forward()
 {
     set_action_name(
-        "win.main_tab_page_navigation_history_forward"
+        "win.main_tab_page_navigation_history_try_forward"
     );
 
     set_icon_name(