maction.h   maction.h 
skipping to change at line 102 skipping to change at line 102
/*! /*!
Returns the \ref logicalid "logical ID" associated with this action's icon. Returns the \ref logicalid "logical ID" associated with this action's icon.
*/ */
QString iconID() const; QString iconID() const;
/*! /*!
Sets the \ref logicalid "logical ID" associated with this action's ic on to \a id. Sets the \ref logicalid "logical ID" associated with this action's ic on to \a id.
*/ */
void setIconID(const QString &id); void setIconID(const QString &id);
/*!
Returns the \ref logicalid "logical ID" associated with this action's
toggled icon.
*/
QString toggledIconID() const;
/*!
Sets the \ref logicalid "logical ID" associated with this action's to
ggled icon to \a id.
*/
void setToggledIconID(const QString &id);
/** /**
\brief Return the possible locations this action may reside in \brief Return the possible locations this action may reside in
*/ */
Locations location() const; Locations location() const;
/** /**
\brief Set the locations this action may reside in \brief Set the locations this action may reside in
\param location value of possible locations \param location value of possible locations
*/ */
void setLocation(Locations location); void setLocation(Locations location);
 End of changes. 1 change blocks. 
0 lines changed or deleted 12 lines changed or added


 manimationcreator.h   manimationcreator.h 
skipping to change at line 59 skipping to change at line 59
virtual ~MAnimationCreatorBase(); virtual ~MAnimationCreatorBase();
/*! /*!
Returns a new animation instance. Returns a new animation instance.
Ownership is transferred to caller. Ownership is transferred to caller.
*/ */
virtual QAbstractAnimation *create() const = 0; virtual QAbstractAnimation *create() const = 0;
}; };
template<class ANIMATION> template<class ANIMATION>
class M_CORE_EXPORT MAnimationCreator : public MAnimationCreatorBase class MAnimationCreator : public MAnimationCreatorBase
{ {
public: public:
MAnimationCreator(const char *animationClassName) : MAnimationCreator(const char *animationClassName) :
MAnimationCreatorBase(animationClassName) MAnimationCreatorBase(animationClassName)
{} {}
virtual ~MAnimationCreator() virtual ~MAnimationCreator()
{} {}
virtual QAbstractAnimation *create() const { virtual QAbstractAnimation *create() const {
return new ANIMATION(); return new ANIMATION();
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mapplication.h   mapplication.h 
skipping to change at line 161 skipping to change at line 161
static void setShowCursor(bool show); static void setShowCursor(bool show);
/*! /*!
* Returns the currently active application window. * Returns the currently active application window.
* \note If the active window is of type MWindow (and not MApplicationW indow) * \note If the active window is of type MWindow (and not MApplicationW indow)
* this method will return a null pointer. * this method will return a null pointer.
* \sa activeWindow() * \sa activeWindow()
*/ */
static MApplicationWindow *activeApplicationWindow(); static MApplicationWindow *activeApplicationWindow();
/*! Returns the currently active window. /*! Returns the currently active window.
* The returned window is a topmost normal type window (i.e. not a dia
log)
* of the application. Even if system or system modal dialog is shown
on top
* of a window, its own MWindow is not recognized as an active window.
* The active window in this case is the first window below the dialog
.
*
* \note In comparison to QApplication::activeWindow(), this method wil l return * \note In comparison to QApplication::activeWindow(), this method wil l return
* a pointer to the MWindow even if it doesn't have focus. For si ngle-window * a pointer to the MWindow even if it doesn't have focus. For si ngle-window
* applications this method will return a pointer to the window o nce it's * applications this method will return a pointer to the window o nce it's
* created (even before it's shown). For multiple-window applicat ions this method * created (even before it's shown). For multiple-window applicat ions this method
* will return a pointer to the current topmost window (excluding system dialogs). * will return a pointer to the current topmost window.
*/ */
static MWindow *activeWindow(); static MWindow *activeWindow();
//! Returns a list of all windows in the application //! Returns a list of all windows in the application
static QList<MWindow *> windows(); static QList<MWindow *> windows();
//! Returns the application's app name //! Returns the application's app name
static QString appName(); static QString appName();
//! Returns the application's binary name //! Returns the application's binary name
static QString binaryName(); static QString binaryName();
//! Returns object which provide interface for nonvisual feedback or NU LL //! Returns object which provide interface for nonvisual feedback or NU LL
 End of changes. 2 change blocks. 
9 lines changed or deleted 1 lines changed or added


 mbannerstyle.h   mbannerstyle.h 
skipping to change at line 31 skipping to change at line 31
#define MBANNERSTYLE_H #define MBANNERSTYLE_H
#include <mscenewindowstyle.h> #include <mscenewindowstyle.h>
class M_VIEWS_EXPORT MBannerStyle : public MSceneWindowStyle class M_VIEWS_EXPORT MBannerStyle : public MSceneWindowStyle
{ {
Q_OBJECT Q_OBJECT
M_STYLE(MBannerStyle) M_STYLE(MBannerStyle)
M_STYLE_ATTRIBUTE(QSize,iconSize,IconSize) M_STYLE_ATTRIBUTE(QSize,iconSize,IconSize)
M_STYLE_ATTRIBUTE(qreal, pressDimFactor, PressDimFactor) M_STYLE_ATTRIBUTE(qreal,pressDownBannerOpacity,PressDownBannerOpacity)
}; };
class M_VIEWS_EXPORT MBannerStyleContainer : public MSceneWindowStyleContai ner class M_VIEWS_EXPORT MBannerStyleContainer : public MSceneWindowStyleContai ner
{ {
M_STYLE_CONTAINER(MBannerStyle) M_STYLE_CONTAINER(MBannerStyle)
}; };
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mbannerview.h   mbannerview.h 
skipping to change at line 64 skipping to change at line 64
MBannerView(MBannerViewPrivate &dd, MBanner *controller); MBannerView(MBannerViewPrivate &dd, MBanner *controller);
//! \reimp //! \reimp
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event); virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
virtual void cancelEvent(MCancelEvent *event); virtual void cancelEvent(MCancelEvent *event);
virtual void setupModel(); virtual void setupModel();
virtual void applyStyle(); virtual void applyStyle();
virtual void drawForeground(QPainter *painter, const QStyleOptionGraphi csItem *option) const; virtual void drawForeground(QPainter *painter, const QStyleOptionGraphi csItem *option) const;
virtual void drawContents(QPainter *painter, const QStyleOptionGraphics Item *option) const;
//! \reimp_end //! \reimp_end
MBannerViewPrivate *const d_ptr; MBannerViewPrivate *const d_ptr;
protected Q_SLOTS: protected Q_SLOTS:
//! \reimp //! \reimp
virtual void updateData(const QList<const char *>& modifications); virtual void updateData(const QList<const char *>& modifications);
//! \reimp_end //! \reimp_end
private: private:
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 mcomponentdata.h   mcomponentdata.h 
skipping to change at line 180 skipping to change at line 180
*/ */
static bool setSyslogServer(const QUrl &url); static bool setSyslogServer(const QUrl &url);
/*! /*!
* Returns the currently active application window. * Returns the currently active application window.
* \note If the active window is of type MWindow (and not MApplicationW indow) * \note If the active window is of type MWindow (and not MApplicationW indow)
* this method will return a null pointer. * this method will return a null pointer.
* \sa activeWindow() * \sa activeWindow()
*/ */
static MApplicationWindow *activeApplicationWindow(); static MApplicationWindow *activeApplicationWindow();
/*! Returns the currently active window. //! Returns the currently active window
*
* \note The returned window is a topmost normal type window (i.e. not
a dialog)
* of the application. Even if system or system modal dialog is s
hown on top
* of a window, its own MWindow is not recognized as an active wi
ndow.
* The active window in this case is the first window below the d
ialog.
*/
static MWindow *activeWindow(); static MWindow *activeWindow();
//! Returns a list of all windows in the application //! Returns a list of all windows in the application
static QList<MWindow *> windows(); static QList<MWindow *> windows();
//! Returns the application's app name //! Returns the application's app name
static QString appName(); static QString appName();
//! Returns the application's binary name //! Returns the application's binary name
static QString binaryName(); static QString binaryName();
//! Returns the application's service name //! Returns the application's service name
static QString serviceName(); static QString serviceName();
 End of changes. 1 change blocks. 
11 lines changed or deleted 1 lines changed or added


 mhelpbutton.h   mhelpbutton.h 
skipping to change at line 55 skipping to change at line 55
\property MMHelpButton::pageID \property MMHelpButton::pageID
\brief See MMHelpButton::pageID \brief See MMHelpButton::pageID
*/ */
Q_PROPERTY(QString pageID READ pageID WRITE setPageID) Q_PROPERTY(QString pageID READ pageID WRITE setPageID)
/*! /*!
* \brief Constructs a help button * \brief Constructs a help button
* *
* Constructs a help button with a pageID. * Constructs a help button with a pageID.
* *
* \param pageID The id of the page to be openned when the button is cl icked. * \param pageID The id of the page to be opened when the button is cli cked.
* \param parent The parent of the widget. * \param parent The parent of the widget.
* *
* \sa setPageID about how to specify the page. * \sa setPageID about how to specify the page.
*/ */
MHelpButton(const QString& pageID, QGraphicsItem* parent = 0); MHelpButton(const QString& pageID, QGraphicsItem* parent = 0);
/*! /*!
\brief Destroys the help button. \brief Destroys the help button.
*/ */
~MHelpButton(); ~MHelpButton();
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mlistindexstyle.h   mlistindexstyle.h 
skipping to change at line 39 skipping to change at line 39
M_STYLE_ATTRIBUTE(QString, shortcutObjectName, ShortcutObjectName) M_STYLE_ATTRIBUTE(QString, shortcutObjectName, ShortcutObjectName)
M_STYLE_ATTRIBUTE(qreal, appearDelay, AppearDelay) M_STYLE_ATTRIBUTE(qreal, appearDelay, AppearDelay)
M_STYLE_ATTRIBUTE(qreal, appearDuration, AppearDuration) M_STYLE_ATTRIBUTE(qreal, appearDuration, AppearDuration)
M_STYLE_ATTRIBUTE(qreal, fadeOutDelay, FadeOutDelay) M_STYLE_ATTRIBUTE(qreal, fadeOutDelay, FadeOutDelay)
M_STYLE_ATTRIBUTE(int, floatingIndexOffset, FloatingIndexOffset) M_STYLE_ATTRIBUTE(int, floatingIndexOffset, FloatingIndexOffset)
M_STYLE_ATTRIBUTE(int, floatingIndexCount, FloatingIndexCount) M_STYLE_ATTRIBUTE(int, floatingIndexCount, FloatingIndexCount)
M_STYLE_ATTRIBUTE(qreal, floatingSnapDistance, FloatingSnapDistance) M_STYLE_ATTRIBUTE(qreal, floatingSnapDistance, FloatingSnapDistance)
M_STYLE_ATTRIBUTE(QString, floatingStyleName, FloatingStyleName)
}; };
class MListIndexStyleContainer : public MWidgetStyleContainer class MListIndexStyleContainer : public MWidgetStyleContainer
{ {
M_STYLE_CONTAINER(MListIndexStyle) M_STYLE_CONTAINER(MListIndexStyle)
}; };
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 mliststyle.h   mliststyle.h 
skipping to change at line 92 skipping to change at line 92
*/ */
M_STYLE_ATTRIBUTE(QString, groupSeparatorObjectName, GroupSeparatorObje ctName) M_STYLE_ATTRIBUTE(QString, groupSeparatorObjectName, GroupSeparatorObje ctName)
/*! /*!
\property MListStyle::listDeleteItemAnimation \property MListStyle::listDeleteItemAnimation
\brief Sets object name for delete item animation \brief Sets object name for delete item animation
Sets object name for delete item animation. Sets object name for delete item animation.
*/ */
M_STYLE_ATTRIBUTE(QString, deleteItemAnimation, DeleteItemAnimation) M_STYLE_ATTRIBUTE(QString, deleteItemAnimation, DeleteItemAnimation)
/*
\property MListStyle::listIndexStyleName
\brief Sets style name for a list index a.k.a. fast scroll widget
Sets style name for a list index a.k.a. fast scroll widget
*/
M_STYLE_ATTRIBUTE(QString, listIndexStyleName, ListIndexStyleName)
}; };
class M_VIEWS_EXPORT MListStyleContainer : public MWidgetStyleContainer class M_VIEWS_EXPORT MListStyleContainer : public MWidgetStyleContainer
{ {
M_STYLE_CONTAINER(MListStyle) M_STYLE_CONTAINER(MListStyle)
}; };
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 8 lines changed or added


 mpreeditinjectionevent.h   mpreeditinjectionevent.h 
skipping to change at line 71 skipping to change at line 71
/*! /*!
* \brief Returns the expected cursor position inside preedit. * \brief Returns the expected cursor position inside preedit.
* *
* Note the eventCursorPosition is not the real cursor position, while it is the cursor position inside * Note the eventCursorPosition is not the real cursor position, while it is the cursor position inside
* preedit which this event expects. The input context will decide whet her and where to display cursor. * preedit which this event expects. The input context will decide whet her and where to display cursor.
* The valid value is from 0 (at the beginning of the preedit) to the l ength of preedit (at the end * The valid value is from 0 (at the beginning of the preedit) to the l ength of preedit (at the end
* of preedit). Other values indicate the cursor position unknown. * of preedit). Other values indicate the cursor position unknown.
*/ */
int eventCursorPosition() const; int eventCursorPosition() const;
/*!
* \brief sets replacement information that should be used for QInputMe
thodEvent.
*/
void setReplacement(int replacementStart, int replacementLength);
/*!
* \brief replacement start info as in QInputMethodEvent
*/
int replacementStart() const;
/*!
\brief replacement length info as in QInputMethodEvent
*/
int replacementLength() const;
static QEvent::Type eventNumber(); static QEvent::Type eventNumber();
protected: protected:
MPreeditInjectionEventPrivate *const d_ptr; MPreeditInjectionEventPrivate *const d_ptr;
private: private:
Q_DECLARE_PRIVATE(MPreeditInjectionEvent) Q_DECLARE_PRIVATE(MPreeditInjectionEvent)
Q_DISABLE_COPY(MPreeditInjectionEvent) Q_DISABLE_COPY(MPreeditInjectionEvent)
}; };
 End of changes. 1 change blocks. 
0 lines changed or deleted 16 lines changed or added


 mprogressindicatorbarview.h   mprogressindicatorbarview.h 
skipping to change at line 145 skipping to change at line 145
\brief Updates MSpinnerView class instance when some component \brief Updates MSpinnerView class instance when some component
of underlying model is modified. of underlying model is modified.
\param modifications List containing the names of modified model co mponents. \param modifications List containing the names of modified model co mponents.
*/ */
virtual void updateData(const QList<const char *>& modifications); virtual void updateData(const QList<const char *>& modifications);
private: private:
Q_DISABLE_COPY(MProgressIndicatorBarView) Q_DISABLE_COPY(MProgressIndicatorBarView)
Q_DECLARE_PRIVATE(MProgressIndicatorBarView) Q_DECLARE_PRIVATE(MProgressIndicatorBarView)
#ifdef UNIT_TEST
friend class Ut_MProgressIndicatorBarView;
#endif
#ifdef M_TEST_CLASS #ifdef M_TEST_CLASS
M_TEST_CLASS M_TEST_CLASS
#endif #endif
}; };
#endif // MPROGRESSINDICATORBARVIEW_H #endif // MPROGRESSINDICATORBARVIEW_H
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added


 mscenewindowview.h   mscenewindowview.h 
skipping to change at line 78 skipping to change at line 78
* \returns The current offset. * \returns The current offset.
*/ */
QPointF offset() const; QPointF offset() const;
protected: protected:
MSceneWindowView(MSceneWindowViewPrivate &dd, MSceneWindow *controller) ; MSceneWindowView(MSceneWindowViewPrivate &dd, MSceneWindow *controller) ;
//! \reimp //! \reimp
virtual void applyStyle(); virtual void applyStyle();
virtual void setupModel(); virtual void setupModel();
virtual void notifyItemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value);
//! \reimp_end //! \reimp_end
signals: signals:
/*! /*!
* \brief Emitted every time when the style of the scene window changes . * \brief Emitted every time when the style of the scene window changes .
*/ */
void geometryAttributesChanged(); void geometryAttributesChanged();
private: private:
Q_PRIVATE_SLOT(d_func(), void _q_playSceneWindowAppearingFeedback()) Q_PRIVATE_SLOT(d_func(), void _q_playSceneWindowAppearingFeedback())
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 msortfilterproxymodel.h   msortfilterproxymodel.h 
skipping to change at line 84 skipping to change at line 84
*/ */
void layoutAboutToBeAnimated(); void layoutAboutToBeAnimated();
private: private:
bool filterAcceptsGroup(const QModelIndex &source_index) const; bool filterAcceptsGroup(const QModelIndex &source_index) const;
Q_PRIVATE_SLOT(d_func(), void _q_layoutAboutToBeAnimated()) Q_PRIVATE_SLOT(d_func(), void _q_layoutAboutToBeAnimated())
Q_PRIVATE_SLOT(d_func(), void _q_rowsInserted(QModelIndex,int,int)) Q_PRIVATE_SLOT(d_func(), void _q_rowsInserted(QModelIndex,int,int))
Q_PRIVATE_SLOT(d_func(), void _q_rowsRemoved(QModelIndex,int,int)) Q_PRIVATE_SLOT(d_func(), void _q_rowsRemoved(QModelIndex,int,int))
Q_PRIVATE_SLOT(d_func(), void _q_layoutChanged()) Q_PRIVATE_SLOT(d_func(), void _q_resetAnimatedChange())
private: private:
MSortFilterProxyModelPrivate *d_ptr; MSortFilterProxyModelPrivate *d_ptr;
Q_DECLARE_PRIVATE(MSortFilterProxyModel) Q_DECLARE_PRIVATE(MSortFilterProxyModel)
}; };
#endif // MSORTFILTERPROXYMODEL_H #endif // MSORTFILTERPROXYMODEL_H
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mspinnerview.h   mspinnerview.h 
skipping to change at line 121 skipping to change at line 121
private: private:
int currentFrame() const; int currentFrame() const;
void setCurrentFrame(int frameIndex); void setCurrentFrame(int frameIndex);
Q_DISABLE_COPY(MSpinnerView) Q_DISABLE_COPY(MSpinnerView)
Q_DECLARE_PRIVATE(MSpinnerView) Q_DECLARE_PRIVATE(MSpinnerView)
Q_PRIVATE_SLOT(d_func(), void _q_pauseAnimation()) Q_PRIVATE_SLOT(d_func(), void _q_pauseAnimation())
Q_PRIVATE_SLOT(d_func(), void _q_resumeAnimation()) Q_PRIVATE_SLOT(d_func(), void _q_resumeAnimation())
Q_PRIVATE_SLOT(d_func(), void _q_pauseOrResumeAnimation()) Q_PRIVATE_SLOT(d_func(), void _q_pauseOrResumeAnimation())
Q_PRIVATE_SLOT(d_func(), void _q_switcherEntered())
Q_PRIVATE_SLOT(d_func(), void _q_switcherExited())
#ifdef UNIT_TEST
friend class Ut_MProgressIndicatorSpinnerView;
#endif
}; };
#endif // MSPINNERVIEW_H #endif // MSPINNERVIEW_H
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 lines changed or added


 mstyle.h   mstyle.h 
skipping to change at line 103 skipping to change at line 103
private: \ private: \
Q_DECLARE_PRIVATE(STYLE_CLASS##Container) Q_DECLARE_PRIVATE(STYLE_CLASS##Container)
// style mode macro // style mode macro
#define M_STYLE_MODE(MODE) \ #define M_STYLE_MODE(MODE) \
public: \ public: \
void setMode##MODE(); void setMode##MODE();
class MWidgetController; class MWidgetController;
class MWidgetViewPrivate; class MWidgetViewPrivate;
class MSceneManager;
class M_CORE_EXPORT MStyle : public QObject class M_CORE_EXPORT MStyle : public QObject
{ {
Q_OBJECT Q_OBJECT
M_STYLE(MStyle) M_STYLE(MStyle)
protected: protected:
int references() const; int references() const;
int addReference(); int addReference();
int removeReference(); int removeReference();
skipping to change at line 132 skipping to change at line 133
M_STYLE_MODE(Default) M_STYLE_MODE(Default)
public: public:
void initialize(const QString &objectName, const QString &type, const M WidgetController *parent); void initialize(const QString &objectName, const QString &type, const M WidgetController *parent);
void setObjectName(const QString &objectName); void setObjectName(const QString &objectName);
void setType(const QString &type); void setType(const QString &type);
QString objectName() const; QString objectName() const;
QString type() const; QString type() const;
void setParent(const MWidgetController *parent); void setParent(const MWidgetController *parent);
const MWidgetController *parent() const; const MWidgetController *parent() const;
void setSceneManager(MSceneManager *sceneManager);
const MSceneManager *sceneManager() const;
protected: protected:
void reloadStyles(); void reloadStyles();
const MStyle *currentStyle() const; const MStyle *currentStyle() const;
void setCurrentMode(const QString &mode); void setCurrentMode(const QString &mode);
QString currentMode() const; QString currentMode() const;
friend class MTheme; friend class MTheme;
friend class MWidgetViewPrivate; // it needs to call reloadStyles() friend class MWidgetViewPrivate; // it needs to call reloadStyles()
}; };
 End of changes. 2 change blocks. 
0 lines changed or deleted 4 lines changed or added


 mtheme.h   mtheme.h 
skipping to change at line 340 skipping to change at line 340
Either appends to or replaces the existing theme CSS using the style Either appends to or replaces the existing theme CSS using the style
sheet located by \a filename, depending on the \a mode. The method sheet located by \a filename, depending on the \a mode. The method
returns true if the CSS file was successfully loaded. returns true if the CSS file was successfully loaded.
Note that CSS files should be loaded before constructing the style obj ects. Note that CSS files should be loaded before constructing the style obj ects.
*/ */
static bool loadCSS(const QString &filename, InsertMode mode = Append); static bool loadCSS(const QString &filename, InsertMode mode = Append);
/*! /*!
Returns the name of the current theme in use. Returns the name of the current theme in use or an empty string no the me is selected.
*/ */
static QString currentTheme(); static QString currentTheme();
/*! /*!
Returns true if there are pending asynchronous pixmap requests in the system. Returns true if there are pending asynchronous pixmap requests in the system.
*/ */
static bool hasPendingRequests(); static bool hasPendingRequests();
static void cleanupGarbage(); static void cleanupGarbage();
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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/