Prefix textstream operators with Qt::

As the non prefixed variants are deprecated

Change-Id: I2ba09d71b9cea5203b54297a3f2332e6d44fedcf
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

4 files changed, 73 insertions, 73 deletions

diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index de7363e51b..eb771a695a 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -99,7 +99,7 @@ bool MingwMakefileGenerator::writeMakefile(QTextStream &t)
             writePkgConfigFile();
 
         if(Option::mkfile::do_stub_makefile) {
-            t << "QMAKE    = " << var("QMAKE_QMAKE") << endl;
+            t << "QMAKE    = " << var("QMAKE_QMAKE") << Qt::endl;
             const ProStringList &qut = project->values("QMAKE_EXTRA_TARGETS");
             for (ProStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it)
                 t << escapeDependencyPath(*it) << ' ';
@@ -148,7 +148,7 @@ void createLdResponseFile(const QString &fileName, const ProStringList &objList)
                 .replace(QLatin1Char('\t'), QLatin1String("\\\t"))
                 .replace(QLatin1Char('"'), QLatin1String("\\\""))
                 .replace(QLatin1Char('\''), QLatin1String("\\'"));
-            t << path << endl;
+            t << path << Qt::endl;
         }
         t.flush();
         file.close();
@@ -162,9 +162,9 @@ void createArObjectScriptFile(const QString &fileName, const QString &target, co
     if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
         QTextStream t(&file);
         // ### quoting?
-        t << "CREATE " << target << endl;
+        t << "CREATE " << target << Qt::endl;
         for (ProStringList::ConstIterator it = objList.constBegin(); it != objList.constEnd(); ++it) {
-            t << "ADDMOD " << *it << endl;
+            t << "ADDMOD " << *it << Qt::endl;
         }
         t << "SAVE\n";
         t.flush();
@@ -183,13 +183,13 @@ void MingwMakefileGenerator::writeMingwParts(QTextStream &t)
           << finalizeDependencyPaths(findDependencies(header)).join(" \\\n\t\t")
           << "\n\t" << mkdir_p_asstring(preCompHeaderOut)
           << "\n\t$(CC) -x c-header -c $(CFLAGS) $(INCPATH) -o " << escapeFilePath(cHeader)
-          << ' ' << escapeFilePath(header) << endl << endl;
+          << ' ' << escapeFilePath(header) << Qt::endl << Qt::endl;
         QString cppHeader = preCompHeaderOut + Option::dir_sep + "c++";
         t << escapeDependencyPath(cppHeader) << ": " << escapeDependencyPath(header) << " "
           << finalizeDependencyPaths(findDependencies(header)).join(" \\\n\t\t")
           << "\n\t" << mkdir_p_asstring(preCompHeaderOut)
           << "\n\t$(CXX) -x c++-header -c $(CXXFLAGS) $(INCPATH) -o " << escapeFilePath(cppHeader)
-          << ' ' << escapeFilePath(header) << endl << endl;
+          << ' ' << escapeFilePath(header) << Qt::endl << Qt::endl;
     }
 }
 
@@ -274,21 +274,21 @@ void MingwMakefileGenerator::writeIncPart(QTextStream &t)
             t << "-I";
         t << escapeFilePath(inc) << ' ';
     }
-    t << endl;
+    t << Qt::endl;
 }
 
 void MingwMakefileGenerator::writeLibsPart(QTextStream &t)
 {
     if(project->isActiveConfig("staticlib") && project->first("TEMPLATE") == "lib") {
-        t << "LIB        =        " << var("QMAKE_LIB") << endl;
+        t << "LIB        =        " << var("QMAKE_LIB") << Qt::endl;
     } else {
-        t << "LINKER      =        " << var("QMAKE_LINK") << endl;
-        t << "LFLAGS        =        " << var("QMAKE_LFLAGS") << endl;
+        t << "LINKER      =        " << var("QMAKE_LINK") << Qt::endl;
+        t << "LFLAGS        =        " << var("QMAKE_LFLAGS") << Qt::endl;
         t << "LIBS        =        "
           << fixLibFlags("LIBS").join(' ') << ' '
           << fixLibFlags("LIBS_PRIVATE").join(' ') << ' '
           << fixLibFlags("QMAKE_LIBS").join(' ') << ' '
-          << fixLibFlags("QMAKE_LIBS_PRIVATE").join(' ') << endl;
+          << fixLibFlags("QMAKE_LIBS_PRIVATE").join(' ') << Qt::endl;
     }
 }
 
@@ -350,7 +350,7 @@ void MingwMakefileGenerator::writeBuildRulesPart(QTextStream &t)
     }
     if(!project->isEmpty("QMAKE_POST_LINK"))
         t << "\n\t" <<var("QMAKE_POST_LINK");
-    t << endl;
+    t << Qt::endl;
 }
 
 void MingwMakefileGenerator::writeRcFilePart(QTextStream &t)
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 63d89a5388..9c2e789932 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -143,7 +143,7 @@ void NmakeMakefileGenerator::writeNmakeParts(QTextStream &t)
         t << escapeDependencyPath(precompObj) << ": " << escapeDependencyPath(precompH) << ' '
           << finalizeDependencyPaths(findDependencies(precompH)).join(" \\\n\t\t")
           << "\n\t$(CXX) " + precompRule +" $(CXXFLAGS) $(INCPATH) -TP "
-          << escapeFilePath(precompH) << endl << endl;
+          << escapeFilePath(precompH) << Qt::endl << Qt::endl;
     }
     if (usePCHC) {
         QString precompRuleC = QString("-c -Yc -Fp%1 -Fo%2")
@@ -151,7 +151,7 @@ void NmakeMakefileGenerator::writeNmakeParts(QTextStream &t)
         t << escapeDependencyPath(precompObjC) << ": " << escapeDependencyPath(precompH) << ' '
           << finalizeDependencyPaths(findDependencies(precompH)).join(" \\\n\t\t")
           << "\n\t$(CC) " + precompRuleC +" $(CFLAGS) $(INCPATH) -TC "
-          << escapeFilePath(precompH) << endl << endl;
+          << escapeFilePath(precompH) << Qt::endl << Qt::endl;
     }
 }
 
@@ -314,7 +314,7 @@ void NmakeMakefileGenerator::writeImplicitRulesPart(QTextStream &t)
         t << " " << (*cit);
     for(QStringList::Iterator cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
         t << " " << (*cppit);
-    t << endl << endl;
+    t << Qt::endl << Qt::endl;
 
     bool useInferenceRules = !project->isActiveConfig("no_batch");
     QSet<QString> source_directories;
@@ -393,9 +393,9 @@ void NmakeMakefileGenerator::writeImplicitRulesPart(QTextStream &t)
         }
     } else {
         for(QStringList::Iterator cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
-            t << (*cppit) << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl;
+            t << (*cppit) << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CXX_IMP") << Qt::endl << Qt::endl;
         for(QStringList::Iterator cit = Option::c_ext.begin(); cit != Option::c_ext.end(); ++cit)
-            t << (*cit) << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CC_IMP") << endl << endl;
+            t << (*cit) << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CC_IMP") << Qt::endl << Qt::endl;
     }
 
 }
@@ -498,7 +498,7 @@ void NmakeMakefileGenerator::writeBuildRulesPart(QTextStream &t)
     if(!project->isEmpty("QMAKE_POST_LINK")) {
         t << "\n\t" << var("QMAKE_POST_LINK");
     }
-    t << endl;
+    t << Qt::endl;
 }
 
 void NmakeMakefileGenerator::writeLinkCommand(QTextStream &t, const QString &extraFlags, const QString &extraInlineFileContent)
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index b356f1bb73..33eff0d914 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -923,7 +923,7 @@ struct VCFilterFile
 inline QDebug operator<<(QDebug dbg, const VCFilterFile &p)
 {
     dbg.nospace() << "VCFilterFile(file(" << p.file
-                  << ") excludeFromBuild(" << p.excludeFromBuild << "))" << endl;
+                  << ") excludeFromBuild(" << p.excludeFromBuild << "))" << Qt::endl;
     return dbg.space();
 }
 #endif
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index 16f9361d13..8ee86ac395 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -320,11 +320,11 @@ void Win32MakefileGenerator::processRcFileVar()
         int rcCodePage = project->intValue("RC_CODEPAGE", 1200);    // default: Unicode
 
         ts << "#include <windows.h>\n";
-        ts << endl;
+        ts << Qt::endl;
         if (!rcIcons.isEmpty()) {
             for (int i = 0; i < rcIcons.size(); ++i)
-                ts << QString("IDI_ICON%1\tICON\tDISCARDABLE\t%2").arg(i + 1).arg(cQuoted(rcIcons[i])) << endl;
-            ts << endl;
+                ts << QString("IDI_ICON%1\tICON\tDISCARDABLE\t%2").arg(i + 1).arg(cQuoted(rcIcons[i])) << Qt::endl;
+            ts << Qt::endl;
         }
         if (!manifestFile.isEmpty()) {
             QString manifestResourceId;
@@ -335,8 +335,8 @@ void Win32MakefileGenerator::processRcFileVar()
             ts << manifestResourceId << " RT_MANIFEST \"" << manifestFile << "\"\n";
         }
         ts << "VS_VERSION_INFO VERSIONINFO\n";
-        ts << "\tFILEVERSION " << QString(versionString).replace(".", ",") << endl;
-        ts << "\tPRODUCTVERSION " << QString(versionString).replace(".", ",") << endl;
+        ts << "\tFILEVERSION " << QString(versionString).replace(".", ",") << Qt::endl;
+        ts << "\tPRODUCTVERSION " << QString(versionString).replace(".", ",") << Qt::endl;
         ts << "\tFILEFLAGSMASK 0x3fL\n";
         ts << "#ifdef _DEBUG\n";
         ts << "\tFILEFLAGS VS_FF_DEBUG\n";
@@ -369,11 +369,11 @@ void Win32MakefileGenerator::processRcFileVar()
         ts << "\t\tBEGIN\n";
         ts << "\t\t\tVALUE \"Translation\", "
            << QString("0x%1").arg(rcLang, 4, 16, QLatin1Char('0'))
-           << ", " << QString("%1").arg(rcCodePage, 4) << endl;
+           << ", " << QString("%1").arg(rcCodePage, 4) << Qt::endl;
         ts << "\t\tEND\n";
         ts << "\tEND\n";
         ts << "/* End of Version info */\n";
-        ts << endl;
+        ts << Qt::endl;
 
         ts.flush();
 
@@ -470,7 +470,7 @@ void Win32MakefileGenerator::writeCleanParts(QTextStream &t)
             }
         }
     }
-    t << endl << endl;
+    t << Qt::endl << Qt::endl;
 
     t << "distclean: clean " << depVar("DISTCLEAN_DEPS");
     {
@@ -503,9 +503,9 @@ void Win32MakefileGenerator::writeCleanParts(QTextStream &t)
     {
         QString ofile = fileFixify(Option::output.fileName());
         if(!ofile.isEmpty())
-            t << "\t-$(DEL_FILE) " << escapeFilePath(ofile) << endl;
+            t << "\t-$(DEL_FILE) " << escapeFilePath(ofile) << Qt::endl;
     }
-    t << endl;
+    t << Qt::endl;
 }
 
 void Win32MakefileGenerator::writeIncPart(QTextStream &t)
@@ -519,7 +519,7 @@ void Win32MakefileGenerator::writeIncPart(QTextStream &t)
         if(!inc.isEmpty())
             t << "-I" << escapeFilePath(inc) << ' ';
     }
-    t << endl;
+    t << Qt::endl;
 }
 
 void Win32MakefileGenerator::writeStandardParts(QTextStream &t)
@@ -527,51 +527,51 @@ void Win32MakefileGenerator::writeStandardParts(QTextStream &t)
     writeExportedVariables(t);
 
     t << "####### Compiler, tools and options\n\n";
-    t << "CC            = " << var("QMAKE_CC") << endl;
-    t << "CXX           = " << var("QMAKE_CXX") << endl;
+    t << "CC            = " << var("QMAKE_CC") << Qt::endl;
+    t << "CXX           = " << var("QMAKE_CXX") << Qt::endl;
     t << "DEFINES       = "
       << varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ")
-      << varGlue("DEFINES","-D"," -D","") << endl;
+      << varGlue("DEFINES","-D"," -D","") << Qt::endl;
     t << "CFLAGS        = " << var("QMAKE_CFLAGS") << " $(DEFINES)\n";
     t << "CXXFLAGS      = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n";
 
     writeIncPart(t);
     writeLibsPart(t);
 
-    t << "QMAKE         = " << var("QMAKE_QMAKE") << endl;
+    t << "QMAKE         = " << var("QMAKE_QMAKE") << Qt::endl;
     t << "IDC           = " << (project->isEmpty("QMAKE_IDC") ? QString("idc") : var("QMAKE_IDC"))
-                            << endl;
+                            << Qt::endl;
     t << "IDL           = " << (project->isEmpty("QMAKE_IDL") ? QString("midl") : var("QMAKE_IDL"))
-                            << endl;
-    t << "ZIP           = " << var("QMAKE_ZIP") << endl;
-    t << "DEF_FILE      = " << fileVar("DEF_FILE") << endl;
-    t << "RES_FILE      = " << fileVar("RES_FILE") << endl; // Not on mingw, can't see why not though...
-    t << "COPY          = " << var("QMAKE_COPY") << endl;
-    t << "SED           = " << var("QMAKE_STREAM_EDITOR") << endl;
-    t << "COPY_FILE     = " << var("QMAKE_COPY_FILE") << endl;
-    t << "COPY_DIR      = " << var("QMAKE_COPY_DIR") << endl;
-    t << "DEL_FILE      = " << var("QMAKE_DEL_FILE") << endl;
-    t << "DEL_DIR       = " << var("QMAKE_DEL_DIR") << endl;
-    t << "MOVE          = " << var("QMAKE_MOVE") << endl;
-    t << "CHK_DIR_EXISTS= " << var("QMAKE_CHK_DIR_EXISTS") << endl;
-    t << "MKDIR         = " << var("QMAKE_MKDIR") << endl;
-    t << "INSTALL_FILE    = " << var("QMAKE_INSTALL_FILE") << endl;
-    t << "INSTALL_PROGRAM = " << var("QMAKE_INSTALL_PROGRAM") << endl;
-    t << "INSTALL_DIR     = " << var("QMAKE_INSTALL_DIR") << endl;
-    t << "QINSTALL        = " << var("QMAKE_QMAKE") << " -install qinstall" << endl;
-    t << "QINSTALL_PROGRAM = " << var("QMAKE_QMAKE") << " -install qinstall -exe" << endl;
-    t << endl;
+                            << Qt::endl;
+    t << "ZIP           = " << var("QMAKE_ZIP") << Qt::endl;
+    t << "DEF_FILE      = " << fileVar("DEF_FILE") << Qt::endl;
+    t << "RES_FILE      = " << fileVar("RES_FILE") << Qt::endl; // Not on mingw, can't see why not though...
+    t << "COPY          = " << var("QMAKE_COPY") << Qt::endl;
+    t << "SED           = " << var("QMAKE_STREAM_EDITOR") << Qt::endl;
+    t << "COPY_FILE     = " << var("QMAKE_COPY_FILE") << Qt::endl;
+    t << "COPY_DIR      = " << var("QMAKE_COPY_DIR") << Qt::endl;
+    t << "DEL_FILE      = " << var("QMAKE_DEL_FILE") << Qt::endl;
+    t << "DEL_DIR       = " << var("QMAKE_DEL_DIR") << Qt::endl;
+    t << "MOVE          = " << var("QMAKE_MOVE") << Qt::endl;
+    t << "CHK_DIR_EXISTS= " << var("QMAKE_CHK_DIR_EXISTS") << Qt::endl;
+    t << "MKDIR         = " << var("QMAKE_MKDIR") << Qt::endl;
+    t << "INSTALL_FILE    = " << var("QMAKE_INSTALL_FILE") << Qt::endl;
+    t << "INSTALL_PROGRAM = " << var("QMAKE_INSTALL_PROGRAM") << Qt::endl;
+    t << "INSTALL_DIR     = " << var("QMAKE_INSTALL_DIR") << Qt::endl;
+    t << "QINSTALL        = " << var("QMAKE_QMAKE") << " -install qinstall" << Qt::endl;
+    t << "QINSTALL_PROGRAM = " << var("QMAKE_QMAKE") << " -install qinstall -exe" << Qt::endl;
+    t << Qt::endl;
 
     t << "####### Output directory\n\n";
     if(!project->values("OBJECTS_DIR").isEmpty())
-        t << "OBJECTS_DIR   = " << escapeFilePath(var("OBJECTS_DIR").remove(QRegExp("\\\\$"))) << endl;
+        t << "OBJECTS_DIR   = " << escapeFilePath(var("OBJECTS_DIR").remove(QRegExp("\\\\$"))) << Qt::endl;
     else
         t << "OBJECTS_DIR   = . \n";
-    t << endl;
+    t << Qt::endl;
 
     t << "####### Files\n\n";
     t << "SOURCES       = " << valList(escapeFilePaths(project->values("SOURCES")))
-      << " " << valList(escapeFilePaths(project->values("GENERATED_SOURCES"))) << endl;
+      << " " << valList(escapeFilePaths(project->values("GENERATED_SOURCES"))) << Qt::endl;
 
     // do this here so we can set DEST_TARGET to be the complete path to the final target if it is needed.
     QString orgDestDir = var("DESTDIR");
@@ -587,14 +587,14 @@ void Win32MakefileGenerator::writeStandardParts(QTextStream &t)
     writeExtraVariables(t);
 
     t << "DIST          = " << fileVarList("DISTFILES") << ' '
-      << fileVarList("HEADERS") << ' ' << fileVarList("SOURCES") << endl;
-    t << "QMAKE_TARGET  = " << fileVar("QMAKE_ORIG_TARGET") << endl;  // unused
+      << fileVarList("HEADERS") << ' ' << fileVarList("SOURCES") << Qt::endl;
+    t << "QMAKE_TARGET  = " << fileVar("QMAKE_ORIG_TARGET") << Qt::endl;  // unused
     // The comment is important to maintain variable compatibility with Unix
     // Makefiles, while not interpreting a trailing-slash as a linebreak
     t << "DESTDIR        = " << escapeFilePath(destDir) << " #avoid trailing-slash linebreak\n";
-    t << "TARGET         = " << escapeFilePath(target) << endl;
-    t << "DESTDIR_TARGET = " << fileVar("DEST_TARGET") << endl;
-    t << endl;
+    t << "TARGET         = " << escapeFilePath(target) << Qt::endl;
+    t << "DESTDIR_TARGET = " << fileVar("DEST_TARGET") << Qt::endl;
+    t << Qt::endl;
 
     writeImplicitRulesPart(t);
 
@@ -606,10 +606,10 @@ void Win32MakefileGenerator::writeStandardParts(QTextStream &t)
             const ProStringList &dlldirs = project->values("DLLDESTDIR");
             for (ProStringList::ConstIterator dlldir = dlldirs.begin(); dlldir != dlldirs.end(); ++dlldir) {
                 t << "\t-$(COPY_FILE) $(DESTDIR_TARGET) "
-                  << escapeFilePath(Option::fixPathToTargetOS((*dlldir).toQString(), false)) << endl;
+                  << escapeFilePath(Option::fixPathToTargetOS((*dlldir).toQString(), false)) << Qt::endl;
             }
         }
-        t << endl;
+        t << Qt::endl;
 
         writeRcFilePart(t);
     }
@@ -642,33 +642,33 @@ void Win32MakefileGenerator::writeStandardParts(QTextStream &t)
             }
         }
     }
-    t << endl << endl;
+    t << Qt::endl << Qt::endl;
 
     writeCleanParts(t);
     writeExtraTargets(t);
     writeExtraCompilerTargets(t);
-    t << endl << endl;
+    t << Qt::endl << Qt::endl;
 }
 
 void Win32MakefileGenerator::writeLibsPart(QTextStream &t)
 {
     if(project->isActiveConfig("staticlib") && project->first("TEMPLATE") == "lib") {
-        t << "LIBAPP        = " << var("QMAKE_LIB") << endl;
-        t << "LIBFLAGS      = " << var("QMAKE_LIBFLAGS") << endl;
+        t << "LIBAPP        = " << var("QMAKE_LIB") << Qt::endl;
+        t << "LIBFLAGS      = " << var("QMAKE_LIBFLAGS") << Qt::endl;
     } else {
-        t << "LINKER        = " << var("QMAKE_LINK") << endl;
-        t << "LFLAGS        = " << var("QMAKE_LFLAGS") << endl;
+        t << "LINKER        = " << var("QMAKE_LINK") << Qt::endl;
+        t << "LFLAGS        = " << var("QMAKE_LFLAGS") << Qt::endl;
         t << "LIBS          = " << fixLibFlags("LIBS").join(' ') << ' '
                                 << fixLibFlags("LIBS_PRIVATE").join(' ') << ' '
                                 << fixLibFlags("QMAKE_LIBS").join(' ') << ' '
-                                << fixLibFlags("QMAKE_LIBS_PRIVATE").join(' ') << endl;
+                                << fixLibFlags("QMAKE_LIBS_PRIVATE").join(' ') << Qt::endl;
     }
 }
 
 void Win32MakefileGenerator::writeObjectsPart(QTextStream &t)
 {
     // Used in both deps and commands.
-    t << "OBJECTS       = " << valList(escapeDependencyPaths(project->values("OBJECTS"))) << endl;
+    t << "OBJECTS       = " << valList(escapeDependencyPaths(project->values("OBJECTS"))) << Qt::endl;
 }
 
 void Win32MakefileGenerator::writeImplicitRulesPart(QTextStream &t)
@@ -710,7 +710,7 @@ void Win32MakefileGenerator::writeRcFilePart(QTextStream &t)
           << var("QMAKE_RC") << (project->isActiveConfig("debug") ? " -D_DEBUG" : "")
           << defines << incPathStr << " -fo " << escapeFilePath(res_file)
           << ' ' << escapeFilePath(rc_file);
-        t << endl << endl;
+        t << Qt::endl << Qt::endl;
     }
 }