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
Merge Qt5 porting.
[modules/gui.git]
/
src
/
Qtx
/
QtxWorkstack.cxx
diff --git
a/src/Qtx/QtxWorkstack.cxx
b/src/Qtx/QtxWorkstack.cxx
index 6721d6d8a65ac8116cecf7dfa9fcbd684e727623..dd071fe5f6fb3760879521c8b1467a9e6899a57f 100644
(file)
--- a/
src/Qtx/QtxWorkstack.cxx
+++ b/
src/Qtx/QtxWorkstack.cxx
@@
-2203,7
+2203,7
@@
int QtxWorkstack::accel( const int id ) const
{
int res = 0;
if ( myActionsMap.contains( id ) )
{
int res = 0;
if ( myActionsMap.contains( id ) )
- res = myActionsMap[id]->shortcut();
+ res = myActionsMap[id]->shortcut()
[0]
;
return res;
}
return res;
}
@@
-2651,7
+2651,7
@@
void QtxWorkstack::insertWidget( QWidget* wid, QWidget* pWid, QWidget* after )
for ( QWidgetList::iterator itr = moveList.begin(); itr != moveList.end(); ++itr )
{
(*itr)->setParent( pWid );
for ( QWidgetList::iterator itr = moveList.begin(); itr != moveList.end(); ++itr )
{
(*itr)->setParent( pWid );
- (*itr)->set
Shown
( map.contains( *itr ) ? map[*itr] : false );
+ (*itr)->set
Visible
( map.contains( *itr ) ? map[*itr] : false );
}
}
}
}