Revert "UMVE: Fix Qt 5.15 deprecation warnings"

This reverts commit 877e0a3.
andre-schulz · Jul 21, 2024 · 91e9369 · 91e9369
1 parent d3046fe
commit 91e9369
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/apps/umve/batchoperations.cc b/apps/umve/batchoperations.cc
@@ -17,7 +17,6 @@
 #include <QMessageBox>
 #include <QProgressDialog>
 #include <QApplication>
-#include <QAbstractEventDispatcher>
 
 #include "util/file_system.h"
 #include "mve/mesh_io_ply.h"
@@ -550,7 +549,7 @@ BatchGenerateThumbs::on_generate (void)
         return;
 
     this->setDisabled(true);
-    while (QApplication::eventDispatcher()->hasPendingEvents())
+    while (QApplication::hasPendingEvents())
         QApplication::processEvents();
 
     std::string embedding_name = this->embedding_name.text().toStdString();

diff --git a/apps/umve/sceneoverview.cc b/apps/umve/sceneoverview.cc
@@ -147,7 +147,7 @@ SceneOverview::add_view_to_layout (std::size_t id, mve::View::Ptr view)
     QListWidgetItem* item = new QListWidgetItem(icon,
         tr("%1\n%2").arg(name, images));
     if (!cam_valid)
-        item->setBackground(QColor(255, 221, 221)); // #ffdddd
+        item->setBackgroundColor(QColor(255, 221, 221)); // #ffdddd
     item->setData(Qt::UserRole, (int)id);
     this->viewlist->addItem(item);
 }

diff --git a/apps/umve/viewinspect/viewinspect.cc b/apps/umve/viewinspect/viewinspect.cc
@@ -229,7 +229,7 @@ ViewInspect::show_details (bool show)
 void
 ViewInspect::update_actions (void)
 {
-    bool active = !!this->scroll_image->get_pixmap();
+    bool active = this->scroll_image->get_pixmap() != nullptr;
     this->action_zoom_fit->setEnabled(active);
     this->action_zoom_in->setEnabled(active);
     this->action_zoom_out->setEnabled(active);
@@ -700,7 +700,7 @@ ViewInspect::on_ply_export (void)
 void
 ViewInspect::on_image_export (void)
 {
-    if (!this->scroll_image->get_image()->pixmap(Qt::ReturnByValue))
+    if (!this->scroll_image->get_image()->pixmap())
     {
         QMessageBox::critical(this, "Cannot save image", "No such image");
         return;