Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.salome-platform.org/modules/hydro
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ImportObstacleFromFileOp.h
diff --git
a/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.h
b/src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.h
index 05b217fdefb8677ffd3d54f7fd9b814a412dc59f..d39264735fc42bfefcfa720f7d9e538e6e1986f4 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.h
+++ b/
src/HYDROGUI/HYDROGUI_ImportObstacleFromFileOp.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,8
+20,8
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-#ifndef HYDROGUI_IMPORTOBSTACLEFROMFILE_H
-#define HYDROGUI_IMPORTOBSTACLEFROMFILE_H
+#ifndef HYDROGUI_IMPORTOBSTACLEFROMFILE
OP
_H
+#define HYDROGUI_IMPORTOBSTACLEFROMFILE
OP
_H
#include "HYDROGUI_Operation.h"
#include "HYDROGUI_Operation.h"
@@
-42,7
+42,8
@@
protected:
virtual HYDROGUI_InputPanel* createInputPanel() const;
virtual HYDROGUI_InputPanel* createInputPanel() const;
- virtual bool processApply( int& theUpdateFlags, QString& theErrorMsg );
+ virtual bool processApply( int& theUpdateFlags, QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries );
private:
SUIT_FileDlg* myFileDlg;
private:
SUIT_FileDlg* myFileDlg;