| mtoolbar.h | mtoolbar.h | |||
|---|---|---|---|---|
| skipping to change at line 147 | skipping to change at line 147 | |||
| protected: | protected: | |||
| /*! | /*! | |||
| \brief protected constructor | \brief protected constructor | |||
| \param dd Shared private class | \param dd Shared private class | |||
| \param model The model. This must not be NULL. | \param model The model. This must not be NULL. | |||
| \param parent Parent widget | \param parent Parent widget | |||
| */ | */ | |||
| MToolBar(MToolBarPrivate *dd, MWidgetModel *model, QGraphicsItem *paren t); | MToolBar(MToolBarPrivate *dd, MWidgetModel *model, QGraphicsItem *paren t); | |||
| //! \reimp | ||||
| virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *event); | ||||
| //! \reimp_end | ||||
| Q_DECLARE_PRIVATE(MToolBar) | Q_DECLARE_PRIVATE(MToolBar) | |||
| private: | private: | |||
| Q_DISABLE_COPY(MToolBar) | Q_DISABLE_COPY(MToolBar) | |||
| friend class MToolBarView; | friend class MToolBarView; | |||
| #ifdef UNIT_TEST | #ifdef UNIT_TEST | |||
| friend class Ut_MToolBar; | friend class Ut_MToolBar; | |||
| friend class Ut_MToolBarView; | friend class Ut_MToolBarView; | |||
| End of changes. 1 change blocks. | ||||
| 0 lines changed or deleted | 4 lines changed or added | |||
| mwindow.h | mwindow.h | |||
|---|---|---|---|---|
| skipping to change at line 542 | skipping to change at line 542 | |||
| Q_PRIVATE_SLOT(d_func(), void _q_exitDisplayStabilized()) | Q_PRIVATE_SLOT(d_func(), void _q_exitDisplayStabilized()) | |||
| #ifdef HAVE_GCONF | #ifdef HAVE_GCONF | |||
| Q_PRIVATE_SLOT(d_func(), void _q_updateMinimizedSoftwareSwitch()) | Q_PRIVATE_SLOT(d_func(), void _q_updateMinimizedSoftwareSwitch()) | |||
| #endif | #endif | |||
| /* | /* | |||
| For testing purposes. | For testing purposes. | |||
| Returns a MSceneManager::TransitionMode | Returns a MSceneManager::TransitionMode | |||
| */ | */ | |||
| int orientationChangeTransitionMode(); | int orientationChangeTransitionMode(); | |||
| #ifdef Q_WS_X11 | ||||
| /* | ||||
| For testing purposes. | ||||
| Sets variables set by MApplication while processing x | ||||
| property events. | ||||
| */ | ||||
| void setWindowIconicState(bool isIconic); | ||||
| void setWindowAlwaysMapped(bool alwaysMapped); | ||||
| #endif | ||||
| friend class MApplicationPrivate; | friend class MApplicationPrivate; | |||
| friend class MSceneManagerPrivate; | friend class MSceneManagerPrivate; | |||
| friend class MOrientationTrackerPrivate; | ||||
| #ifdef UNIT_TEST | #ifdef UNIT_TEST | |||
| // to call orientationAngleChanged() | // to call orientationAngleChanged() | |||
| friend class Ut_MWindow; | friend class Ut_MWindow; | |||
| friend class Ut_MSceneManager; | friend class Ut_MSceneManager; | |||
| friend class Ut_MOrientationTracker; | ||||
| #endif | #endif | |||
| }; | }; | |||
| #endif | #endif | |||
| End of changes. 3 change blocks. | ||||
| 0 lines changed or deleted | 11 lines changed or added | |||