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

diff --git a/tools/MessageView/MessageView_ActionsTest.cxx b/tools/MessageView/MessageView_ActionsTest.cxx
index 50f2365e7fe03f05409027f83624efbf10494162..f26ca8653eccfd63f04212d9a793f1960c856cfe 100644 (file)
--- 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 ee7adaa8ad7da86a13305fdbfcbb8f4d71bd8620..4134913a8489d84cc18082ae6d0906bfeaf89ccf 100644 (file)
--- 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);
   }