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

List:       kde-commits
Subject:    [kdevelop/5.0] languages/plugins/custom-definesandincludes/compilerprovider: Use
From:       Alex Richardson <arichardson.kde () gmail ! com>
Date:       2016-03-31 19:30:37
Message-ID: E1aliIf-00023q-JM () scm ! kde ! org
[Download RAW message or body]

Git commit 7c02e53ffe532632272a9345f506c5ce67155b42 by Alex Richardson.
Committed on 31/03/2016 at 17:11.
Pushed by arichardson into branch '5.0'.

Use QProcess::nullDevice() instead of own solution

M  +2    -8    languages/plugins/custom-definesandincludes/compilerprovider/gcclikecompiler.cpp


http://commits.kde.org/kdevelop/7c02e53ffe532632272a9345f506c5ce67155b42

diff --git a/languages/plugins/custom-definesandincludes/compilerprovider/gcclikecompiler.cpp \
b/languages/plugins/custom-definesandincludes/compilerprovider/gcclikecompiler.cpp \
                index 0720837..525700c 100644
--- a/languages/plugins/custom-definesandincludes/compilerprovider/gcclikecompiler.cpp
                
+++ b/languages/plugins/custom-definesandincludes/compilerprovider/gcclikecompiler.cpp
 @@ -30,12 +30,6 @@
 
 #include "../debugarea.h"
 
-#ifdef _WIN32
-#define NULL_DEVICE "NUL"
-#else
-#define NULL_DEVICE "/dev/null"
-#endif
-
 using namespace KDevelop;
 
 namespace
@@ -72,7 +66,7 @@ Defines GccLikeCompiler::defines(const QString& arguments) const
     auto compilerArguments = languageOptions(arguments);
     compilerArguments.append("-dM");
     compilerArguments.append("-E");
-    compilerArguments.append(NULL_DEVICE);
+    compilerArguments.append(QProcess::nullDevice());
 
     proc.start(path(), compilerArguments);
 
@@ -117,7 +111,7 @@ Path::List GccLikeCompiler::includes(const QString& arguments) \
const  auto compilerArguments = languageOptions(arguments);
     compilerArguments.append("-E");
     compilerArguments.append("-v");
-    compilerArguments.append(NULL_DEVICE);
+    compilerArguments.append(QProcess::nullDevice());
 
     proc.start(path(), compilerArguments);
 


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