simplify directory structure

pit-ray · Feb 16, 2024 · cd9b27c · cd9b27c
1 parent 9ee5917
commit cd9b27c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/core/version.hpp b/src/core/version.hpp
@@ -1,6 +1,6 @@
 #ifndef _VERSION_HPP
 #define _VERSION_HPP
 
-#define WIN_VIND_VERSION "5.11.0.0"
+#define WIN_VIND_VERSION "5.11.2.0"
 
 #endif
diff --git a/src/gui/main.cpp → src/main.cpp b/src/gui/main.cpp → src/main.cpp
@@ -39,11 +39,10 @@ SOFTWARE.
 
 #include "util/debug.hpp"
 #include "util/def.hpp"
+#include "util/startup.hpp"
 #include "util/string.hpp"
 #include "util/winwrap.hpp"
 
-#include "startup.hpp"
-
 #include <atomic>
 #include <exception>
 #include <future>
@@ -180,7 +179,7 @@ int WINAPI WinMain(
         }
 
         if(entry.is_subprocess()) {
-            return 1 ;
+            return 0 ;
         }
 
         entry.init() ;
@@ -200,11 +199,11 @@ int WINAPI WinMain(
 
         // --------------------------
         auto check_startup = [] {
-            gui::register_to_startup() ;
+            util::register_to_startup() ;
             return true ;
         } ;
         auto uncheck_startup = [] {
-            gui::remove_from_startup() ;
+            util::remove_from_startup() ;
             return true ;
         } ;
         if(!tray.add_menu(
@@ -215,7 +214,7 @@ int WINAPI WinMain(
             PRINT_ERROR("Could not add a menu.") ;
             return 1 ;
         }
-        if(gui::check_if_registered()) {
+        if(util::check_if_registered()) {
             tray.back().check() ;
         }
         else {

diff --git a/src/gui/startup.cpp → src/util/startup.cpp b/src/gui/startup.cpp → src/util/startup.cpp
@@ -108,7 +108,7 @@ namespace
 
 namespace vind
 {
-    namespace gui
+    namespace util
     {
         void register_to_startup() {
             auto psl = create_shell_link() ;

diff --git a/src/gui/startup.hpp → src/util/startup.hpp b/src/gui/startup.hpp → src/util/startup.hpp
@@ -3,7 +3,7 @@
 
 namespace vind
 {
-    namespace gui
+    namespace util
     {
         void register_to_startup() ;
         void remove_from_startup() ;