refactor: phase 0 & 1

include/account.hpp

@@ -24,9 +24,7 @@
  *         reasonable ways as different from the original version.
  */
 
-#ifndef ACCOUNT_HPP
-#define ACCOUNT_HPP
-
+#pragma once
 #include <map>
 #include <string.h>
 #include <string>
@@ -73,4 +71,3 @@ namespace Account {
     std::string iconPath(AccountUid id);
 }
 
-#endif

include/common.hpp

@@ -24,9 +24,7 @@
  *         reasonable ways as different from the original version.
  */
 
-#ifndef COMMON_HPP
-#define COMMON_HPP
-
+#pragma once
 #include <algorithm>
 #include <arpa/inet.h>
 #include <codecvt>
@@ -62,4 +60,3 @@ namespace StringUtils {
 
 char* getConsoleIP(void);
 
-#endif

include/const.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Theme.hpp>
+#include <theme.hpp>
 
 #define COLOR(hex) pu::ui::Color::FromHex(hex)
 #define BACKGROUND_COLOR theme::color::BgBase

include/directory.hpp

@@ -24,9 +24,7 @@
  *         reasonable ways as different from the original version.
  */
 
-#ifndef DIRECTORY_HPP
-#define DIRECTORY_HPP
-
+#pragma once
 #include <dirent.h>
 #include <errno.h>
 #include <string>
@@ -55,4 +53,3 @@ private:
     bool mGood;
 };
 
-#endif

include/filesystem.hpp

@@ -24,9 +24,7 @@
  *         reasonable ways as different from the original version.
  */
 
-#ifndef FILESYSTEM_HPP
-#define FILESYSTEM_HPP
-
+#pragma once
 #include "account.hpp"
 #include <switch.h>
 
@@ -36,4 +34,3 @@ namespace FileSystem {
     void unmount(void);
 }
 
-#endif

include/io.hpp

@@ -24,9 +24,7 @@
  *         reasonable ways as different from the original version.
  */
 
-#ifndef IO_HPP
-#define IO_HPP
-
+#pragma once
 #include "account.hpp"
 #include "directory.hpp"
 #include "title.hpp"
@@ -52,4 +50,3 @@ namespace io {
     bool fileExists(const std::string& path);
 }
 
-#endif

include/logger.hpp

@@ -1,85 +1,55 @@
-/*
- *   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.
- */
+#pragma once
 
-#ifndef LOGGER_HPP
-#define LOGGER_HPP
-
-#include "common.hpp"
-
-#include <stdio.h>
+#include <cstring>
 #include <string>
 
-class Logger {
-public:
-    static Logger& getInstance(void)
+// New API — use these going forward.
+namespace nxst::log {
+
+enum class Level { Debug, Info, Warn, Error };
+
+void write(Level level, const char* fmt, ...) __attribute__((format(printf, 2, 3)));
+void debug(const char* fmt, ...)             __attribute__((format(printf, 1, 2)));
+void info (const char* fmt, ...)             __attribute__((format(printf, 1, 2)));
+void warn (const char* fmt, ...)             __attribute__((format(printf, 1, 2)));
+void error(const char* fmt, ...)             __attribute__((format(printf, 1, 2)));
+
+// No-op: writes are immediate. Kept for source compatibility during migration.
+inline void flush() {}
+
+} // namespace nxst::log
+
+// Backward-compat shim — existing Logger::getInstance().log(...) call sites compile
+// unchanged. Format args are dropped (same behavior as broken original). Migrate
+// call sites to nxst::log::* in Phase 3.
+struct Logger {
+    static Logger& getInstance()
     {
-        static Logger mLogger;
-        return mLogger;
+        static Logger instance;
+        return instance;
     }
 
-    inline static const std::string INFO  = "[INFO]";
-    inline static const std::string DEBUG = "[DEBUG]";
-    inline static const std::string ERROR = "[ERROR]";
-    inline static const std::string WARN  = "[WARN]";
+    // clang-tidy naming suppressed: these must match existing call sites during migration.
+    static constexpr const char* INFO  = "[INFO]";   // NOLINT(readability-identifier-naming)
+    static constexpr const char* DEBUG = "[DEBUG]";  // NOLINT(readability-identifier-naming)
+    static constexpr const char* ERROR = "[ERROR]";  // NOLINT(readability-identifier-naming)
+    static constexpr const char* WARN  = "[WARN]";   // NOLINT(readability-identifier-naming)
 
+    static void flush() { nxst::log::flush(); }
+
+    // Args intentionally dropped — format string still logged for visibility.
     template <typename... Args>
-    void log(const std::string& level, const std::string& format = {}, Args... args)
+    void log(const std::string& level, const std::string& fmt, Args&&... /*args*/)
     {
-        // buffer += StringUtils::format(("[" + DateTime::logDateTime() + "] " + level + " " + format + "\n").c_str(), args...);
-        // buffer += StringUtils::format("%s\n", format.c_str());
-        // buffer += StringUtils::format("%s\n",StringUtils::format("[" + DateTime::logDateTime() + "] " + level + " " + format + "\n").c_str(), args...);
-        printf(StringUtils::format("[" + DateTime::logDateTime() + "] " + level + " " + format + "\n").c_str(), args...);
+        if (level == ERROR)      nxst::log::error("%s", fmt.c_str());
+        else if (level == WARN)  nxst::log::warn("%s", fmt.c_str());
+        else if (level == DEBUG) nxst::log::debug("%s", fmt.c_str());
+        else                     nxst::log::info("%s", fmt.c_str());
     }
 
-    void flush(void)
-    {
-        mFile = fopen(mPath.c_str(), "a");
-        if (mFile != NULL) {
-            fprintf(mFile, buffer.c_str());
-            fprintf(stderr, buffer.c_str());
-            fclose(mFile);
-        }
-    }
+    Logger()  = default;
+    ~Logger() = default;
 
-private:
-    Logger(void) { buffer = ""; }
-    ~Logger(void) {}
-
-    Logger(Logger const&) = delete;
-    void operator=(Logger const&) = delete;
-
-#if defined(__SWITCH__)
-    const std::string mPath = "/switch/NXST/log.log";
-#else
-    const std::string mPath = "log.log";
-#endif
-
-    FILE* mFile;
-
-    std::string buffer;
+    Logger(const Logger&)            = delete;  // NOLINT(modernize-use-equals-delete)
+    Logger& operator=(const Logger&) = delete;  // NOLINT(modernize-use-equals-delete)
 };
-
-#endif

include/main.hpp

@@ -1,5 +1,4 @@
-#ifndef MAIN_HPP
-#define MAIN_HPP
+#pragma once
 #include <const.h>
 #include "account.hpp"
 #include "title.hpp"
@@ -23,4 +22,3 @@ inline std::string g_currentFile = "";
 inline bool g_isTransferringFile = false;
 inline const std::string g_emptySave = "New...";
 
-#endif

include/main_application.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <pu/Plutonium>
-#include <UsersLayout.hpp>
-#include <TitlesLayout.hpp>
+#include <users_layout.hpp>
+#include <titles_layout.hpp>
 
 namespace ui {
 

include/title.hpp

@@ -24,9 +24,7 @@
  *         reasonable ways as different from the original version.
  */
 
-#ifndef TITLE_HPP
-#define TITLE_HPP
-
+#pragma once
 #include "account.hpp"
 #include "filesystem.hpp"
 #include "io.hpp"
@@ -88,4 +86,3 @@ void rotateSortMode(void);
 void refreshDirectories(u64 id);
 std::unordered_map<std::string, std::string> getCompleteTitleList(void);
 
-#endif

include/titles_layout.hpp

@@ -5,8 +5,8 @@
 #include <unordered_map>
 #include <vector>
 #include <memory>
-#include <ui/HeaderBar.hpp>
-#include <ui/HintBar.hpp>
+#include <ui/header_bar.hpp>
+#include <ui/hint_bar.hpp>
 
 namespace ui {
 

include/transfer_overlay.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include <pu/Plutonium>
-#include <Theme.hpp>
+#include <theme.hpp>
 #include <util.hpp>
 
 namespace ui {

include/ui/card.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include <pu/Plutonium>
-#include <Theme.hpp>
+#include <theme.hpp>
 
 namespace ui {
 

include/ui/header_bar.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include <pu/Plutonium>
-#include <Theme.hpp>
-#include <ui/UiContext.hpp>
+#include <theme.hpp>
+#include <ui/ui_context.hpp>
 #include <account.hpp>
 
 namespace ui {

include/ui/hint_bar.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include <pu/Plutonium>
-#include <Theme.hpp>
+#include <theme.hpp>
 #include <vector>
 #include <string>
 

include/users_layout.hpp

@@ -1,7 +1,7 @@
 #include <pu/Plutonium>
 #include <const.h>
-#include <ui/HeaderBar.hpp>
-#include <ui/HintBar.hpp>
+#include <ui/header_bar.hpp>
+#include <ui/hint_bar.hpp>
 #include <memory>
 
 namespace ui {

include/util.hpp

@@ -24,9 +24,7 @@
  *         reasonable ways as different from the original version.
  */
 
-#ifndef UTIL_HPP
-#define UTIL_HPP
-
+#pragma once
 #include "account.hpp"
 #include "common.hpp"
 #include "io.hpp"
@@ -50,4 +48,4 @@ namespace StringUtils {
     std::string elide(const std::string& s, size_t maxChars);
 }
 
-#endif
+