equal
deleted
inserted
replaced
1988 } else if (nextMarker == SequenceMarker) { |
1988 } else if (nextMarker == SequenceMarker) { |
1989 int dummy; |
1989 int dummy; |
1990 #ifdef QT_NO_TABBAR |
1990 #ifdef QT_NO_TABBAR |
1991 const int tabBarShape = 0; |
1991 const int tabBarShape = 0; |
1992 #endif |
1992 #endif |
1993 QDockAreaLayoutInfo *info = new QDockAreaLayoutInfo(sep, dockPos, o, |
1993 QDockAreaLayoutItem item(new QDockAreaLayoutInfo(sep, dockPos, o, |
1994 tabBarShape, mainWindow); |
1994 tabBarShape, mainWindow)); |
1995 QDockAreaLayoutItem item(info); |
|
1996 stream >> item.pos >> item.size >> dummy >> dummy; |
1995 stream >> item.pos >> item.size >> dummy >> dummy; |
1997 if (!info->restoreState(stream, widgets, testing)) |
1996 //we need to make sure the element is in the list so the dock widget can eventually be docked correctly |
|
1997 if (!testing) |
|
1998 item_list.append(item); |
|
1999 |
|
2000 //here we need to make sure we change the item in the item_list |
|
2001 QDockAreaLayoutItem &lastItem = testing ? item : item_list.last(); |
|
2002 |
|
2003 if (!lastItem.subinfo->restoreState(stream, widgets, testing)) |
1998 return false; |
2004 return false; |
1999 |
2005 |
2000 if (!testing) { |
|
2001 item_list.append(item); |
|
2002 } |
|
2003 } else { |
2006 } else { |
2004 return false; |
2007 return false; |
2005 } |
2008 } |
2006 } |
2009 } |
2007 |
2010 |