Browse Source

move files to qt and frontend common

pull/2535/head
inix 5 months ago
committed by Inix
parent
commit
637e8cb31b
  1. 2
      src/android/app/src/main/jni/native.cpp
  2. 2
      src/common/CMakeLists.txt
  3. 2
      src/frontend_common/CMakeLists.txt
  4. 2
      src/frontend_common/play_time_manager.cpp
  5. 0
      src/frontend_common/play_time_manager.h
  6. 19
      src/qt_common/qt_playtime_manager.cpp
  7. 8
      src/qt_common/qt_playtime_manager.h
  8. 2
      src/yuzu/game_list.h
  9. 2
      src/yuzu/game_list_worker.h
  10. 2
      src/yuzu/main.cpp
  11. 15
      src/yuzu/util/util.cpp
  12. 3
      src/yuzu/util/util.h

2
src/android/app/src/main/jni/native.cpp

@ -36,7 +36,7 @@
#include "common/scope_exit.h" #include "common/scope_exit.h"
#include "common/settings.h" #include "common/settings.h"
#include "common/string_util.h" #include "common/string_util.h"
#include "common/play_time_manager.h"
#include "frontend_common/play_time_manager.h"
#include "core/core.h" #include "core/core.h"
#include "core/cpu_manager.h" #include "core/cpu_manager.h"
#include "core/crypto/key_manager.h" #include "core/crypto/key_manager.h"

2
src/common/CMakeLists.txt

@ -104,8 +104,6 @@ add_library(
parent_of_member.h parent_of_member.h
point.h point.h
precompiled_headers.h precompiled_headers.h
play_time_manager.cpp
play_time_manager.h
quaternion.h quaternion.h
range_map.h range_map.h
range_mutex.h range_mutex.h

2
src/frontend_common/CMakeLists.txt

@ -11,6 +11,8 @@ add_library(frontend_common STATIC
firmware_manager.h firmware_manager.h
firmware_manager.cpp firmware_manager.cpp
data_manager.h data_manager.cpp data_manager.h data_manager.cpp
play_time_manager.cpp
play_time_manager.h
) )
create_target_directory_groups(frontend_common) create_target_directory_groups(frontend_common)

2
src/common/play_time_manager.cpp → src/frontend_common/play_time_manager.cpp

@ -11,7 +11,7 @@
#include "common/settings.h" #include "common/settings.h"
#include "common/thread.h" #include "common/thread.h"
#include "core/hle/service/acc/profile_manager.h" #include "core/hle/service/acc/profile_manager.h"
#include "common/play_time_manager.h"
#include "play_time_manager.h"
namespace PlayTime { namespace PlayTime {

0
src/common/play_time_manager.h → src/frontend_common/play_time_manager.h

19
src/qt_common/qt_playtime_manager.cpp

@ -0,0 +1,19 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
#include "qt_playtime_manager.h"
QString ReadablePlayTime(qulonglong time_seconds) {
if (time_seconds == 0) {
return {};
}
const auto time_minutes = std::max(static_cast<double>(time_seconds) / 60, 1.0);
const auto time_hours = static_cast<double>(time_seconds) / 3600;
const bool is_minutes = time_minutes < 60;
const char* unit = is_minutes ? "m" : "h";
const auto value = is_minutes ? time_minutes : time_hours;
return QStringLiteral("%L1 %2")
.arg(value, 0, 'f', !is_minutes && time_seconds % 60 != 0)
.arg(QString::fromUtf8(unit));
}

8
src/qt_common/qt_playtime_manager.h

@ -0,0 +1,8 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
#include <QString>
// Converts a length of time in seconds into a readable format
QString ReadablePlayTime(qulonglong time_seconds);

2
src/yuzu/game_list.h

@ -23,7 +23,7 @@
#include "qt_common/config/uisettings.h" #include "qt_common/config/uisettings.h"
#include "qt_common/util/game.h" #include "qt_common/util/game.h"
#include "yuzu/compatibility_list.h" #include "yuzu/compatibility_list.h"
#include "common/play_time_manager.h"
#include "frontend_common/play_time_manager.h"
namespace Core { namespace Core {
class System; class System;

2
src/yuzu/game_list_worker.h

@ -20,7 +20,7 @@
#include "core/file_sys/registered_cache.h" #include "core/file_sys/registered_cache.h"
#include "qt_common/config/uisettings.h" #include "qt_common/config/uisettings.h"
#include "yuzu/compatibility_list.h" #include "yuzu/compatibility_list.h"
#include "common/play_time_manager.h""
#include "frontend_common/play_time_manager.h"
namespace Core { namespace Core {
class System; class System;

2
src/yuzu/main.cpp

@ -164,7 +164,7 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual
#include "yuzu/install_dialog.h" #include "yuzu/install_dialog.h"
#include "yuzu/loading_screen.h" #include "yuzu/loading_screen.h"
#include "yuzu/main.h" #include "yuzu/main.h"
#include "common/play_time_manager.h"
#include "frontend_common/play_time_manager.h"
#include "yuzu/startup_checks.h" #include "yuzu/startup_checks.h"
#include "qt_common/config/uisettings.h" #include "qt_common/config/uisettings.h"
#include "yuzu/util/clickable_label.h" #include "yuzu/util/clickable_label.h"

15
src/yuzu/util/util.cpp

@ -48,21 +48,6 @@ QPixmap CreateCirclePixmapFromColor(const QColor& color) {
return circle_pixmap; return circle_pixmap;
} }
QString ReadableDuration(qulonglong time_seconds) {
if (time_seconds == 0) {
return {};
}
const auto time_minutes = std::max(static_cast<double>(time_seconds) / 60, 1.0);
const auto time_hours = static_cast<double>(time_seconds) / 3600;
const bool is_minutes = time_minutes < 60;
const char* unit = is_minutes ? "m" : "h";
const auto value = is_minutes ? time_minutes : time_hours;
return QStringLiteral("%L1 %2")
.arg(value, 0, 'f', !is_minutes && time_seconds % 60 != 0)
.arg(QString::fromUtf8(unit));
}
bool SaveIconToFile(const std::filesystem::path& icon_path, const QImage& image) { bool SaveIconToFile(const std::filesystem::path& icon_path, const QImage& image) {
#if defined(WIN32) #if defined(WIN32)
#pragma pack(push, 2) #pragma pack(push, 2)

3
src/yuzu/util/util.h

@ -27,6 +27,3 @@
* @return bool If the operation succeeded * @return bool If the operation succeeded
*/ */
[[nodiscard]] bool SaveIconToFile(const std::filesystem::path& icon_path, const QImage& image); [[nodiscard]] bool SaveIconToFile(const std::filesystem::path& icon_path, const QImage& image);
// Converts a length of time in seconds into a readable format
QString ReadableDuration(qulonglong time_seconds);
Loading…
Cancel
Save