ソースを参照

Reverted dirty code in main.

boludoz 2 年 前
コミット
ae2130470e
2 ファイル変更2 行追加9 行削除
  1. 2 6
      src/yuzu/main.cpp
  2. 0 3
      src/yuzu/main.h

+ 2 - 6
src/yuzu/main.cpp

@@ -2839,8 +2839,7 @@ void GMainWindow::OnGameListNavigateToGamedbEntry(u64 program_id,
 
 
     QDesktopServices::openUrl(QUrl(QStringLiteral("https://yuzu-emu.org/game/") + directory));
     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,
 bool GMainWindow::CreateShortcutLink(const std::filesystem::path& shortcut_path,
                                      const std::string& comment,
                                      const std::string& comment,
                                      const std::filesystem::path& icon_path,
                                      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));
                                       : fmt::format("yuzu-{:016X}.{}", program_id, ico_extension));
     return true;
     return true;
 }
 }
-#endif // !defined(__APPLE__)
+
 void GMainWindow::OnGameListCreateShortcut(u64 program_id, const std::string& game_path,
 void GMainWindow::OnGameListCreateShortcut(u64 program_id, const std::string& game_path,
                                            GameListShortcutTarget target) {
                                            GameListShortcutTarget target) {
-// TODO: Implement shortcut creation for macOS
-#if !defined(__APPLE__)
     std::string game_title;
     std::string game_title;
     QString qt_game_title;
     QString qt_game_title;
     std::filesystem::path out_icon_path;
     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,
     GMainWindow::CreateShortcutMessagesGUI(this, GMainWindow::CREATE_SHORTCUT_MSGBOX_ERROR,
                                            qt_game_title);
                                            qt_game_title);
-#endif
 }
 }
 
 
 void GMainWindow::OnGameListOpenDirectory(const QString& directory) {
 void GMainWindow::OnGameListOpenDirectory(const QString& directory) {

+ 0 - 3
src/yuzu/main.h

@@ -441,8 +441,6 @@ private:
     bool ConfirmShutdownGame();
     bool ConfirmShutdownGame();
 
 
     QString GetTasStateDescription() const;
     QString GetTasStateDescription() const;
-// TODO: Implement shortcut creation for macOS
-#if !defined(__APPLE__)
     bool CreateShortcutMessagesGUI(QWidget* parent, int imsg, const QString& game_title);
     bool CreateShortcutMessagesGUI(QWidget* parent, int imsg, const QString& game_title);
     bool MakeShortcutIcoPath(const u64 program_id, const std::string_view game_file_name,
     bool MakeShortcutIcoPath(const u64 program_id, const std::string_view game_file_name,
                              std::filesystem::path& out_icon_path);
                              std::filesystem::path& out_icon_path);
@@ -451,7 +449,6 @@ private:
                             const std::filesystem::path& command, const std::string& arguments,
                             const std::filesystem::path& command, const std::string& arguments,
                             const std::string& categories, const std::string& keywords,
                             const std::string& categories, const std::string& keywords,
                             const std::string& name);
                             const std::string& name);
-#endif
     /**
     /**
      * Mimic the behavior of QMessageBox::question but link controller navigation to the dialog
      * Mimic the behavior of QMessageBox::question but link controller navigation to the dialog
      * The only difference is that it returns a boolean.
      * The only difference is that it returns a boolean.