Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0052615: Inactive "save" function after renaming any object
[modules/gui.git]
/
src
/
LightApp
/
LightApp_DataObject.cxx
diff --git
a/src/LightApp/LightApp_DataObject.cxx
b/src/LightApp/LightApp_DataObject.cxx
index b840feae12c6d7d6b7861769f348a5f903705f79..40c65933bd09b8c9cbb170cdf6323e818cae6a06 100644
(file)
--- a/
src/LightApp/LightApp_DataObject.cxx
+++ b/
src/LightApp/LightApp_DataObject.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
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
@@
-393,7
+393,7
@@
QString LightApp_DataObject::componentDataType() const
{
if ( myCompDataType.isEmpty() ) {
SUIT_DataObject* aCompObj = componentObject();
{
if ( myCompDataType.isEmpty() ) {
SUIT_DataObject* aCompObj = componentObject();
-
LightApp_ModuleObject* anObj = dynamic_cast<LightApp
_ModuleObject*>( aCompObj );
+
CAM_ModuleObject* anObj = dynamic_cast<CAM
_ModuleObject*>( aCompObj );
if ( anObj ) {
CAM_DataModel* aModel = anObj->dataModel();
if ( aModel ) {
if ( anObj ) {
CAM_DataModel* aModel = anObj->dataModel();
if ( aModel ) {
@@
-450,7
+450,7
@@
bool LightApp_DataObject::compare( const QVariant& left, const QVariant& right,
rid = idsRight[i].toInt( &okRight );
if ( okLeft && okRight ) {
// both seem to be correct integer ID
rid = idsRight[i].toInt( &okRight );
if ( okLeft && okRight ) {
// both seem to be correct integer ID
-
return lid < rid
;
+
if ( lid < rid ) return true
;
}
else if ( okLeft || okRight ) {
// objects with correct (int) ID have higher priority
}
else if ( okLeft || okRight ) {
// objects with correct (int) ID have higher priority