Upgrade to paraview 5.4

diff --git a/src/PVGUI/PVGUI_DataModel.cxx b/src/PVGUI/PVGUI_DataModel.cxx
index cc1055d4db4cfefafd68e30edd66ae159bdff42e..8f4805fc3b773c23353c6f96742dcd8c18e8e4b5 100644 (file)
--- a/src/PVGUI/PVGUI_DataModel.cxx
+++ b/src/PVGUI/PVGUI_DataModel.cxx
@@ -45,7 +45,6 @@
 // ParaView include
 #include <pqApplicationCore.h>
 #include <pqServer.h>
-#include <pqFixPathsInStateFilesBehavior.h>
 
 const QString PVGUI_DataModel::RESTORE_FLAG_FILE = "do_restore_paravis_references.par";
 
@@ -265,9 +264,7 @@ bool PVGUI_DataModel::open( const QString& theName, CAM_Study* theStudy, QString
               processAllFilesInState(aFullPath, srcFilesEmpty, aTmpDir.toStdString().c_str(), true);
             }
 
-          pqFixPathsInStateFilesBehavior::blockDialog(true);
           mod->loadParaviewState(aFullPath);
-          pqFixPathsInStateFilesBehavior::blockDialog(false);
           ret = true;
         }
       ret = true;

diff --git a/test/standalone/gui/PVViewer_Behaviors.cxx b/test/standalone/gui/PVViewer_Behaviors.cxx
index c426bcbf434967d55276cc7245472ba3df17ddaa..fde2a592b3b3f2f28b8f0d702232272f1f94c010 100644 (file)
--- a/test/standalone/gui/PVViewer_Behaviors.cxx
+++ b/test/standalone/gui/PVViewer_Behaviors.cxx
@@ -46,7 +46,6 @@
 #include <pqCollaborationBehavior.h>
 #include <pqVerifyRequiredPluginBehavior.h>
 #include <pqPluginSettingsBehavior.h>
-#include <pqFixPathsInStateFilesBehavior.h>
 #include <pqApplyBehavior.h>
 
 #include <pqPropertiesPanel.h>
@@ -81,7 +80,6 @@ void PVViewer_Behaviors::instanciateMinimalBehaviors(QMainWindow * desk)
       new pqAlwaysConnectedBehavior(this);  // client always connected to a server
       new pqVerifyRequiredPluginBehavior(this);
       new pqPluginSettingsBehavior(this);
-      new pqFixPathsInStateFilesBehavior(this);
       new pqCrashRecoveryBehavior(this);
       new pqCommandLineOptionsBehavior(this);