mlistheaderstyle.h   mlistheaderstyle.h 
skipping to change at line 33 skipping to change at line 33
#include <MWidgetStyle> #include <MWidgetStyle>
/*! \internal */ /*! \internal */
class MListHeaderStyle : public MWidgetStyle class MListHeaderStyle : public MWidgetStyle
{ {
Q_OBJECT Q_OBJECT
M_STYLE(MListHeaderStyle) M_STYLE(MListHeaderStyle)
M_STYLE_ATTRIBUTE(QString, titleStyleName, TitleStyleName) M_STYLE_ATTRIBUTE(QString, titleStyleName, TitleStyleName)
M_STYLE_ATTRIBUTE(QString, separatorStyleName, SeparatorStyleName)
}; };
class MListHeaderStyleContainer : public MWidgetStyleContainer class MListHeaderStyleContainer : public MWidgetStyleContainer
{ {
M_STYLE_CONTAINER(MListHeaderStyle) M_STYLE_CONTAINER(MListHeaderStyle)
}; };
/*! \internal_end */ /*! \internal_end */
#endif // MLISTHEADERSTYLE_H #endif // MLISTHEADERSTYLE_H
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 mlistview.h   mlistview.h 
skipping to change at line 87 skipping to change at line 87
/*! \reimp */ /*! \reimp */
virtual void setupModel(); virtual void setupModel();
virtual void applyStyle(); virtual void applyStyle();
virtual void notifyItemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value); virtual void notifyItemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value);
/*! \reimp_end */ /*! \reimp_end */
private: private:
void init(); void init();
void connectSelectionModel(); void connectSelectionModel();
void scrollTo(const QModelIndex &index, MList::ScrollHint hint, MList:: AnimationMode mode); void scrollTo(const QModelIndex &index, MList::ScrollHint hint, MList:: AnimationMode mode);
void scrollTo(int row, MList::ScrollHint hint, MList::AnimationMode mod e);
void longTap(const QPointF &pos); void longTap(const QPointF &pos);
Q_PRIVATE_SLOT(d_func(), void _q_itemLongTapped(QPointF)) Q_PRIVATE_SLOT(d_func(), void _q_itemLongTapped(QPointF))
Q_PRIVATE_SLOT(d_func(), void _q_relayoutItemsIfNeeded()) Q_PRIVATE_SLOT(d_func(), void _q_relayoutItemsIfNeeded())
private: private:
Q_DECLARE_PRIVATE(MListView) Q_DECLARE_PRIVATE(MListView)
MListViewPrivate *d_ptr; MListViewPrivate *d_ptr;
MList *controller; MList *controller;
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 mmessagebox.h   mmessagebox.h 
skipping to change at line 86 skipping to change at line 86
/*! /*!
* \brief Sets the dialog's text. * \brief Sets the dialog's text.
* *
* \param text Text to be displayed in the message box. * \param text Text to be displayed in the message box.
* \sa text() * \sa text()
*/ */
void setText(const QString &text); void setText(const QString &text);
/*! /*!
* \brief Returns the dialog's icon id. * \brief Returns the dialog's icon id.
*
* \return Icon being displayed in the message box. * \return Icon being displayed in the message box.
* \sa setIconId() * \sa setIconId(), iconPixmap(), setIconPixmap()
*/ */
QString iconId() const; QString iconId() const;
/*! /*!
* \brief Sets the dialog's icon. * \brief Sets the dialog's icon.
* *
* \param iconId Logical icon id to be displayed as message box icon. * iconId() has a lower priority than iconPixmap(). If iconPixmap() con
* \sa iconId() tains
* a valid (non-null) Pixmap, the message box icon will be taken from i
t
* instead of from iconId().
*
* \param iconId Logical id of the icon to be displayed in the message
box.
* \sa iconId(), iconPixmap(), setIconPixmap()
*/ */
void setIconId(const QString &iconId); void setIconId(const QString &iconId);
/*! /*!
* \brief Returns the dialog's icon pixmap.
*
* By default it returns a null pixmap.
*
* \return Pixmap of the icon to be displayed in the message box.
* \sa setIconPixmap(), iconId(), setIconId()
*/
QPixmap iconPixmap() const;
/*!
* \brief Sets the dialog's icon pixmap.
*
* \param iconPixmap Pixmap of the icon to be used in the message box.
* \sa iconPixmap(), iconId(), setIconId()
*/
void setIconPixmap(QPixmap &iconPixmap);
/*!
* \brief Destructor * \brief Destructor
*/ */
virtual ~MMessageBox(); virtual ~MMessageBox();
protected: protected:
//! \reimp //! \reimp
virtual void dismissEvent(MDismissEvent *event); virtual void dismissEvent(MDismissEvent *event);
//! \reimp_end //! \reimp_end
private: private:
 End of changes. 4 change blocks. 
3 lines changed or deleted 29 lines changed or added


 mmessageboxmodel.h   mmessageboxmodel.h 
skipping to change at line 37 skipping to change at line 37
class M_CORE_EXPORT MMessageBoxModel : public MDialogModel class M_CORE_EXPORT MMessageBoxModel : public MDialogModel
{ {
Q_OBJECT Q_OBJECT
M_MODEL_INTERNAL(MMessageBoxModel) M_MODEL_INTERNAL(MMessageBoxModel)
public: public:
private: private:
M_MODEL_PROPERTY(QString, text, Text, true, QString()) M_MODEL_PROPERTY(QString, text, Text, true, QString())
M_MODEL_PROPERTY(QString, iconId, IconId, true, QString()) M_MODEL_PROPERTY(QString, iconId, IconId, true, QString())
M_MODEL_PROPERTY(QPixmap, iconPixmap, IconPixmap, false, QPixmap())
}; };
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 msheet.h   msheet.h 
skipping to change at line 196 skipping to change at line 196
\brief Returns whether the header is visible. \brief Returns whether the header is visible.
*/ */
bool isHeaderVisible() const; bool isHeaderVisible() const;
private: private:
Q_DECLARE_PRIVATE(MSheet) Q_DECLARE_PRIVATE(MSheet)
Q_DISABLE_COPY(MSheet) Q_DISABLE_COPY(MSheet)
Q_PRIVATE_SLOT(d_func(), void _q_onStandAloneSheetDisappeared()) Q_PRIVATE_SLOT(d_func(), void _q_onStandAloneSheetDisappeared())
Q_PRIVATE_SLOT(d_func(), void _q_makeSystemSheetDisappear()) Q_PRIVATE_SLOT(d_func(), void _q_makeSystemSheetDisappear())
Q_PRIVATE_SLOT(d_func(), void _q_dismissSystemSheet()) Q_PRIVATE_SLOT(d_func(), void _q_dismissSystemSheet())
Q_PRIVATE_SLOT(d_func(), void _q_focusFirstEditItem())
}; };
#endif // MSHEET_H #endif // MSHEET_H
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 mwindow.h   mwindow.h 
skipping to change at line 635 skipping to change at line 635
* Is invoked by MComponentCache in case if an application is * Is invoked by MComponentCache in case if an application is
* prestarted. * prestarted.
*/ */
void prestartedInit(); void prestartedInit();
/* /*
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; friend class MOrientationTrackerPrivate;
friend class MComponentCachePrivate; // Calls MWindow::prestartedInit() friend class MComponentCachePrivate; // Calls MWindow::prestartedInit()
#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; friend class Ut_MOrientationTracker;
 End of changes. 1 change blocks. 
9 lines changed or deleted 0 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/