From ae2130470effa72c3ea1ffc045e9b6b2a77b23d3 Mon Sep 17 00:00:00 2001
From: boludoz <francomaro@gmail.com>
Date: Wed, 18 Oct 2023 19:30:21 -0300
Subject: [PATCH] Reverted dirty code in main.
---
src/yuzu/main.cpp | 8 ++------
src/yuzu/main.h | 3 ---
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index ec3eb7536..73cd06478 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -2839,8 +2839,7 @@ void GMainWindow::OnGameListNavigateToGamedbEntry(u64 program_id,
QDesktopServices::openUrl(QUrl(QStringLiteral("https://yuzu-emu.org/game/") + directory));
}
-// TODO: Implement shortcut creation for macOS
-#if !defined(__APPLE__)
+
bool GMainWindow::CreateShortcutLink(const std::filesystem::path& shortcut_path,
const std::string& comment,
const std::filesystem::path& icon_path,
@@ -2998,11 +2997,9 @@ bool GMainWindow::MakeShortcutIcoPath(const u64 program_id, const std::string_vi
: fmt::format("yuzu-{:016X}.{}", program_id, ico_extension));
return true;
}
-#endif // !defined(__APPLE__)
+
void GMainWindow::OnGameListCreateShortcut(u64 program_id, const std::string& game_path,
GameListShortcutTarget target) {
-// TODO: Implement shortcut creation for macOS
-#if !defined(__APPLE__)
std::string game_title;
QString qt_game_title;
std::filesystem::path out_icon_path;
@@ -3096,7 +3093,6 @@ void GMainWindow::OnGameListCreateShortcut(u64 program_id, const std::string& ga
}
GMainWindow::CreateShortcutMessagesGUI(this, GMainWindow::CREATE_SHORTCUT_MSGBOX_ERROR,
qt_game_title);
-#endif
}
void GMainWindow::OnGameListOpenDirectory(const QString& directory) {
diff --git a/src/yuzu/main.h b/src/yuzu/main.h
index 7a1a97f33..d203e5301 100644
--- a/src/yuzu/main.h
+++ b/src/yuzu/main.h
@@ -441,8 +441,6 @@ private:
bool ConfirmShutdownGame();
QString GetTasStateDescription() const;
-// TODO: Implement shortcut creation for macOS
-#if !defined(__APPLE__)
bool CreateShortcutMessagesGUI(QWidget* parent, int imsg, const QString& game_title);
bool MakeShortcutIcoPath(const u64 program_id, const std::string_view game_file_name,
std::filesystem::path& out_icon_path);
@@ -451,7 +449,6 @@ private:
const std::filesystem::path& command, const std::string& arguments,
const std::string& categories, const std::string& keywords,
const std::string& name);
-#endif
/**
* Mimic the behavior of QMessageBox::question but link controller navigation to the dialog
* The only difference is that it returns a boolean.