diff -r 11d3954df52a -r 627c4a0fd0e7 src/hbcore/gui/hbview.h --- a/src/hbcore/gui/hbview.h Thu May 27 13:10:59 2010 +0300 +++ b/src/hbcore/gui/hbview.h Fri Jun 11 13:58:22 2010 +0300 @@ -50,17 +50,17 @@ public: - enum HbViewFlag - { + enum HbViewFlag { ViewFlagNone = 0, - ViewTitleBarMinimizable = 0x01, - ViewTitleBarMinimized = 0x02, - ViewTitleBarHidden = 0x04, + ViewTitleBarMinimizable = 0x01, + ViewTitleBarMinimized = 0x02, + ViewTitleBarHidden = 0x04, ViewTitleBarTransparent = 0x08, ViewTitleBarFloating = 0x10, ViewStatusBarHidden = 0x20, ViewStatusBarTransparent = 0x40, - ViewStatusBarFloating = 0x80 + ViewStatusBarFloating = 0x80, + ViewDisableRelayout = 0x100 }; Q_DECLARE_FLAGS(HbViewFlags, HbViewFlag) @@ -74,11 +74,11 @@ HbMenu *menu() const; void setMenu(HbMenu *menu); - HbMenu* takeMenu(); + HbMenu *takeMenu(); HbToolBar *toolBar() const; void setToolBar(HbToolBar *toolBar); - HbToolBar* takeToolBar(); + HbToolBar *takeToolBar(); HbDockWidget *dockWidget() const; void setDockWidget(HbDockWidget *dockWidget); @@ -99,9 +99,11 @@ void setStatusBarVisible(bool visible); enum { Type = Hb::ItemType_View }; - int type() const { return Type; } + int type() const { + return Type; + } - enum ActionContainer{ + enum ActionContainer { NotSpecified, OptionsMenu, ToolBar @@ -126,7 +128,7 @@ void dockWidgetChanged(); protected: - HbView( HbViewPrivate &dd, QGraphicsItem *parent ); + HbView(HbViewPrivate &dd, QGraphicsItem *parent); bool event(QEvent *event); void changeEvent(QEvent *event);