Workaround 5.15 deprecations in QTextStreams

Change-Id: Ifc2b7fd353e7c12346e9716115e830679cea7666
Reviewed-by: hjk <hjk@qt.io>

3 files changed, 21 insertions, 26 deletions

diff --git a/src/tools/buildoutputparser/outputprocessor.cpp b/src/tools/buildoutputparser/outputprocessor.cpp
index e5abaa0baf..083f4de89e 100644
--- a/src/tools/buildoutputparser/outputprocessor.cpp
+++ b/src/tools/buildoutputparser/outputprocessor.cpp
@@ -40,8 +40,6 @@
 
 #include <stdio.h>
 
-using namespace Qt;
-
 CompilerOutputProcessor::CompilerOutputProcessor(CompilerType compilerType, QIODevice &source)
     : m_compilerType(compilerType)
     , m_source(source)
@@ -88,5 +86,5 @@ void CompilerOutputProcessor::handleTask(const ProjectExplorer::Task &task)
             *m_ostream << ':' << task.line;
         *m_ostream << ": ";
     }
-    *m_ostream << task.description << endl;
+    *m_ostream << task.description << '\n';
 }
diff --git a/src/tools/valgrindfake/main.cpp b/src/tools/valgrindfake/main.cpp
index 10778b25c2..4e5fb0e860 100644
--- a/src/tools/valgrindfake/main.cpp
+++ b/src/tools/valgrindfake/main.cpp
@@ -36,24 +36,22 @@
 
 using namespace Valgrind::Fake;
 
-using namespace Qt;
-
 QTextStream qerr(stderr);
 QTextStream qout(stdout);
 
 void usage(QTextStream& stream)
 {
-    stream << "valgrind-fake OPTIONS" << endl;
-    stream << endl;
-    stream << " REQUIRED OPTIONS:" << endl;
-    stream << "  --xml-socket=ipaddr:port \tXML output to socket ipaddr:port" << endl;
-    stream << "  -i, --xml-input FILE     \tpath to a XML file as generated by valgrind" << endl;
-    stream << endl;
-    stream << " OPTIONAL OPTIONS:" << endl;
-    stream << "  -c, --crash              \tcrash randomly" << endl;
-    stream << "  -g, --garbage            \toutput invalid XML somewhere" << endl;
-    stream << "  -w, --wait SECONDS       \twait randomly for the given amount of seconds" << endl;
-    stream << "  -h, --help               \tprint help" << endl;
+    stream << "valgrind-fake OPTIONS" << '\n';
+    stream << '\n';
+    stream << " REQUIRED OPTIONS:" << '\n';
+    stream << "  --xml-socket=ipaddr:port \tXML output to socket ipaddr:port" << '\n';
+    stream << "  -i, --xml-input FILE     \tpath to a XML file as generated by valgrind" << '\n';
+    stream << '\n';
+    stream << " OPTIONAL OPTIONS:" << '\n';
+    stream << "  -c, --crash              \tcrash randomly" << '\n';
+    stream << "  -g, --garbage            \toutput invalid XML somewhere" << '\n';
+    stream << "  -w, --wait SECONDS       \twait randomly for the given amount of seconds" << '\n';
+    stream << "  -h, --help               \tprint help" << '\n';
 }
 
 int main(int argc, char** argv)
@@ -89,7 +87,7 @@ int main(int argc, char** argv)
             bool ok;
             arg_wait = args.at(i+1).toUInt(&ok);
             if (!ok) {
-                qerr << "ERROR: invalid wait time given" << args.at(i+1) << endl;
+                qerr << "ERROR: invalid wait time given" << args.at(i+1) << '\n';
                 usage(qerr);
                 return 4;
             }
@@ -100,31 +98,31 @@ int main(int argc, char** argv)
     }
 
     if (arg_xmlFile.isEmpty()) {
-        qerr << "ERROR: no XML input file given" << endl;
+        qerr << "ERROR: no XML input file given" << '\n';
         usage(qerr);
         return 1;
     }
     if (arg_server.isEmpty()) {
-        qerr << "ERROR: no server given" << endl;
+        qerr << "ERROR: no server given" << '\n';
         usage(qerr);
         return 2;
     }
     if (arg_port.isEmpty()) {
-        qerr << "ERROR: no port given" << endl;
+        qerr << "ERROR: no port given" << '\n';
         usage(qerr);
         return 3;
     }
 
     QFile xmlFile(arg_xmlFile);
     if (!xmlFile.exists() || !xmlFile.open(QIODevice::ReadOnly)) {
-        qerr << "ERROR: invalid XML file" << endl;
+        qerr << "ERROR: invalid XML file" << '\n';
         usage(qerr);
         return 10;
     }
     bool ok = false;
     quint16 port = arg_port.toUInt(&ok);
     if (!ok) {
-        qerr << "ERROR: invalid port" << endl;
+        qerr << "ERROR: invalid port" << '\n';
         usage(qerr);
         return 30;
     }
@@ -132,12 +130,12 @@ int main(int argc, char** argv)
     QTcpSocket socket;
     socket.connectToHost(arg_server, port, QIODevice::WriteOnly);
     if (!socket.isOpen()) {
-        qerr << "ERROR: could not open socket to server:" << arg_server << ":" << port << endl;
+        qerr << "ERROR: could not open socket to server:" << arg_server << ":" << port << '\n';
         usage(qerr);
         return 20;
     }
     if (!socket.waitForConnected()) {
-        qerr << "ERROR: could not connect to socket: " << socket.errorString() << endl;
+        qerr << "ERROR: could not connect to socket: " << socket.errorString() << '\n';
         return 21;
     }
 
diff --git a/src/tools/valgrindfake/outputgenerator.cpp b/src/tools/valgrindfake/outputgenerator.cpp
index d8e544da4c..3c0b651bce 100644
--- a/src/tools/valgrindfake/outputgenerator.cpp
+++ b/src/tools/valgrindfake/outputgenerator.cpp
@@ -49,7 +49,6 @@ void doSleep(int msec)
 }
 #endif
 
-using namespace Qt;
 using namespace Valgrind::Fake;
 
 OutputGenerator::OutputGenerator(QAbstractSocket *output, QIODevice *input) :
@@ -116,7 +115,7 @@ void OutputGenerator::produceRuntimeError()
         blockingWrite(m_output, "<</GARBAGE = '\"''asdfaqre");
         m_output->flush();
     } else if (m_wait) {
-        qDebug() << "waiting in fake valgrind for " << m_wait << " seconds..." << endl;
+        qDebug() << "waiting in fake valgrind for " << m_wait << " seconds..." << '\n';
         doSleep(1000 * m_wait);
     }
 }