Replace a few uses of getenv with qEnvironmentVariableIsSet

MythTV · Oct 7, 2020 · 7159fff · 7159fff
1 parent d78f56e
commit 7159fff
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/mythtv/libs/libmythbase/mythcommandlineparser.cpp b/mythtv/libs/libmythbase/mythcommandlineparser.cpp
@@ -47,6 +47,7 @@
 #endif
 
 // Qt headers
+#include <QtGlobal>
 #include <QCoreApplication>
 #include <QDateTime>
 #include <QDir>
@@ -1161,11 +1162,10 @@ void CommandLineArg::PrintDeprecatedWarning(QString &keyword) const
 
 /** \brief Default constructor for MythCommandLineArg class
  */
-MythCommandLineParser::MythCommandLineParser(QString appname) :
-    m_appname(std::move(appname))
+MythCommandLineParser::MythCommandLineParser(QString appname)
+  : m_appname(std::move(appname))
 {
-    char *verbose = getenv("VERBOSE_PARSER");
-    if (verbose != nullptr)
+    if (qEnvironmentVariableIsSet("VERBOSE_PARSER"))
     {
         std::cerr << "MythCommandLineParser is now operating verbosely." << std::endl;
         m_verbose = true;

diff --git a/mythtv/libs/libmythmetadata/metadatadownload.cpp b/mythtv/libs/libmythmetadata/metadatadownload.cpp
@@ -191,7 +191,7 @@ void MetadataDownload::run()
 
                 // Experimental:
                 // If nothing matches, always return the first found item
-                if (getenv("EXPERIMENTAL_METADATA_GRAB"))
+                if (qEnvironmentVariableIsSet("EXPERIMENTAL_METADATA_GRAB"))
                 {
                     MetadataLookup *newlookup = list.takeFirst();
 

diff --git a/mythtv/libs/libmythtv/Bluray/mythbdbuffer.cpp b/mythtv/libs/libmythtv/Bluray/mythbdbuffer.cpp
@@ -76,7 +76,7 @@ MythBDBuffer::MythBDBuffer(const QString &Filename)
   : MythOpticalBuffer(kMythBufferBD),
     m_overlayPlanes(2, nullptr)
 {
-    m_tryHDMVNavigation = nullptr != getenv("MYTHTV_HDMV");
+    m_tryHDMVNavigation = qEnvironmentVariableIsSet("MYTHTV_HDMV");
     m_mainThread = QThread::currentThread();
     MythBDBuffer::OpenFile(Filename);
 }

diff --git a/mythtv/libs/libmythtv/decoders/avformatdecoder.cpp b/mythtv/libs/libmythtv/decoders/avformatdecoder.cpp
@@ -1246,7 +1246,7 @@ int AvFormatDecoder::OpenFile(MythMediaBuffer *Buffer, bool novideo,
                 .arg(framenum)));
     }
 
-    if (getenv("FORCE_DTS_TIMESTAMPS"))
+    if (qEnvironmentVariableIsSet("FORCE_DTS_TIMESTAMPS"))
         m_forceDtsTimestamps = true;
 
     if (m_ringBuffer->IsDVD())

diff --git a/mythtv/programs/mythfrontend/mediarenderer.cpp b/mythtv/programs/mythfrontend/mediarenderer.cpp
@@ -143,13 +143,10 @@ MediaRenderer::MediaRenderer()
 #endif
 
         UPNPSubscription *subscription = nullptr;
-        if (getenv("MYTHTV_UPNPSCANNER"))
+        if (qEnvironmentVariableIsSet("MYTHTV_UPNPSCANNER"))
         {
-            LOG(VB_UPNP, LOG_INFO,
-                "MediaRenderer: Registering UPnP Subscription Extension.");
-
-            subscription = new UPNPSubscription(
-                m_pHttpServer->GetSharePath(), nPort);
+            LOG(VB_UPNP, LOG_INFO, "MediaRenderer: Registering UPnP Subscription Extension.");
+            subscription = new UPNPSubscription(m_pHttpServer->GetSharePath(), nPort);
             m_pHttpServer->RegisterExtension(subscription);
         }