mabstractcellcreator.h   mabstractcellcreator.h 
skipping to change at line 110 skipping to change at line 110
} }
}; };
//! \internal_end //! \internal_end
/*! /*!
\class MAbstractCellCreator \class MAbstractCellCreator
\brief MAbstractCellCreator is a helper class for implementing creators . \brief MAbstractCellCreator is a helper class for implementing creators .
\section MAbstractCellCreator Overview \section MAbstractCellCreator Overview
MAbstractCellCreator implements cellSize() function from MCellCreat or interface by creating MAbstractCellCreator implements cellSize() function from MCellCreat or interface by creating
one instance of a widget and asking it's preffered size. Also it au tomatically creates widgets one instance of a widget and asking its preferred size. Also it aut omatically creates widgets
of specified type specified by the template parameter. It asks recy cler first and allocates memory of specified type specified by the template parameter. It asks recy cler first and allocates memory
only if there is no object in a recycler. With a template parameter you control which objects only if there is no object in a recycler. With a template parameter you control which objects
should be created, with setCellViewType(const QString&viewType) you may specify what view type should should be created, with setCellViewType(const QString&viewType) you may specify what view type should
be assigned and with setObjectName(const QString& objectName) you m ay specify object name of constructed be assigned and with setObjectName(const QString& objectName) you m ay specify object name of constructed
cell. cell.
If you wish to intitialize the cell widget differntly, or if you wi sh to create If you wish to intitialize the cell widget differntly, or if you wi sh to create
different widget types for some rows, you should do so in an overri de of the different widget types for some rows, you should do so in an overri de of the
createCell() function. You may call the base class's createCell() w hen you createCell() function. You may call the base class's createCell() w hen you
still want the default implementation for a particular row. still want the default implementation for a particular row.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mbubbleitem.h   mbubbleitem.h 
skipping to change at line 199 skipping to change at line 199
The avatar will always be deleted when the bubble is deleted. The avatar will always be deleted when the bubble is deleted.
\sa avatar() \sa avatar()
*/ */
void setAvatar(MImageWidget* avatar); void setAvatar(MImageWidget* avatar);
/*! /*!
Sets the avatar image to display the \a pixmap. Sets the avatar image to display the \a pixmap.
If there is an existing avatar() widget, this will set the pixmap for that avatar. If there is an existing avatar() widget, this will set the pixmap for that avatar.
Otherwise a new MImageWidget will be created and it's QGraphicsItem:: parent() set Otherwise a new MImageWidget will be created and its QGraphicsItem::p arent() set
to this bubble widget. to this bubble widget.
\sa avatar() \sa avatar()
*/ */
void setAvatar(const QPixmap &pixmap); void setAvatar(const QPixmap &pixmap);
/** /**
Sets the name of the message sender to \a name. Sets the name of the message sender to \a name.
This must be html escaped. E.g. This must be html escaped. E.g.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mcharsetdetector.h   mcharsetdetector.h 
skipping to change at line 77 skipping to change at line 77
* MCharsetDetector charsetDetector(encodedStringUtf8); * MCharsetDetector charsetDetector(encodedStringUtf8);
* if(charsetDetector.hasError()) * if(charsetDetector.hasError())
* qWarning() << "an error happened" << charsetDetector.errorString(); * qWarning() << "an error happened" << charsetDetector.errorString();
* MCharsetMatch bestMatch = charsetDetector.detect(); * MCharsetMatch bestMatch = charsetDetector.detect();
* if(charsetDetector.hasError()) * if(charsetDetector.hasError())
* qWarning() << "an error happened" << charsetDetector.errorString(); * qWarning() << "an error happened" << charsetDetector.errorString();
* // print match found: * // print match found:
* qDebug() << bestMatch.name(); // this will print "UTF-8" * qDebug() << bestMatch.name(); // this will print "UTF-8"
* qDebug() << bestMatch.language(); // this will print "" * qDebug() << bestMatch.language(); // this will print ""
* qDebug() << bestMatch.confidence(); // this will print "100" * qDebug() << bestMatch.confidence(); // this will print "100"
* // decode input string into a QString, using the encoding
* // detected as best best match:
* QString result = charsetDetector.text(bestMatch);
* *
* // try another detection using the same MCharsetDetector object * // try another detection using the same MCharsetDetector object
* // (it saves some time not creating a new one all the time): * // (it saves some time not creating a new one all the time):
* charsetDetector.setText(encodedStringEucjp); * charsetDetector.setText(encodedStringEucjp);
* if(charsetDetector.hasError()) * if(charsetDetector.hasError())
* qWarning() << "an error happened" << charsetDetector.errorString(); * qWarning() << "an error happened" << charsetDetector.errorString();
* QList<MCharsetMatch> mCharsetMatchList = charsetDetector.detectAll(); * QList<MCharsetMatch> mCharsetMatchList = charsetDetector.detectAll();
* if(charsetDetector.hasError()) * if(charsetDetector.hasError())
* qWarning() << "an error happened" << charsetDetector.errorString(); * qWarning() << "an error happened" << charsetDetector.errorString();
* // print all matches found: * // print all matches found:
* for(int i = 0; i < mCharsetMatchList.size(); ++i) { * for(int i = 0; i < mCharsetMatchList.size(); ++i) {
* qDebug() << i << ":" * qDebug() << i << ":"
* << mCharsetMatchList[i].name() // for i==0, “EUC-JP” is printed * << mCharsetMatchList[i].name() // for i==0, “EUC-JP” is printed
* << mCharsetMatchList[i].language() // for i==0, “ja” is pri nted * << mCharsetMatchList[i].language() // for i==0, “ja” is pri nted
* << mCharsetMatchList[i].confidence(); * << mCharsetMatchList[i].confidence();
* } * }
* // decode input string into a QString using the encoding detected
* // in the first (i.e. best )match (if there was a match at all):
* if(!mCharsetMatchList.isEmpty())
* result = charsetDetector.text(mCharsetMatchList.first());
*
* \endcode * \endcode
*/ */
class M_CORE_EXPORT MCharsetDetector class M_CORE_EXPORT MCharsetDetector
{ {
public: public:
/*! /*!
* \brief constructs a MCharsetDetector without text content * \brief constructs a MCharsetDetector without text content
* *
* \sa MCharsetDetector(const QByteArray &ba) * \sa MCharsetDetector(const QByteArray &ba)
 End of changes. 2 change blocks. 
0 lines changed or deleted 8 lines changed or added


 mcontainerview.h   mcontainerview.h 
skipping to change at line 36 skipping to change at line 36
#include <mcontainerstyle.h> #include <mcontainerstyle.h>
class MContainerViewPrivate; class MContainerViewPrivate;
class MContainer; class MContainer;
/*! /*!
* \class MContainerView * \class MContainerView
* \brief MContainerView implements a view for the MContainer * \brief MContainerView implements a view for the MContainer
* *
* \section MContainerViewOverview Overview * \section MContainerViewOverview Overview
* A Container has a minimum width of 18mm, it's maximum width is the width of * A Container has a minimum width of 18mm, its maximum width is the width of
* the screen. By default, the user can set it to a value between these * the screen. By default, the user can set it to a value between these
* boundaries. The minimum height is the minimum height of the header which is * boundaries. The minimum height is the minimum height of the header which is
* 5.06mm. There is no maximum height of the container. * 5.06mm. There is no maximum height of the container.
* *
* \section MContainerViewInteractions Interactions * \section MContainerViewInteractions Interactions
* Supported interactions: Long tap. User of the component can specify obje ct * Supported interactions: Long tap. User of the component can specify obje ct
* menu for content items in native application views. Long tap for applet' s * menu for content items in native application views. Long tap for applet' s
* content items, not currently implemented. * content items, not currently implemented.
* *
* \sa MContainer, MContainerModel * \sa MContainer, MContainerModel
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mdialogstyle.h   mdialogstyle.h 
skipping to change at line 127 skipping to change at line 127
/*! /*!
\property MDialogStyle::dialogRightMargin \property MDialogStyle::dialogRightMargin
\brief Right margin of the dialog. \brief Right margin of the dialog.
Empty space on the right of dialog contents. Empty space on the right of dialog contents.
*/ */
M_STYLE_ATTRIBUTE(qreal, dialogRightMargin, DialogRightMargin) M_STYLE_ATTRIBUTE(qreal, dialogRightMargin, DialogRightMargin)
/*! /*!
\property MDialogStyle::dialogPreferredSize \property MDialogStyle::dialogPreferredSize
\brief Dialog preffered size. \brief Dialog preferred size.
*/ */
M_STYLE_ATTRIBUTE(QSize, dialogPreferredSize, DialogPreferredSize) M_STYLE_ATTRIBUTE(QSize, dialogPreferredSize, DialogPreferredSize)
/*! /*!
\property MDialogStyle::dialogMinimumSize \property MDialogStyle::dialogMinimumSize
\brief Dialog minimum size. \brief Dialog minimum size.
*/ */
M_STYLE_ATTRIBUTE(QSize, dialogMinimumSize, DialogMinimumSize) M_STYLE_ATTRIBUTE(QSize, dialogMinimumSize, DialogMinimumSize)
/*! /*!
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mextensionarea.h   mextensionarea.h 
skipping to change at line 59 skipping to change at line 59
protected: protected:
/*! /*!
* Protected constructor to be called by derived classes to set up the private implementation * Protected constructor to be called by derived classes to set up the private implementation
* hierarchy. * hierarchy.
*/ */
MExtensionArea(MExtensionAreaPrivate *dd, MWidgetModel *model, QGraphic sItem *parent); MExtensionArea(MExtensionAreaPrivate *dd, MWidgetModel *model, QGraphic sItem *parent);
MExtensionAreaPrivate *const d_ptr; MExtensionAreaPrivate *const d_ptr;
protected Q_SLOTS: protected Q_SLOTS:
/*! /*!
* addWidget performs setup of an extension widget and it's datastore w hen the widget is being added to * addWidget performs setup of an extension widget and its datastore wh en the widget is being added to
* the extension area. The ownership of the widget remains on the calle r of this slot. * the extension area. The ownership of the widget remains on the calle r of this slot.
* This slot can be overridden in specialized extension areas to provid e additional setup. * This slot can be overridden in specialized extension areas to provid e additional setup.
* \param widget Widget to be added onto the MExtensionArea. * \param widget Widget to be added onto the MExtensionArea.
* \param store This MDataStore object can be used to store permanent e xtension area data related * \param store This MDataStore object can be used to store permanent e xtension area data related
* to this particular application extension instance. When the same app lication extension instance is * to this particular application extension instance. When the same app lication extension instance is
* reinstantiated, this API will be called with the data that was store d to the permanent storage the * reinstantiated, this API will be called with the data that was store d to the permanent storage the
* last time around. This can be used to store for instance layout data of an application extension instance * last time around. This can be used to store for instance layout data of an application extension instance
* or any other extension area specific data. * or any other extension area specific data.
*/ */
virtual void addWidget(QGraphicsWidget *widget, MDataStore &store); virtual void addWidget(QGraphicsWidget *widget, MDataStore &store);
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mlist.h   mlist.h 
skipping to change at line 96 skipping to change at line 96
return QVariant(rowData); return QVariant(rowData);
} }
return QVariant(); return QVariant();
} }
\endcode \endcode
Model doesn't tell MList how to create actual widgets, we need MCellCreat or for that. Model doesn't tell MList how to create actual widgets, we need MCellCreat or for that.
MAbstractCellCreator is the best candidate for simple case (keep in mind that you can change style of MContentItem only MAbstractCellCreator is the best candidate for simple case (keep in mind that you can change style of MContentItem only
in it's constructor, so if other style is needed, MAbstractCellCreator wi ll not work, MCellCreator should be used instead): in its constructor, so if other style is needed, MAbstractCellCreator wil l not work, MCellCreator should be used instead):
\code \code
class MContentItemCreator : public MAbstractCellCreator<MContentItem> class MContentItemCreator : public MAbstractCellCreator<MContentItem>
{ {
public: public:
void updateCell(const QModelIndex& index, MWidget * cell) const void updateCell(const QModelIndex& index, MWidget * cell) const
{ {
MContentItem * contentItem = qobject_cast<MContentItem *>(cell); MContentItem * contentItem = qobject_cast<MContentItem *>(cell);
QVariant data = index.data(Qt::DisplayRole); QVariant data = index.data(Qt::DisplayRole);
QStringList rowData = data.value<QStringList>(); QStringList rowData = data.value<QStringList>();
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mmashupcanvas.h   mmashupcanvas.h 
skipping to change at line 37 skipping to change at line 37
class MAppletInstanceManager; class MAppletInstanceManager;
class MMashupCanvasPrivate; class MMashupCanvasPrivate;
//! \internal //! \internal
/*! /*!
* MMashupCanvas is a widget which can be populated with applet instances. * MMashupCanvas is a widget which can be populated with applet instances.
* A MMashupCanvas can be placed on any view that wants to leverage applet support. * A MMashupCanvas can be placed on any view that wants to leverage applet support.
* *
* \section overview Overview * \section overview Overview
* *
* Applets are small programs that are embedded into mashup canvases. The m ashup canvas composites applet images as part of it's own visual presentati on. * Applets are small programs that are embedded into mashup canvases. The m ashup canvas composites applet images as part of its own visual presentatio n.
* Applets are primarily run in separate processes in order to safeguard ag ainst possible bugs in applets such as blocking the GUI or crashing. * Applets are primarily run in separate processes in order to safeguard ag ainst possible bugs in applets such as blocking the GUI or crashing.
* The mashup canvas contains an applet inventory (\c MAppletInventory), wh ich is a special type of menu which populates its content from .desktop fil es that applets have installed during their package installation. * The mashup canvas contains an applet inventory (\c MAppletInventory), wh ich is a special type of menu which populates its content from .desktop fil es that applets have installed during their package installation.
* It automatically registers applets (through \c MAppletInstanceManager) a nd implements state handling, memory management etc. * It automatically registers applets (through \c MAppletInstanceManager) a nd implements state handling, memory management etc.
* *
* \section metadata Applet metadata * \section metadata Applet metadata
* *
* Each applet package installs a .desktop file into \c /usr/share/m/applet s/ in which the applet specifies its metadata. \c MAppletInventory monitors this directory and enables instantiation of installed applets onto mashup canvas. The applet inventory is opened by tapping a button on bottom of the mashup canvas area. The inventory shows the icon of each applet in a grid view. When icon is tapped the applet is instantiated to the mashup canvas. When applet is instantiated a new !QGraphicsWidget - object from applet bin ary is constructed and added to the mashup canvas. The applet inventory can be closed/hidden by tapping 'x' on the top right corner. * Each applet package installs a .desktop file into \c /usr/share/m/applet s/ in which the applet specifies its metadata. \c MAppletInventory monitors this directory and enables instantiation of installed applets onto mashup canvas. The applet inventory is opened by tapping a button on bottom of the mashup canvas area. The inventory shows the icon of each applet in a grid view. When icon is tapped the applet is instantiated to the mashup canvas. When applet is instantiated a new !QGraphicsWidget - object from applet bin ary is constructed and added to the mashup canvas. The applet inventory can be closed/hidden by tapping 'x' on the top right corner.
* *
* Applet metadata is defined in .desktop files following freedesktop.org < a href="http://www.freedesktop.org/wiki/Specifications/desktop-entry-spec?a ction=show&redirect=Standards%2Fdesktop-entry-spec">desktop entry specifica tion</a>. Applet metadata extends .desktop entry specification by defining a new type \c MApplet. Applet metadata specification follows desktop entry specification so that required keys (Type, Name and Exec) have to be define d in the applet metadata. \c Exec key in applet metadata defines the runner binary which is launched in separate process to run the applet binary. Thi s key needs to be defined but can be left empty. If \c Exec key is left emp ty the applet is ran in the same process with the mashup canvas. * Applet metadata is defined in .desktop files following freedesktop.org < a href="http://www.freedesktop.org/wiki/Specifications/desktop-entry-spec?a ction=show&redirect=Standards%2Fdesktop-entry-spec">desktop entry specifica tion</a>. Applet metadata extends .desktop entry specification by defining a new type \c MApplet. Applet metadata specification follows desktop entry specification so that required keys (Type, Name and Exec) have to be define d in the applet metadata. \c Exec key in applet metadata defines the runner binary which is launched in separate process to run the applet binary. Thi s key needs to be defined but can be left empty. If \c Exec key is left emp ty the applet is ran in the same process with the mashup canvas.
* *
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mnavigationbarview.h   mnavigationbarview.h 
skipping to change at line 61 skipping to change at line 61
//! \reimp_end //! \reimp_end
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:
Q_DISABLE_COPY(MNavigationBarView) Q_DISABLE_COPY(MNavigationBarView)
Q_DECLARE_PRIVATE(MNavigationBarView) Q_DECLARE_PRIVATE(MNavigationBarView)
Q_PRIVATE_SLOT(d_func(), void _q_updateIsEmptyProperty()) Q_PRIVATE_SLOT(d_func(), void _q_updateIsEmptyAndJustEscapeButtonProper ties())
Q_PRIVATE_SLOT(d_func(), void _q_toolBarModelChanged(QList<const char * >)) Q_PRIVATE_SLOT(d_func(), void _q_toolBarModelChanged(QList<const char * >))
friend class Ut_MNavigationBarView; friend class Ut_MNavigationBarView;
}; };
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 morientationtracker.h   morientationtracker.h 
skipping to change at line 34 skipping to change at line 34
#include "mnamespace.h" #include "mnamespace.h"
#include "mexport.h" #include "mexport.h"
class MOrientationTrackerPrivate; class MOrientationTrackerPrivate;
//! \internal //! \internal
/*! /*!
* Class responsible for tracking the accelerometer properties and signalin g events * Class responsible for tracking the accelerometer properties and signalin g events
* when the device should change it's orientation. * when the device should change its orientation.
* At the moment this is not a part of M api - use MDeviceProfile for the i nformation. * At the moment this is not a part of M api - use MDeviceProfile for the i nformation.
* Initially designed as singleton as MDeviceProfile might need to access s ome more information about * Initially designed as singleton as MDeviceProfile might need to access s ome more information about
* the concrete phone position, that is not available from fired events. * the concrete phone position, that is not available from fired events.
*/ */
class M_CORE_EXPORT MOrientationTracker: public QObject class M_CORE_EXPORT MOrientationTracker: public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
static MOrientationTracker *instance(); static MOrientationTracker *instance();
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mpannablewidgetview.h   mpannablewidgetview.h 
skipping to change at line 45 skipping to change at line 45
{ {
Q_OBJECT Q_OBJECT
M_VIEW(MPannableWidgetModel, MPannableWidgetStyle) M_VIEW(MPannableWidgetModel, MPannableWidgetStyle)
public: public:
MPannableWidgetView(MPannableWidget *controller); MPannableWidgetView(MPannableWidget *controller);
virtual ~MPannableWidgetView(); virtual ~MPannableWidgetView();
protected: protected:
//! \reimp //! \reimp
virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
virtual void drawContents(QPainter *painter, const QStyleOptionGraphics Item *option) const; virtual void drawContents(QPainter *painter, const QStyleOptionGraphics Item *option) const;
virtual void applyStyle(); virtual void applyStyle();
//! \reimp_end //! \reimp_end
MPannableWidgetViewPrivate *const d_ptr; MPannableWidgetViewPrivate *const d_ptr;
private: private:
Q_PRIVATE_SLOT(d_func(), void _q_applyStyleToPhysics()) Q_PRIVATE_SLOT(d_func(), void _q_applyStyleToPhysics())
Q_DECLARE_PRIVATE(MPannableWidgetView) Q_DECLARE_PRIVATE(MPannableWidgetView)
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 msliderview.h   msliderview.h 
skipping to change at line 125 skipping to change at line 125
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event); virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
/*! /*!
\brief Cancel event handler. \brief Cancel event handler.
Sets slider back to Released state. Sets slider back to Released state.
*/ */
virtual void cancelEvent(MCancelEvent *event); virtual void cancelEvent(MCancelEvent *event);
/*! /*!
\brief Swipe gesture event handler.
Accepts swipe events, so they are not sent to the parent widgets wh
ile
the user is dragging the slider..
*/
virtual void swipeGestureEvent(QGestureEvent *event, QSwipeGesture* ges
ture);
/*!
\brief Updates MSliderView class instance when current model is cha nged. \brief Updates MSliderView class instance when current model is cha nged.
Called when MSliderModel (MSeekBarModel) class instance is changed Called when MSliderModel (MSeekBarModel) class instance is changed
(usually) during initialization. (usually) during initialization.
*/ */
virtual void setupModel(); virtual void setupModel();
/*! /*!
\brief Updates MSliderView class instance when some component \brief Updates MSliderView class instance when some component
of underlying model is modified. of underlying model is modified.
 End of changes. 1 change blocks. 
0 lines changed or deleted 10 lines changed or added


 mtextedit.h   mtextedit.h 
skipping to change at line 78 skipping to change at line 78
Q_PROPERTY(bool inputMethodCorrectionEnabled READ inputMethodCorrection Enabled WRITE setInputMethodCorrectionEnabled) Q_PROPERTY(bool inputMethodCorrectionEnabled READ inputMethodCorrection Enabled WRITE setInputMethodCorrectionEnabled)
Q_PROPERTY(bool isReadOnly READ isReadOnly WRITE setReadOnly) Q_PROPERTY(bool isReadOnly READ isReadOnly WRITE setReadOnly)
Q_PROPERTY(bool inputMethodAutoCapitalizationEnabled READ inputMethodAu toCapitalizationEnabled WRITE setInputMethodAutoCapitalizationEnabled) Q_PROPERTY(bool inputMethodAutoCapitalizationEnabled READ inputMethodAu toCapitalizationEnabled WRITE setInputMethodAutoCapitalizationEnabled)
Q_PROPERTY(QString selectedText READ selectedText) //TODO: not usable f rom outside at the moment, M_MODEL_PROPERTY always need set and get functio n. Q_PROPERTY(QString selectedText READ selectedText) //TODO: not usable f rom outside at the moment, M_MODEL_PROPERTY always need set and get functio n.
Q_PROPERTY(bool autoSelectionEnabled READ isAutoSelectionEnabled WRITE setAutoSelectionEnabled) Q_PROPERTY(bool autoSelectionEnabled READ isAutoSelectionEnabled WRITE setAutoSelectionEnabled)
Q_PROPERTY(bool inputMethodPredictionEnabled READ inputMethodPrediction Enabled WRITE setInputMethodPredictionEnabled) Q_PROPERTY(bool inputMethodPredictionEnabled READ inputMethodPrediction Enabled WRITE setInputMethodPredictionEnabled)
Q_PROPERTY(int maxLength READ maxLength WRITE setMaxLength) Q_PROPERTY(int maxLength READ maxLength WRITE setMaxLength)
Q_PROPERTY(MTextEditModel::EchoMode echoMode READ echoMode WRITE setEch oMode) Q_PROPERTY(MTextEditModel::EchoMode echoMode READ echoMode WRITE setEch oMode)
Q_PROPERTY(bool autoSipEnabled READ isAutoSipEnabled WRITE setAutoSipEn abled) Q_PROPERTY(bool autoSipEnabled READ isAutoSipEnabled WRITE setAutoSipEn abled)
Q_PROPERTY(bool errorHighlight READ errorHighlight WRITE setErrorHighli ght)
public: public:
typedef M::TextContentType TextContentType; // workaround for moc bug typedef M::TextContentType TextContentType; // workaround for moc bug
//! What is under the press or release location //! What is under the press or release location
enum TextFieldLocationType { enum TextFieldLocationType {
//! Pressed on top of a word //! Pressed on top of a word
Word, Word,
//! Pressed between words or empty space //! Pressed between words or empty space
skipping to change at line 441 skipping to change at line 442
*/ */
int attachedToolbarId() const; int attachedToolbarId() const;
/*! /*!
* \brief Detaches the custom toolbar which is already attached before. * \brief Detaches the custom toolbar which is already attached before.
* detachToolbar() is automatically called in destructor. * detachToolbar() is automatically called in destructor.
* \sa attachToolbar(const QString &). * \sa attachToolbar(const QString &).
*/ */
void detachToolbar(); void detachToolbar();
/*!
* \brief Returns true if the textedit has error highlighting enabled.
*/
bool errorHighlight() const;
/*!
* \brief Show error highlighting.
*/
void setErrorHighlight(bool showErrorHighlight);
public Q_SLOTS: public Q_SLOTS:
/** /**
* \brief Set text for this widget. This replaces the existing text. * \brief Set text for this widget. This replaces the existing text.
* \param text New text for this text edit widget. * \param text New text for this text edit widget.
* \return false if \a text is not allowed to be set. * \return false if \a text is not allowed to be set.
* On successful insertion, the cursor is moved to the end of the text * On successful insertion, the cursor is moved to the end of the text
*/ */
bool setText(const QString &text); bool setText(const QString &text);
/** /**
 End of changes. 2 change blocks. 
0 lines changed or deleted 11 lines changed or added


 mtexteditmodel.h   mtexteditmodel.h 
skipping to change at line 95 skipping to change at line 95
M_MODEL_PROPERTY(MTextEditModel::EditMode, edit, Edit, true, MTextEditM odel::EditModeBasic) M_MODEL_PROPERTY(MTextEditModel::EditMode, edit, Edit, true, MTextEditM odel::EditModeBasic)
M_MODEL_PROPERTY(MTextEditModel::LineMode, line, Line, true, MTextEditM odel::SingleLine) M_MODEL_PROPERTY(MTextEditModel::LineMode, line, Line, true, MTextEditM odel::SingleLine)
M_MODEL_PTR_PROPERTY(QTextDocument *, document, Document, true, NULL) M_MODEL_PTR_PROPERTY(QTextDocument *, document, Document, true, NULL)
M_MODEL_PTR_PROPERTY(QTextCursor *, cursor, Cursor, true, NULL) M_MODEL_PTR_PROPERTY(QTextCursor *, cursor, Cursor, true, NULL)
M_MODEL_PROPERTY(QString, text, Text, true, QString()) M_MODEL_PROPERTY(QString, text, Text, true, QString())
M_MODEL_PROPERTY(M::TextContentType, type, Type, true, M::FreeTextConte ntType) M_MODEL_PROPERTY(M::TextContentType, type, Type, true, M::FreeTextConte ntType)
M_MODEL_PROPERTY(Qt::TextInteractionFlags, textInteractionFlags, TextIn teractionFlags, true, Qt::TextEditorInteraction) M_MODEL_PROPERTY(Qt::TextInteractionFlags, textInteractionFlags, TextIn teractionFlags, true, Qt::TextEditorInteraction)
M_MODEL_PROPERTY(bool, errorHighlight, ErrorHighlight, true, false)
M_MODEL_PROPERTY(bool, inputMethodCorrectionEnabled, InputMethodCorrect ionEnabled, true, true) M_MODEL_PROPERTY(bool, inputMethodCorrectionEnabled, InputMethodCorrect ionEnabled, true, true)
M_MODEL_PROPERTY(bool, isReadOnly, ReadOnly, true, false) M_MODEL_PROPERTY(bool, isReadOnly, ReadOnly, true, false)
M_MODEL_PROPERTY(bool, inputMethodAutoCapitalizationEnabled, InputMetho dAutoCapitalizationEnabled, true, true) M_MODEL_PROPERTY(bool, inputMethodAutoCapitalizationEnabled, InputMetho dAutoCapitalizationEnabled, true, true)
M_MODEL_PROPERTY(bool, autoSelectionEnabled, AutoSelectionEnabled, true , false) M_MODEL_PROPERTY(bool, autoSelectionEnabled, AutoSelectionEnabled, true , false)
M_MODEL_PROPERTY(bool, inputMethodPredictionEnabled, InputMethodPredict ionEnabled, true, false) M_MODEL_PROPERTY(bool, inputMethodPredictionEnabled, InputMethodPredict ionEnabled, true, false)
M_MODEL_PROPERTY(int, maxLength, MaxLength, true, std::numeric_limits< int>::max()) M_MODEL_PROPERTY(int, maxLength, MaxLength, true, std::numeric_limits< int>::max())
M_MODEL_PROPERTY(QString, prompt, Prompt, true, QString()) M_MODEL_PROPERTY(QString, prompt, Prompt, true, QString())
M_MODEL_PROPERTY(QString, toolbar, Toolbar, true, QString()) M_MODEL_PROPERTY(QString, toolbar, Toolbar, true, QString())
M_MODEL_PROPERTY(int, toolbarId, ToolbarId, true, -1) M_MODEL_PROPERTY(int, toolbarId, ToolbarId, true, -1)
M_MODEL_PROPERTY(MTextEditModel::EchoMode, echo, Echo, true, MTextEditM odel::Normal) M_MODEL_PROPERTY(MTextEditModel::EchoMode, echo, Echo, true, MTextEditM odel::Normal)
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 mtexteditstyle.h   mtexteditstyle.h 
skipping to change at line 81 skipping to change at line 81
/*! /*!
\property MTextEditStyle::changeSelectionFeedback \property MTextEditStyle::changeSelectionFeedback
\brief Feedback given when finger movement changes text selection \brief Feedback given when finger movement changes text selection
*/ */
M_STYLE_ATTRIBUTE(MFeedback, changeSelectionFeedback, ChangeSelectionFe edback) M_STYLE_ATTRIBUTE(MFeedback, changeSelectionFeedback, ChangeSelectionFe edback)
}; };
class M_VIEWS_EXPORT MTextEditStyleContainer : public MWidgetStyleContainer class M_VIEWS_EXPORT MTextEditStyleContainer : public MWidgetStyleContainer
{ {
M_STYLE_CONTAINER(MTextEditStyle) M_STYLE_CONTAINER(MTextEditStyle)
M_STYLE_MODE(Error)
}; };
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 mwidgetanimation.h   mwidgetanimation.h 
skipping to change at line 52 skipping to change at line 52
widgets. widgets.
The class is based on the QVariantAnimation and QAnimationGroup classes. A The class is based on the QVariantAnimation and QAnimationGroup classes. A
single QVariantAnimation class offers only interface for animating single single QVariantAnimation class offers only interface for animating single
property of a single object. MWidgetAnimation combines these two animatio n property of a single object. MWidgetAnimation combines these two animatio n
classes and provides an easy to use interface for animating several objec ts and classes and provides an easy to use interface for animating several objec ts and
properties at the same time. properties at the same time.
\section examples Examples \section examples Examples
Animate single widget from it's current position to another. Animate single widget from its current position to another.
\code \code
MWidgetAnimation* a = new MWidgetAnimation(NULL); MWidgetAnimation* a = new MWidgetAnimation(NULL);
a->setTargetPosition(widget, QPointF(50,50)); a->setTargetPosition(widget, QPointF(50,50));
a->start(QAbstractAnimation::DeleteWhenStopped); a->start(QAbstractAnimation::DeleteWhenStopped);
\endcode \endcode
Animate several widgets at the same time. Animate several widgets at the same time.
\code \code
MWidgetAnimation* a = new MWidgetAnimation(NULL); MWidgetAnimation* a = new MWidgetAnimation(NULL);
a->setTargetOpacity(widget0, 0.0); a->setTargetOpacity(widget0, 0.0);
 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/