From dde2fe209a1076248139758aa65f16b812da5147 Mon Sep 17 00:00:00 2001 From: gxalpha Date: Thu, 17 Mar 2022 18:04:22 +0100 Subject: [PATCH] UI: Remove InitApplicationBundle() function --- UI/obs-app.cpp | 2 -- UI/platform-osx.mm | 6 ------ UI/platform-windows.cpp | 5 ----- UI/platform-x11.cpp | 5 ----- UI/platform.hpp | 3 --- 5 files changed, 21 deletions(-) diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp index 217d5f4c4..e57aae114 100644 --- a/UI/obs-app.cpp +++ b/UI/obs-app.cpp @@ -1281,8 +1281,6 @@ void OBSApp::AppInit() { ProfileScope("OBSApp::AppInit"); - if (!InitApplicationBundle()) - throw "Failed to initialize application bundle"; if (!MakeUserDirs()) throw "Failed to create required user directories"; if (!InitGlobalConfig()) diff --git a/UI/platform-osx.mm b/UI/platform-osx.mm index 751f61b17..4cbc468db 100644 --- a/UI/platform-osx.mm +++ b/UI/platform-osx.mm @@ -48,12 +48,6 @@ bool GetDataFilePath(const char *data, string &output) return !access(output.c_str(), R_OK); } -#pragma deprecated(InitApplicationBundle) -bool InitApplicationBundle() -{ - return true; -} - void CheckIfAlreadyRunning(bool &already_running) { try { diff --git a/UI/platform-windows.cpp b/UI/platform-windows.cpp index 2ad0dccfc..20312379e 100644 --- a/UI/platform-windows.cpp +++ b/UI/platform-windows.cpp @@ -59,11 +59,6 @@ bool GetDataFilePath(const char *data, string &output) return check_path(data, OBS_DATA_PATH "/obs-studio/", output); } -bool InitApplicationBundle() -{ - return true; -} - string GetDefaultVideoSavePath() { wchar_t path_utf16[MAX_PATH]; diff --git a/UI/platform-x11.cpp b/UI/platform-x11.cpp index 73cb7c15a..f7437b656 100644 --- a/UI/platform-x11.cpp +++ b/UI/platform-x11.cpp @@ -201,11 +201,6 @@ bool GetDataFilePath(const char *data, string &output) return false; } -bool InitApplicationBundle() -{ - return true; -} - string GetDefaultVideoSavePath() { return string(getenv("HOME")); diff --git a/UI/platform.hpp b/UI/platform.hpp index 854166bfb..3735a5cf5 100644 --- a/UI/platform.hpp +++ b/UI/platform.hpp @@ -27,9 +27,6 @@ class QWidget; /* Gets the path of obs-studio specific data files (such as locale) */ bool GetDataFilePath(const char *data, std::string &path); -/* Updates the working directory for OSX application bundles */ -bool OBS_DEPRECATED InitApplicationBundle(); - std::string GetDefaultVideoSavePath(); std::vector GetPreferredLocales();