From 5b392d49d88dd8cdb00a84cbeae2e713c0824012 Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Sat, 4 Apr 2020 06:54:05 +0200 Subject: [PATCH] bikeshedding: unifying some variable in contrib/shaderplug --- contrib/shaderplug/shaderplug.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/shaderplug/shaderplug.cpp b/contrib/shaderplug/shaderplug.cpp index e4e601c7..06c378a5 100644 --- a/contrib/shaderplug/shaderplug.cpp +++ b/contrib/shaderplug/shaderplug.cpp @@ -59,7 +59,7 @@ ShaderPlugPluginDependencies() : namespace Shaderplug { -ui::Window g_window{ui::null}; +ui::Window main_window{ui::null}; std::vector archives; std::set shaders; @@ -69,7 +69,7 @@ XmlTagBuilder TagBuilder; void CreateTagFile(); const char* init( void* hApp, void* pMainWidget ){ - g_window = ui::Window::from(pMainWidget); + main_window = ui::Window::from(pMainWidget); return ""; } @@ -95,7 +95,7 @@ void dispatch( const char* command, float* vMin, float* vMax, bool bSingleBrush RADIANT_NAME " " RADIANT_VERSION_STRING "\n" __DATE__; - GlobalRadiant().m_pfnMessageBox( g_window, label_text, + GlobalRadiant().m_pfnMessageBox( main_window, label_text, "About " PLUGIN_NAME, eMB_OK, eMB_ICONDEFAULT ); @@ -189,23 +189,23 @@ void CreateTagFile(){ strcat( message, "\nPlease restart " RADIANT_NAME " now.\n" ); if ( file_exists( tagFile ) ) { - EMessageBoxReturn result = GlobalRadiant().m_pfnMessageBox( g_window , + EMessageBoxReturn result = GlobalRadiant().m_pfnMessageBox( main_window , "WARNING! A tag file already exists! Overwrite it?", "Overwrite tag file?", eMB_NOYES, eMB_ICONWARNING ); if ( result == eIDYES ) { TagBuilder.SaveXmlDoc( tagFile ); - GlobalRadiant().m_pfnMessageBox( g_window, message, "INFO", eMB_OK, eMB_ICONASTERISK ); + GlobalRadiant().m_pfnMessageBox( main_window, message, "INFO", eMB_OK, eMB_ICONASTERISK ); } } else { TagBuilder.SaveXmlDoc( tagFile ); - GlobalRadiant().m_pfnMessageBox( g_window, message, "INFO", eMB_OK, eMB_ICONASTERISK ); + GlobalRadiant().m_pfnMessageBox( main_window, message, "INFO", eMB_OK, eMB_ICONASTERISK ); } } else { - GlobalRadiant().m_pfnMessageBox( g_window, + GlobalRadiant().m_pfnMessageBox( main_window, "No shaders or textures found. No XML tag file created!\n" "", "ERROR", -- 2.39.2