Reintroduce deprecated endl for Ubuntu Focal (issue #22)

AD-Vega · Nov 15, 2020 · d5b94b7 · d5b94b7
1 parent 8ab8c19
commit d5b94b7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/api/qarvcamera.cpp b/src/api/qarvcamera.cpp
@@ -584,9 +584,9 @@ int QArvCamera::getEstimatedBW() {
 
 QTextStream& operator<<(QTextStream& out, QArvCamera* camera) {
     auto id = camera->getId();
-    out << id.vendor << Qt::endl
-        << id.model << Qt::endl
-        << id.id << Qt::endl;
+    out << id.vendor << endl
+        << id.model << endl
+        << id.id << endl;
     QArvCamera::QArvFeatureTree::recursiveSerialization(out,
                                                         camera,
                                                         camera->featuretree);

diff --git a/src/qarvfeaturetree.cpp b/src/qarvfeaturetree.cpp
@@ -107,7 +107,7 @@ void QArvCamera::QArvFeatureTree::recursiveSerialization(
 
     if (tree->children().count() != 0) {
         if (QString("Root") != tree->feature())
-            out << "Category: " << tree->feature() << Qt::endl;
+            out << "Category: " << tree->feature() << endl;
         foreach (auto child, tree->children()) {
             recursiveSerialization(out, camera, child);
         }
@@ -126,28 +126,28 @@ void QArvCamera::QArvFeatureTree::recursiveSerialization(
         arv_gc_register_get(ARV_GC_REGISTER(node),
                             r.value.data(), r.length, NULL);
         out << "Register\t" << QString::number(r.length) << "\t"
-            << QString("0x") + r.value.toHex() << Qt::endl;
+            << QString("0x") + r.value.toHex() << endl;
     } else if (ARV_IS_GC_ENUMERATION(node)) {
         out << "Enumeration\t"
             << arv_gc_enumeration_get_string_value(ARV_GC_ENUMERATION(node),
                                                NULL)
-            << Qt::endl;
+            << endl;
     } else if (ARV_IS_GC_STRING(node)) {
         out << "String\t" << arv_gc_string_get_value(ARV_GC_STRING(node), NULL)
-            << Qt::endl;
+            << endl;
     } else if (ARV_IS_GC_FLOAT(node)) {
 #ifdef ARAVIS_HAVE_08_API
       out << "Float\t" << arv_gc_float_get_value(ARV_GC_FLOAT(node), NULL)
-          << "\t" << arv_gc_float_get_unit(ARV_GC_FLOAT(node)) << Qt::endl;
+          << "\t" << arv_gc_float_get_unit(ARV_GC_FLOAT(node)) << endl;
 #else
       out << "Float\t" << arv_gc_float_get_value(ARV_GC_FLOAT(node), NULL)
-          << "\t" << arv_gc_float_get_unit(ARV_GC_FLOAT(node), NULL) << Qt::endl;
+          << "\t" << arv_gc_float_get_unit(ARV_GC_FLOAT(node), NULL) << endl;
 #endif
     } else if (ARV_IS_GC_BOOLEAN(node)) {
         out << "Boolean\t" << arv_gc_boolean_get_value(ARV_GC_BOOLEAN(node),
-                                                       NULL) << Qt::endl;
+                                                       NULL) << endl;
     } else if (ARV_IS_GC_INTEGER(node)) {
         out << "Integer\t" << arv_gc_integer_get_value(ARV_GC_INTEGER(node),
-                                                       NULL) << Qt::endl;
+                                                       NULL) << endl;
     }
 }
diff --git a/src/qarvmainwindow.cpp b/src/qarvmainwindow.cpp
@@ -948,7 +948,7 @@ void QArvMainWindow::on_loadSettingsButton_clicked(bool checked) {
             readBack.seek(0);
             wholefile >> camera;
             readBack << camera;
-            readBack << Qt::endl << Qt::endl;
+            readBack << endl << endl;
         }
         QStringList failures;
         wholefile.seek(0);
@@ -957,7 +957,7 @@ void QArvMainWindow::on_loadSettingsButton_clicked(bool checked) {
             QString actual = readBack.readLine();
             if (wanted != actual) {
                 logMessage() << "Setting failure, wanted:"
-                             << wanted << Qt::endl
+                             << wanted << endl
                              << "actual:" << actual;
                 failures << wanted;
             }