From: snn <sergey.nikonov@opencascade.com>
Date: Thu, 25 Mar 2021 08:45:44 +0000 (+0300)
Subject: 0031362: Inspectors - MessageView plugin for message alerts (fix conflicts)
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=1537c15d9936b8dd1b6cfd7e94da271f80a171c9;p=occt.git

0031362: Inspectors - MessageView plugin for message alerts (fix conflicts)
---

diff --git a/tools/MessageView/MessageView_ActionsTest.cxx b/tools/MessageView/MessageView_ActionsTest.cxx
index 50f2365e7f..f26ca8653e 100644
--- a/tools/MessageView/MessageView_ActionsTest.cxx
+++ b/tools/MessageView/MessageView_ActionsTest.cxx
@@ -49,7 +49,7 @@
 #include <QWidget>
 #include <Standard_WarningsRestore.hxx>
 
-#define DEBUG_ALERTS
+//#define DEBUG_ALERTS
 
 #ifdef DEBUG_ALERTS
 #include <Message_Level.hxx>
diff --git a/tools/MessageView/MessageView_Window.cxx b/tools/MessageView/MessageView_Window.cxx
index ee7adaa8ad..4134913a84 100644
--- a/tools/MessageView/MessageView_Window.cxx
+++ b/tools/MessageView/MessageView_Window.cxx
@@ -523,7 +523,7 @@ void MessageView_Window::onTreeViewContextMenuRequested (const QPoint& thePositi
     anAction->setChecked (isTraceOnly);
     aMenu->addAction (anAction);*/
 
-    anAction = ViewControl_Tools::CreateAction (tr ("Unit by name"), SLOT (onUnitByName()), myMainWindow, this);
+    QAction* anAction = anAction = ViewControl_Tools::CreateAction (tr ("Unit by name"), SLOT (onUnitByName()), myMainWindow, this);
     anAction->setCheckable (true);
     aMenu->addAction (anAction);
   }