From be6a67b5eb8281dabead044cfb3ca000e3022575 Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Sat, 3 Jul 2021 19:08:03 +0200 Subject: [PATCH] Replace uses of endl on Qt classes with Qt::endl This fixes a whole bunch of warnings --- .../apps/interface/src/main/cpp/native.cpp | 2 +- .../src/controllers/UserInputMapper.cpp | 8 ++-- tools/ac-client/src/ACClientApp.cpp | 2 +- tools/atp-client/src/ATPClientApp.cpp | 2 +- tools/ice-client/src/ICEClientApp.cpp | 2 +- tools/nitpick/src/TestCreator.cpp | 48 +++++++++---------- tools/skeleton-dump/src/SkeletonDumpApp.cpp | 2 +- tools/vhacd-util/src/VHACDUtilApp.cpp | 2 +- 8 files changed, 34 insertions(+), 34 deletions(-) diff --git a/android/apps/interface/src/main/cpp/native.cpp b/android/apps/interface/src/main/cpp/native.cpp index a466245eda..42118d89db 100644 --- a/android/apps/interface/src/main/cpp/native.cpp +++ b/android/apps/interface/src/main/cpp/native.cpp @@ -142,7 +142,7 @@ void unpackAndroidAssets() { if (!file.open(QIODevice::ReadWrite | QIODevice::Truncate)) { throw std::runtime_error("Can't write date stamp"); } - QTextStream(&file) << "touch" << endl; + QTextStream(&file) << "touch" << Qt::endl; file.close(); } } diff --git a/libraries/controllers/src/controllers/UserInputMapper.cpp b/libraries/controllers/src/controllers/UserInputMapper.cpp index 6333792b3f..6a46dea7d9 100755 --- a/libraries/controllers/src/controllers/UserInputMapper.cpp +++ b/libraries/controllers/src/controllers/UserInputMapper.cpp @@ -738,7 +738,7 @@ Mapping::Pointer UserInputMapper::newMapping(const QString& mappingName) { // if (request->getResult() == ResourceRequest::Success) { // result = parseMapping(QString(request->getData())); // } else { -// qCWarning(controllers) << "Failed to load mapping url <" << jsonUrl << ">" << endl; +// qCWarning(controllers) << "Failed to load mapping url <" << jsonUrl << ">" << Qt::endl; // } // request->deleteLater(); // } @@ -1177,13 +1177,13 @@ Mapping::Pointer UserInputMapper::parseMapping(const QString& json) { if (doc.isNull()) { qCDebug(controllers) << "Invalid JSON...\n"; qCDebug(controllers) << error.errorString(); - qCDebug(controllers) << "JSON was:\n" << json << endl; + qCDebug(controllers) << "JSON was:\n" << json << Qt::endl; return Mapping::Pointer(); } if (!doc.isObject()) { - qWarning() << "Mapping json Document is not an object" << endl; - qCDebug(controllers) << "JSON was:\n" << json << endl; + qWarning() << "Mapping json Document is not an object" << Qt::endl; + qCDebug(controllers) << "JSON was:\n" << json << Qt::endl; return Mapping::Pointer(); } return parseMapping(doc.object()); diff --git a/tools/ac-client/src/ACClientApp.cpp b/tools/ac-client/src/ACClientApp.cpp index 3b5db1a1b1..3b6e36b63e 100644 --- a/tools/ac-client/src/ACClientApp.cpp +++ b/tools/ac-client/src/ACClientApp.cpp @@ -49,7 +49,7 @@ ACClientApp::ACClientApp(int argc, char* argv[]) : parser.addOption(listenPortOption); if (!parser.parse(QCoreApplication::arguments())) { - qCritical() << parser.errorText() << endl; + qCritical() << parser.errorText() << Qt::endl; parser.showHelp(); Q_UNREACHABLE(); } diff --git a/tools/atp-client/src/ATPClientApp.cpp b/tools/atp-client/src/ATPClientApp.cpp index 09fcf38dff..a4b9543257 100644 --- a/tools/atp-client/src/ATPClientApp.cpp +++ b/tools/atp-client/src/ATPClientApp.cpp @@ -59,7 +59,7 @@ ATPClientApp::ATPClientApp(int argc, char* argv[]) : parser.addOption(listenPortOption); if (!parser.parse(QCoreApplication::arguments())) { - qCritical() << parser.errorText() << endl; + qCritical() << parser.errorText() << Qt::endl; parser.showHelp(); Q_UNREACHABLE(); } diff --git a/tools/ice-client/src/ICEClientApp.cpp b/tools/ice-client/src/ICEClientApp.cpp index 0301fad6f4..243ac6335d 100644 --- a/tools/ice-client/src/ICEClientApp.cpp +++ b/tools/ice-client/src/ICEClientApp.cpp @@ -45,7 +45,7 @@ ICEClientApp::ICEClientApp(int argc, char* argv[]) : parser.addOption(cacheSTUNOption); if (!parser.parse(QCoreApplication::arguments())) { - qCritical() << parser.errorText() << endl; + qCritical() << parser.errorText() << Qt::endl; parser.showHelp(); Q_UNREACHABLE(); } diff --git a/tools/nitpick/src/TestCreator.cpp b/tools/nitpick/src/TestCreator.cpp index 652292b9dc..baecb3e173 100644 --- a/tools/nitpick/src/TestCreator.cpp +++ b/tools/nitpick/src/TestCreator.cpp @@ -207,11 +207,11 @@ void TestCreator::appendTestResultsToFile(const TestResult& testResult, const QP // Create text file describing the failure QTextStream stream(&descriptionFile); - stream << "TestCreator in folder " << testResult._pathname.left(testResult._pathname.length() - 1) << endl; // remove trailing '/' - stream << "Expected image was " << testResult._expectedImageFilename << endl; - stream << "Actual image was " << testResult._actualImageFilename << endl; - stream << "Similarity index was " << testResult._errorGlobal << endl; - stream << "Worst tile was " << testResult._errorLocal << endl; + stream << "TestCreator in folder " << testResult._pathname.left(testResult._pathname.length() - 1) << Qt::endl; // remove trailing '/' + stream << "Expected image was " << testResult._expectedImageFilename << Qt::endl; + stream << "Actual image was " << testResult._actualImageFilename << Qt::endl; + stream << "Similarity index was " << testResult._errorGlobal << Qt::endl; + stream << "Worst tile was " << testResult._errorLocal << Qt::endl; descriptionFile.close(); @@ -415,7 +415,7 @@ void TestCreator::includeTest(QTextStream& textStream, const QString& testPathna QString partialPath = extractPathFromTestsDown(testPathname); QString partialPathWithoutTests = partialPath.right(partialPath.length() - 7); - textStream << "Script.include(testsRootPath + \"" << partialPathWithoutTests + "\");" << endl; + textStream << "Script.include(testsRootPath + \"" << partialPathWithoutTests + "\");" << Qt::endl; } void TestCreator::createTests(const QString& clientProfile) { @@ -994,7 +994,7 @@ void TestCreator::createRecursiveScript(const QString& directory, bool interacti QTextStream textStream(&recursiveTestsFile); - textStream << "// This is an automatically generated file, created by nitpick" << endl; + textStream << "// This is an automatically generated file, created by nitpick" << Qt::endl; // Include 'nitpick.js' QString branch = nitpick->getSelectedBranch(); @@ -1002,31 +1002,31 @@ void TestCreator::createRecursiveScript(const QString& directory, bool interacti textStream << "PATH_TO_THE_REPO_PATH_UTILS_FILE = \"https://raw.githubusercontent.com/" + user + "/hifi_tests/" + branch + "/tests/utils/branchUtils.js\";" - << endl; - textStream << "Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE);" << endl << endl; + << Qt::endl; + textStream << "Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE);" << Qt::endl << Qt::endl; // The 'depth' variable is used to signal when to start running the recursive scripts - textStream << "if (typeof depth === 'undefined') {" << endl; - textStream << " depth = 0;" << endl; - textStream << " nitpick = createNitpick(Script.resolvePath(\".\"));" << endl; - textStream << " testsRootPath = nitpick.getTestsRootPath();" << endl << endl; - textStream << " nitpick.enableRecursive();" << endl; - textStream << " nitpick.enableAuto();" << endl; - textStream << "} else {" << endl; - textStream << " depth++" << endl; - textStream << "}" << endl << endl; + textStream << "if (typeof depth === 'undefined') {" << Qt::endl; + textStream << " depth = 0;" << Qt::endl; + textStream << " nitpick = createNitpick(Script.resolvePath(\".\"));" << Qt::endl; + textStream << " testsRootPath = nitpick.getTestsRootPath();" << Qt::endl << Qt::endl; + textStream << " nitpick.enableRecursive();" << Qt::endl; + textStream << " nitpick.enableAuto();" << Qt::endl; + textStream << "} else {" << Qt::endl; + textStream << " depth++" << Qt::endl; + textStream << "}" << Qt::endl << Qt::endl; // Now include the test scripts for (int i = 0; i < directories.length(); ++i) { includeTest(textStream, directories.at(i)); } - textStream << endl; - textStream << "if (depth > 0) {" << endl; - textStream << " depth--;" << endl; - textStream << "} else {" << endl; - textStream << " nitpick.runRecursive();" << endl; - textStream << "}" << endl << endl; + textStream << Qt::endl; + textStream << "if (depth > 0) {" << Qt::endl; + textStream << " depth--;" << Qt::endl; + textStream << "} else {" << Qt::endl; + textStream << " nitpick.runRecursive();" << Qt::endl; + textStream << "}" << Qt::endl << Qt::endl; recursiveTestsFile.close(); } diff --git a/tools/skeleton-dump/src/SkeletonDumpApp.cpp b/tools/skeleton-dump/src/SkeletonDumpApp.cpp index 42a1c78090..a736cf60b8 100644 --- a/tools/skeleton-dump/src/SkeletonDumpApp.cpp +++ b/tools/skeleton-dump/src/SkeletonDumpApp.cpp @@ -29,7 +29,7 @@ SkeletonDumpApp::SkeletonDumpApp(int argc, char* argv[]) : QCoreApplication(argc parser.addOption(inputFilenameOption); if (!parser.parse(QCoreApplication::arguments())) { - qCritical() << parser.errorText() << endl; + qCritical() << parser.errorText() << Qt::endl; parser.showHelp(); _returnCode = 1; return; diff --git a/tools/vhacd-util/src/VHACDUtilApp.cpp b/tools/vhacd-util/src/VHACDUtilApp.cpp index 3d675f8baf..bf97adbd92 100644 --- a/tools/vhacd-util/src/VHACDUtilApp.cpp +++ b/tools/vhacd-util/src/VHACDUtilApp.cpp @@ -188,7 +188,7 @@ VHACDUtilApp::VHACDUtilApp(int argc, char* argv[]) : if (!parser.parse(QCoreApplication::arguments())) { - qCritical() << parser.errorText() << endl; + qCritical() << parser.errorText() << Qt::endl; parser.showHelp(); Q_UNREACHABLE(); }