etc
/
obs-StreamFX
mirror of https://github.com/Xaymar/obs-StreamFX
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: Fix incorrect namespace for Qt symbol 

Q_INIT_RESOURCE and Q_CLEANUP_RESOURCE can't be called from within a namespace and instead have to be in outside of the namespace, so by moving them into small inline functions we can fulfill this restriction.

Related: #192 #155
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2020-04-25 00:57:38 +02:00
parent 50671c7f69
commit 8b0cc92d10
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/ui/ui.cpp
View File

@ -47,6 +47,16 @@ constexpr std::string_view _url_website = "https://streamfx.xaymar.com";
constexpr std::string_view _url_discord = "https://discordapp.com/invite/DaeJg7M"; constexpr std::string_view _url_discord = "https://discordapp.com/invite/DaeJg7M";
constexpr std::string_view _url_github = "https://github.com/Xaymar/obs-StreamFX"; constexpr std::string_view _url_github = "https://github.com/Xaymar/obs-StreamFX";
inline void qt_init_resource()
{
Q_INIT_RESOURCE(streamfx);
}
inline void qt_cleanup_resource()
{
Q_CLEANUP_RESOURCE(streamfx);
}
bool streamfx::ui::handler::have_shown_about_streamfx(bool shown) bool streamfx::ui::handler::have_shown_about_streamfx(bool shown)
{ {
if (shown) { if (shown) {
@ -69,7 +79,7 @@ streamfx::ui::handler::handler()
_about_action(), _about_dialog() _about_action(), _about_dialog()
{ {
// Qt Resources and Translators // Qt Resources and Translators
Q_INIT_RESOURCE(streamfx); qt_init_resource();
QCoreApplication::installTranslator(new streamfx::ui::translator(this)); QCoreApplication::installTranslator(new streamfx::ui::translator(this));
// Handle all frontend events. // Handle all frontend events.
@ -116,7 +126,7 @@ streamfx::ui::handler::~handler()
obs_frontend_remove_event_callback(frontend_event_handler, this); obs_frontend_remove_event_callback(frontend_event_handler, this);
// Qt Resources and Translators // Qt Resources and Translators
Q_CLEANUP_RESOURCE(streamfx); qt_cleanup_resource();
} }
void streamfx::ui::handler::frontend_event_handler(obs_frontend_event event, void* private_data) void streamfx::ui::handler::frontend_event_handler(obs_frontend_event event, void* private_data)