From kde-commits  Thu Sep 27 22:41:47 2018
From: Michael Reeves <null () kde ! org>
Date: Thu, 27 Sep 2018 22:41:47 +0000
To: kde-commits
Subject: [kdiff3] src: Use Qt functions for reading environment.
Message-Id: <E1g5eyh-0002Tl-G9 () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=153846789323510

Git commit b2b6ffb2a96803617c2f63b2cdfbd2cc42d30cd0 by Michael Reeves.
Committed on 22/09/2018 at 03:39.
Pushed by mreeves into branch 'master'.

Use Qt functions for reading environment.

M  +5    -3    src/cvsignorelist.cpp
M  +0    -2    src/fileaccess.cpp

https://commits.kde.org/kdiff3/b2b6ffb2a96803617c2f63b2cdfbd2cc42d30cd0

diff --git a/src/cvsignorelist.cpp b/src/cvsignorelist.cpp
index acc4635..fdc56d1 100644
--- a/src/cvsignorelist.cpp
+++ b/src/cvsignorelist.cpp
@@ -16,17 +16,19 @@
 #include <QDir>
 #include <QTextStream>
 =

-#include <cstdlib>
-
 void CvsIgnoreList::init(FileAccess& dir, const t_DirectoryList* pDirList)
 {
     static const char* ignorestr =3D ". .. core RCSLOG tags TAGS RCS SCCS =
.make.state "
                                    ".nse_depinfo #* .#* cvslog.* ,* CVS CV=
S.adm .del-* *.a *.olb *.o *.obj "
                                    "*.so *.Z *~ *.old *.elc *.ln *.bak *.B=
AK *.orig *.rej *.exe _$* *$";
+    static const char* varname =3D "CVSIGNORE";
 =

     addEntriesFromString(QString::fromLatin1(ignorestr));
     addEntriesFromFile(QDir::homePath() + "/.cvsignore");
-    addEntriesFromString(QString::fromLocal8Bit(::getenv("CVSIGNORE")));
+    if(qEnvironmentVariableIsSet(varname) && !qEnvironmentVariableIsEmpty(=
varname))
+    {
+        addEntriesFromString(QString::fromLocal8Bit(qgetenv(varname)));
+    }
 =

     const bool bUseLocalCvsIgnore =3D cvsIgnoreExists(pDirList);
     if(bUseLocalCvsIgnore)
diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp
index 81a1275..1366da8 100644
--- a/src/fileaccess.cpp
+++ b/src/fileaccess.cpp
@@ -109,8 +109,6 @@ void FileAccess::setFile(const QFileInfo& fi, FileAcces=
s* pParent)
     m_filePath =3D pParent =3D=3D nullptr ? fi.absoluteFilePath() : fi.fil=
eName();
 =

     m_bSymLink =3D fi.isSymLink();
-    =

-
     m_pParent =3D pParent;
 =

     m_bFile =3D fi.isFile();