[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdiff3] src: Use Qt functions for reading environment.
From:       Michael Reeves <null () kde ! org>
Date:       2018-09-27 22:41:47
Message-ID: E1g5eyh-0002Tl-G9 () code ! kde ! org
[Download RAW message or body]

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 = ". .. core RCSLOG tags TAGS RCS SCCS .make.state \
                "
                                    ".nse_depinfo #* .#* cvslog.* ,* CVS CVS.adm \
                .del-* *.a *.olb *.o *.obj "
                                    "*.so *.Z *~ *.old *.elc *.ln *.bak *.BAK *.orig \
*.rej *.exe _$* *$"; +    static const char* varname = "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 = 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, FileAccess* \
                pParent)
     m_filePath = pParent == nullptr ? fi.absoluteFilePath() : fi.fileName();
 
     m_bSymLink = fi.isSymLink();
-    
-
     m_pParent = pParent;
 
     m_bFile = fi.isFile();


[prev in list] [next in list] [prev in thread] [next in thread]