From 44ce6b113476ee38f2db64949143200615492a96 Mon Sep 17 00:00:00 2001 From: sakertooth Date: Tue, 22 Aug 2023 13:02:39 -0400 Subject: [PATCH] Replace qgetenv with std::getenv --- src/core/ConfigManager.cpp | 8 ++++---- src/core/PluginFactory.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp index c647a27e6d5..05574ae3532 100644 --- a/src/core/ConfigManager.cpp +++ b/src/core/ConfigManager.cpp @@ -77,9 +77,9 @@ ConfigManager::ConfigManager() : m_sf2Dir = m_workingDir + SF2_PATH; m_gigDir = m_workingDir + GIG_PATH; m_themeDir = defaultThemeDir(); - if (!qgetenv("LMMS_DATA_DIR").isEmpty()) + if (std::getenv("LMMS_DATA_DIR")) { - QDir::addSearchPath("data", QString::fromLocal8Bit(qgetenv("LMMS_DATA_DIR"))); + QDir::addSearchPath("data", QString::fromLocal8Bit(std::getenv("LMMS_DATA_DIR"))); } initDevelopmentWorkingDir(); @@ -557,8 +557,8 @@ void ConfigManager::loadConfigFile(const QString & configFile) upgrade(); QStringList searchPaths; - if(! qgetenv("LMMS_THEME_PATH").isNull()) - searchPaths << qgetenv("LMMS_THEME_PATH"); + if (std::getenv("LMMS_THEME_PATH")) + searchPaths << std::getenv("LMMS_THEME_PATH"); searchPaths << themeDir() << defaultThemeDir(); QDir::setSearchPaths("resources", searchPaths); diff --git a/src/core/PluginFactory.cpp b/src/core/PluginFactory.cpp index ece58927442..635aed77d35 100644 --- a/src/core/PluginFactory.cpp +++ b/src/core/PluginFactory.cpp @@ -86,7 +86,7 @@ void PluginFactory::setupSearchPaths() #endif // Or via an environment variable: QString env_path; - if (!(env_path = qgetenv("LMMS_PLUGIN_DIR")).isEmpty()) + if (const char* env_path = std::getenv("LMMS_PLUGIN_DIR")) QDir::addSearchPath("plugins", env_path); QDir::addSearchPath("plugins", ConfigManager::inst()->workingDir() + "plugins");