another stage of refactoring

include/nxst/domain/account.hpp

@@ -1,59 +1,25 @@
-/*
- *   This file is part of Checkpoint
- *   Copyright (C) 2017-2021 Bernardo Giordano, FlagBrew
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
- *       * Requiring preservation of specified reasonable legal notices or
- *         author attributions in that material or in the Appropriate Legal
- *         Notices displayed by works containing it.
- *       * Prohibiting misrepresentation of the origin of that material,
- *         or requiring that modified versions of such material be marked in
- *         reasonable ways as different from the original version.
- */
-
+// Copyright (C) 2024-2026 NXST contributors
 #pragma once
-#include <map>
-#include <string.h>
 #include <string>
 #include <vector>
 
 #include <switch.h>
 
-#define USER_ICON_SIZE 64
-
+// Hash and comparison support for AccountUid as map/unordered_map key.
 namespace std {
-template <> struct hash<AccountUid> {
-    size_t operator()(const AccountUid& a) const {
-        return ((hash<u64>()(a.uid[0]) ^ (hash<u64>()(a.uid[1]) << 1)) >> 1);
-    }
-};
+    template <> struct hash<AccountUid> {
+        size_t operator()(const AccountUid& a) const noexcept {
+            return (hash<u64>()(a.uid[0]) ^ (hash<u64>()(a.uid[1]) << 1)) >> 1;
+        }
+    };
 }  // namespace std
 
 inline bool operator==(const AccountUid& x, const AccountUid& y) {
     return x.uid[0] == y.uid[0] && x.uid[1] == y.uid[1];
 }
 
-inline bool operator==(const AccountUid& x, u64 y) {
-    return x.uid[0] == y && x.uid[1] == y;
-}
-
 inline bool operator<(const AccountUid& x, const AccountUid& y) {
-    if (x.uid[0] != y.uid[0])
-        return x.uid[0] < y.uid[0];
-    return x.uid[1] < y.uid[1];
+    return x.uid[0] != y.uid[0] ? x.uid[0] < y.uid[0] : x.uid[1] < y.uid[1];
 }
 
 struct User {
@@ -61,12 +27,10 @@ struct User {
     std::string name;
 };
 
-namespace Account {
-Result init(void);
-void exit(void);
-
-std::vector<AccountUid> ids(void);
-AccountUid selectAccount(void);
-std::string username(AccountUid id);
-std::string iconPath(AccountUid id);
-}  // namespace Account
+namespace account {
+    Result init();
+    void exit();
+    std::vector<AccountUid> ids();
+    std::string username(AccountUid id);
+    std::string iconPath(AccountUid id);
+}  // namespace account