From: rnv <rnv@opencascade.com>
Date: Sat, 20 Feb 2016 11:35:00 +0000 (+0300)
Subject: Suppress compiler warning.
X-Git-Tag: V7_8_0a2~14
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5af7b8a0ca638d4103d714357fe9deef091ce3a1;p=modules%2Fparavis.git

Suppress compiler warning.
---

diff --git a/src/PVGUI/PVGUI_DataModel.cxx b/src/PVGUI/PVGUI_DataModel.cxx
index 7917899b..1473313f 100644
--- a/src/PVGUI/PVGUI_DataModel.cxx
+++ b/src/PVGUI/PVGUI_DataModel.cxx
@@ -349,7 +349,7 @@ bool PVGUI_DataModel::save( QStringList& theListOfFiles)
         case 1: // Save referenced files only if this is the builtin server
           aServer = pqApplicationCore::instance()->getActiveServer();
           if (aServer)
-            isBuiltIn != aServer->isRemote();
+            isBuiltIn = !aServer->isRemote();
           if(isBuiltIn)
             {
               createAndCheckRestoreFlag(aTmpDir, theListOfFiles, unused);
diff --git a/src/Plugins/ArrayRenamer/pqArraysEditorPropertyWidget.cxx b/src/Plugins/ArrayRenamer/pqArraysEditorPropertyWidget.cxx
index 2de62af5..a7b526bd 100644
--- a/src/Plugins/ArrayRenamer/pqArraysEditorPropertyWidget.cxx
+++ b/src/Plugins/ArrayRenamer/pqArraysEditorPropertyWidget.cxx
@@ -181,6 +181,7 @@ public:
       emit dataChanged( index( 1, min ) , index( 1, max ) );
       return true;
     }
+    return Superclass::setData(idx,value,role);
   }
 
   //------------------------------------------------------------------
@@ -357,6 +358,7 @@ public:
 	return true;
       }
     }
+    return Superclass::setData(idx,value,role);
   }
 
   //------------------------------------------------------------------
diff --git a/src/Plugins/JSONReader/ParaViewPlugin/vtkJSONReader.cxx b/src/Plugins/JSONReader/ParaViewPlugin/vtkJSONReader.cxx
index 0d450c36..70e84ad0 100644
--- a/src/Plugins/JSONReader/ParaViewPlugin/vtkJSONReader.cxx
+++ b/src/Plugins/JSONReader/ParaViewPlugin/vtkJSONReader.cxx
@@ -156,7 +156,7 @@ int vtkJSONReader::RequestData(vtkInformation*,
     return 0;
 
   try {
-    return this->Parse(root, output_table);
+    this->Parse(root, output_table);
     return 1;
   } 
   catch(vtkJSONException e)  {
@@ -213,7 +213,7 @@ int vtkJSONReader::CanParseFile(const char *fname, Json::Value &root)
 }
 
 //---------------------------------------------------
-int vtkJSONReader::Parse(Json::Value& root, vtkTable *table) {
+void vtkJSONReader::Parse(Json::Value& root, vtkTable *table) {
   bool hasShortNames = false;
   bool hasUnits = false;
   Container container;
diff --git a/src/Plugins/JSONReader/ParaViewPlugin/vtkJSONReader.h b/src/Plugins/JSONReader/ParaViewPlugin/vtkJSONReader.h
index 66badcfd..2a75aeee 100644
--- a/src/Plugins/JSONReader/ParaViewPlugin/vtkJSONReader.h
+++ b/src/Plugins/JSONReader/ParaViewPlugin/vtkJSONReader.h
@@ -55,9 +55,11 @@ public:
   virtual int RequestData(vtkInformation*, 
 			  vtkInformationVector**,
 			  vtkInformationVector*);
+
+protected:
   // Decription:
   // Parse the Json Value corresponding to the root data from the file
-  virtual int Parse(Json::Value& root, vtkTable *theTable);
+  virtual void Parse(Json::Value& root, vtkTable *theTable);
 
   // Decription:
   // Verify if file exists and can be read by the parser
diff --git a/src/Plugins/MEDReader/IO/MEDFileFieldRepresentationTree.cxx b/src/Plugins/MEDReader/IO/MEDFileFieldRepresentationTree.cxx
index 4d3c82bd..87d4837d 100644
--- a/src/Plugins/MEDReader/IO/MEDFileFieldRepresentationTree.cxx
+++ b/src/Plugins/MEDReader/IO/MEDFileFieldRepresentationTree.cxx
@@ -175,6 +175,7 @@ vtkIdTypeArray *ELGACmp::createNew(const ParaMEDMEM::MEDFileFieldGlobsReal *glob
   _loc_names=locNames;
   _elgas=elgas;
   _defs.push_back(defs);
+  return elga;
 }
 
 void ELGACmp::appendELGAIfAny(vtkDataSet *ds) const