Refs #6315. Adding comment on warnings removal.

mantidproject · May 1, 2013 · 54f4947 · 54f4947
1 parent d620060
commit 54f4947
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 7 deletions.
diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/ColorUpdater.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/ColorUpdater.cpp
@@ -1,12 +1,21 @@
 #include "MantidVatesSimpleGuiViewWidgets/ColorUpdater.h"
 #include "MantidVatesSimpleGuiViewWidgets/ColorSelectionWidget.h"
 
+// Have to deal with ParaView warnings and Intel compiler the hard way.
+#if defined(__INTEL_COMPILER)
+  #pragma warning disable 1170
+#endif
+
 #include <pqChartValue.h>
 #include <pqColorMapModel.h>
 #include <pqPipelineRepresentation.h>
 #include <pqScalarsToColors.h>
 #include <pqSMAdaptor.h>
-#include "MantidVatesSimpleGuiViewWidgets/vtkSMProxy_Silent.h"
+#include <vtkSMProxy.h>
+
+#if defined(__INTEL_COMPILER)
+  #pragma warning enable 1170
+#endif
 
 #include <QColor>
 #include <QList>

diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp
@@ -12,6 +12,11 @@
 #include "MantidQtAPI/InterfaceManager.h"
 #include "MantidKernel/DynamicFactory.h"
 
+// Have to deal with ParaView warnings and Intel compiler the hard way.
+#if defined(__INTEL_COMPILER)
+  #pragma warning disable 1170
+#endif
+
 #include <pqActiveObjects.h>
 #include <pqAnimationManager.h>
 #include <pqAnimationScene.h>
@@ -29,7 +34,7 @@
 #include <vtkSMDoubleVectorProperty.h>
 #include <vtkSMPropertyHelper.h>
 #include <vtkSMProxyManager.h>
-#include "MantidVatesSimpleGuiViewWidgets/vtkSMProxy_Silent.h"
+#include <vtkSMProxy.h>
 #include <vtkSMSourceProxy.h>
 #include <vtkSMReaderFactory.h>
 #include <vtksys/SystemTools.hxx>
@@ -64,6 +69,10 @@
 #include <pqViewStreamingBehavior.h>
 #include <pqVerifyRequiredPluginBehavior.h>
 
+#if defined(__INTEL_COMPILER)
+  #pragma warning enable 1170
+#endif
+
 #include <QAction>
 #include <QDesktopServices>
 #include <QHBoxLayout>

diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MultisliceView.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MultisliceView.cpp
@@ -7,6 +7,11 @@
 #include "MantidQtFactory/WidgetFactory.h"
 #include "MantidVatesAPI/RebinningKnowledgeSerializer.h"
 
+// Have to deal with ParaView warnings and Intel compiler the hard way.
+#if defined(__INTEL_COMPILER)
+  #pragma warning disable 1170
+#endif
+
 #include <pqActiveObjects.h>
 #include <pqApplicationCore.h>
 #include <pqDataRepresentation.h>
@@ -17,7 +22,11 @@
 #include <pqServerManagerModel.h>
 #include <vtkContextMouseEvent.h>
 #include <vtkSMPropertyHelper.h>
-#include "MantidVatesSimpleGuiViewWidgets/vtkSMProxy_Silent.h"
+#include <vtkSMProxy.h>
+
+#if defined(__INTEL_COMPILER)
+  #pragma warning enable 1170
+#endif
 
 #include <QString>
 

diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/SplatterPlotView.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/SplatterPlotView.cpp
@@ -1,5 +1,10 @@
 #include "MantidVatesSimpleGuiViewWidgets/SplatterPlotView.h"
 
+// Have to deal with ParaView warnings and Intel compiler the hard way.
+#if defined(__INTEL_COMPILER)
+  #pragma warning disable 1170
+#endif
+
 #include <pqActiveObjects.h>
 #include <pqApplicationCore.h>
 #include <pqDataRepresentation.h>
@@ -11,6 +16,10 @@
 #include <vtkProperty.h>
 #include <vtkSMPropertyHelper.h>
 
+#if defined(__INTEL_COMPILER)
+  #pragma warning enable 1170
+#endif
+
 #include <QMessageBox>
 
 namespace Mantid

diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/StandardView.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/StandardView.cpp
@@ -1,5 +1,10 @@
 #include "MantidVatesSimpleGuiViewWidgets/StandardView.h"
 
+// Have to deal with ParaView warnings and Intel compiler the hard way.
+#if defined(__INTEL_COMPILER)
+  #pragma warning disable 1170
+#endif
+
 #include <pqActiveObjects.h>
 #include <pqApplicationCore.h>
 #include <pqDataRepresentation.h>
@@ -9,7 +14,11 @@
 #include <pqRenderView.h>
 #include <vtkDataObject.h>
 #include <vtkSMPropertyHelper.h>
-#include "MantidVatesSimpleGuiViewWidgets/vtkSMProxy_Silent.h"
+#include <vtkSMProxy.h>
+
+#if defined(__INTEL_COMPILER)
+  #pragma warning enable 1170
+#endif
 
 #include <QHBoxLayout>
 #include <QMessageBox>

diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/ThreesliceView.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/ThreesliceView.cpp
@@ -1,6 +1,10 @@
 #include "MantidVatesSimpleGuiViewWidgets/ThreesliceView.h"
 #include "MantidVatesSimpleGuiViewWidgets/LibHelper.h"
 
+#if defined(__INTEL_COMPILER)
+  #pragma warning disable 1170
+#endif
+
 #include <pqActiveObjects.h>
 #include <pqApplicationCore.h>
 #include <pqDataRepresentation.h>
@@ -10,7 +14,11 @@
 #include <pqPluginManager.h>
 #include <pqRenderView.h>
 #include <vtkSMPropertyHelper.h>
-#include "MantidVatesSimpleGuiViewWidgets/vtkSMProxy_Silent.h"
+#include <vtkSMProxy.h>
+
+#if defined(__INTEL_COMPILER)
+  #pragma warning enable 1170
+#endif
 
 #include <QMessageBox>
 

diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/TimeControlWidget.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/TimeControlWidget.cpp
@@ -1,10 +1,19 @@
 #include "MantidVatesSimpleGuiViewWidgets/TimeControlWidget.h"
 
+// Have to deal with ParaView warnings and Intel compiler the hard way.
+#if defined(__INTEL_COMPILER)
+  #pragma warning disable 1170
+#endif
+
 #include <pqAnimationManager.h>
 #include <pqAnimationScene.h>
 #include <pqPVApplicationCore.h>
 #include <vtkSMPropertyHelper.h>
-#include "MantidVatesSimpleGuiViewWidgets/vtkSMProxy_Silent.h"
+#include <vtkSMProxy.h>
+
+#if defined(__INTEL_COMPILER)
+  #pragma warning enable 1170
+#endif
 
 namespace Mantid
 {

diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/ViewBase.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/ViewBase.cpp
@@ -1,5 +1,9 @@
 #include "MantidVatesSimpleGuiViewWidgets/ViewBase.h"
 
+#if defined(__INTEL_COMPILER)
+  #pragma warning disable 1170
+#endif
+
 #include <pqActiveObjects.h>
 #include <pqAnimationManager.h>
 #include <pqAnimationScene.h>
@@ -15,9 +19,13 @@
 #include <vtkSMDoubleVectorProperty.h>
 #include <vtkSMPropertyHelper.h>
 #include <vtkSMPropertyIterator.h>
-#include "MantidVatesSimpleGuiViewWidgets/vtkSMProxy_Silent.h"
+#include <vtkSMProxy.h>
 #include <vtkSMSourceProxy.h>
 
+#if defined(__INTEL_COMPILER)
+  #pragma warning enable 1170
+#endif
+
 #include <QDebug>
 #include <QHBoxLayout>
 #include <QPointer>