mapplication.h   mapplication.h 
skipping to change at line 105 skipping to change at line 105
* \note Warning: The data referred to by argc and argv must stay valid for the entire * \note Warning: The data referred to by argc and argv must stay valid for the entire
* lifetime of the MApplication object. In addition, argc must be great er than zero and * lifetime of the MApplication object. In addition, argc must be great er than zero and
* argv must contain at least one valid character string. * argv must contain at least one valid character string.
*/ */
MApplication(int &argc, char **argv, const QString &appIdentifier = QSt ring(), MApplicationService *service = 0); MApplication(int &argc, char **argv, const QString &appIdentifier = QSt ring(), MApplicationService *service = 0);
MApplication(int &argc, char **argv, MApplicationService *service); MApplication(int &argc, char **argv, MApplicationService *service);
//! Cleans up any window system resources that were allocated by this a pplication. //! Cleans up any window system resources that were allocated by this a pplication.
virtual ~MApplication(); virtual ~MApplication();
//! \reimp
// Reimplement QApplication::notify so we catch eventual
// exceptions thrown from within event handlers
virtual bool notify(QObject *receiver, QEvent *event);
//! \reimp_end
/*! \brief Returns a pointer to the application's MApplication instance . /*! \brief Returns a pointer to the application's MApplication instance .
* If no instance has been allocated, null is returned. * If no instance has been allocated, null is returned.
* \sa QCoreApplication::instance() * \sa QCoreApplication::instance()
*/ */
static MApplication *instance(); static MApplication *instance();
//! Target device name //! Target device name
static QString deviceName(); static QString deviceName();
//! Software rendering command line option set //! Software rendering command line option set
static bool softwareRendering(); static bool softwareRendering();
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 lines changed or added


 mbuttoniconstyle.h   mbuttoniconstyle.h 
skipping to change at line 24 skipping to change at line 24
** License version 2.1 as published by the Free Software Foundation ** License version 2.1 as published by the Free Software Foundation
** and appearing in the file LICENSE.LGPL included in the packaging ** and appearing in the file LICENSE.LGPL included in the packaging
** of this file. ** of this file.
** **
*************************************************************************** */ *************************************************************************** */
#ifndef MBUTTONICONSTYLE_H #ifndef MBUTTONICONSTYLE_H
#define MBUTTONICONSTYLE_H #define MBUTTONICONSTYLE_H
#include <mbuttonstyle.h> #include <mbuttonstyle.h>
#include <mnamespace.h>
/*! /*!
\class MButtonIconStyle \class MButtonIconStyle
\brief Style class for m icon buttons. \brief Style class for m icon buttons.
\ingroup styles \ingroup styles
\sa MButtonIconStyleContainer MWidgetStyle MButtonStyle \ref styling MB utton MButtonIconView \sa MButtonIconStyleContainer MWidgetStyle MButtonStyle \ref styling MB utton MButtonIconView
*/ */
class M_VIEWS_EXPORT MButtonIconStyle : public MButtonStyle class M_VIEWS_EXPORT MButtonIconStyle : public MButtonStyle
{ {
skipping to change at line 62 skipping to change at line 63
*/ */
M_STYLE_ATTRIBUTE(int, glowRadius, GlowRadius) M_STYLE_ATTRIBUTE(int, glowRadius, GlowRadius)
/*! /*!
\deprecated Not in use. \deprecated Not in use.
*/ */
M_STYLE_ATTRIBUTE(int, shrinkDuration, ShrinkDuration) M_STYLE_ATTRIBUTE(int, shrinkDuration, ShrinkDuration)
/*! /*!
\deprecated Not in use. \deprecated Not in use.
*/ */
M_STYLE_ATTRIBUTE(qreal, shrinkFactor, ShrinkFactor) M_STYLE_ATTRIBUTE(qreal, shrinkFactor, ShrinkFactor)
/*!
\property MButtonIconStyle::labelWrapMode
\brief Wrap mode for the button label.
*/
M_STYLE_ATTRIBUTE(QTextOption::WrapMode, textWrapMode, textWrapMode)
/*!
\property MButtonIconStyle::LabelEliding
\brief Boolean flag for defining whether label should elide or not.
*/
M_STYLE_ATTRIBUTE(bool, textEliding, TextEliding)
}; };
/*! /*!
\class MButtonIconStyleContainer \class MButtonIconStyleContainer
\brief Style mode container class for MButtonIconStyle. \brief Style mode container class for MButtonIconStyle.
\ingroup styles \ingroup styles
\sa MButtonIconStyle \sa MButtonIconStyle
*/ */
class M_VIEWS_EXPORT MButtonIconStyleContainer : public MButtonStyleContain er class M_VIEWS_EXPORT MButtonIconStyleContainer : public MButtonStyleContain er
 End of changes. 2 change blocks. 
0 lines changed or deleted 13 lines changed or added


 mbuttoniconview.h   mbuttoniconview.h 
skipping to change at line 28 skipping to change at line 28
*************************************************************************** */ *************************************************************************** */
#ifndef MBUTTONICONVIEW_H #ifndef MBUTTONICONVIEW_H
#define MBUTTONICONVIEW_H #define MBUTTONICONVIEW_H
#include "mbuttonview.h" #include "mbuttonview.h"
#include <mbuttonmodel.h> #include <mbuttonmodel.h>
#include <mbuttoniconstyle.h> #include <mbuttoniconstyle.h>
class MButton; class MButton;
class MButtonIconViewPrivate;
/*! /*!
\class MButtonIconView \class MButtonIconView
\brief View class for icon button. \brief View class for icon button.
\ingroup views \ingroup views
\section MButtonIconViewOverview Overview \section MButtonIconViewOverview Overview
MButtonIconView is used for drawing buttons without a background. MButtonIconView is used for drawing buttons without a background.
The icon and the text are rendered similarly as in the MButtonView The icon and the text are rendered similarly as in the MButtonView
skipping to change at line 71 skipping to change at line 72
virtual ~MButtonIconView(); virtual ~MButtonIconView();
protected: protected:
//! \reimp //! \reimp
virtual void drawContents(QPainter *painter, const QStyleOptionGraphics Item *option) const; virtual void drawContents(QPainter *painter, const QStyleOptionGraphics Item *option) const;
virtual void drawBackground(QPainter *painter, const QStyleOptionGraphi csItem *option) const; virtual void drawBackground(QPainter *painter, const QStyleOptionGraphi csItem *option) const;
virtual void applyStyle(); virtual void applyStyle();
virtual void updateData(const QList<const char *>& modifications); virtual void updateData(const QList<const char *>& modifications);
//! \reimp_end //! \reimp_end
//! \internal
MButtonIconView(MButtonIconViewPrivate &dd, MButton *controller);
//! \internal_end
private: private:
Q_DISABLE_COPY(MButtonIconView) Q_DISABLE_COPY(MButtonIconView)
Q_DECLARE_PRIVATE(MButtonIconView)
#ifdef UNIT_TEST #ifdef UNIT_TEST
friend class Ut_MButtonIconView; friend class Ut_MButtonIconView;
#endif #endif
}; };
#endif #endif
 End of changes. 3 change blocks. 
0 lines changed or deleted 6 lines changed or added


 mdebug.h   mdebug.h 
skipping to change at line 28 skipping to change at line 28
*************************************************************************** */ *************************************************************************** */
#ifndef MDEBUG_H #ifndef MDEBUG_H
#define MDEBUG_H #define MDEBUG_H
#include <QDebug> #include <QDebug>
//! \internal //! \internal
class MWidgetController; class MWidgetController;
class QGraphicsWidget;
class MDebug class MDebug
{ {
public: public:
typedef void (*MMsgHandler)(int, const char *); typedef void (*MMsgHandler)(int, const char *);
enum Type { enum Type {
Debug, Debug,
Warning, Warning,
Fatal, Fatal,
skipping to change at line 55 skipping to change at line 56
MDebug(int type = Debug); MDebug(int type = Debug);
MDebug(const MDebug &debug); MDebug(const MDebug &debug);
~MDebug(); ~MDebug();
MDebug &operator<<(const QString &string); MDebug &operator<<(const QString &string);
MDebug &operator<<(const MWidgetController *controller); MDebug &operator<<(const MWidgetController *controller);
static void installMessageHandler(MMsgHandler handler); static void installMessageHandler(MMsgHandler handler);
static MMsgHandler messageHandler(); static MMsgHandler messageHandler();
/*! Print out, using qWarning(), details all the children recursively,
along with their geometry and sizehints. */
static void printDebugChildInformation(QGraphicsWidget *widget, int ini
tialIndentationDepth = 0);
private: private:
void flush(); void flush();
QtMsgType convertMsgType(int type); QtMsgType convertMsgType(int type);
struct Stream { struct Stream {
Stream(int type) : ts(&buffer, QIODevice::WriteOnly), ref(1), type( type), output(true) {} Stream(int type) : ts(&buffer, QIODevice::WriteOnly), ref(1), type( type), output(true) {}
QTextStream ts; QTextStream ts;
QString buffer; QString buffer;
int ref; int ref;
 End of changes. 2 change blocks. 
0 lines changed or deleted 6 lines changed or added


 mdeviceprofile.h   mdeviceprofile.h 
skipping to change at line 57 skipping to change at line 57
//! Return the target device resolution //! Return the target device resolution
QSize resolution() const; QSize resolution() const;
//! Return the target device pixels per inch //! Return the target device pixels per inch
QSize pixelsPerInch() const; QSize pixelsPerInch() const;
//! Return whether the status bar should be shown on target device //! Return whether the status bar should be shown on target device
bool showStatusbar() const; bool showStatusbar() const;
/*!
\brief Returns the resulting orientation of a device for a given rota
tion angle.
The rotation is relative to the position where the device's display h
as its
top edge on top.
For devices whose display native resolution is landscape:
\li Angle0 and Angle180 are landscape angles.
\li Angle90 and Angle270 are portrait angles.
For devices whose display native resolution is portrait:
\li Angle0 and Angle180 are portrait angles.
\li Angle90 and Angle270 are landscape angles.
orientationFromAngle(M::Angle0) returns the display's native orient
ation.
*/
M::Orientation orientationFromAngle(M::OrientationAngle angle) const;
//! Returns true if orientation angle is supported for given keyboard s tate. //! Returns true if orientation angle is supported for given keyboard s tate.
bool orientationAngleIsSupported(M::OrientationAngle angle, bool isKeyb oardOpen) const; bool orientationAngleIsSupported(M::OrientationAngle angle, bool isKeyb oardOpen) const;
//! Returns the number of pixels required to display a length of \a mm millimeters on this device. //! Returns the number of pixels required to display a length of \a mm millimeters on this device.
int mmToPixels(qreal mm); int mmToPixels(qreal mm);
//! Returns the number of pixels required to display a length of \a mm millimeters on this device using floating point precision. //! Returns the number of pixels required to display a length of \a mm millimeters on this device using floating point precision.
qreal mmToPixelsF(qreal mm); qreal mmToPixelsF(qreal mm);
//! Returns point size in pixels on this device. //! Returns point size in pixels on this device.
 End of changes. 1 change blocks. 
0 lines changed or deleted 21 lines changed or added


 mlabelmodel.h   mlabelmodel.h 
skipping to change at line 27 skipping to change at line 27
** **
*************************************************************************** */ *************************************************************************** */
#ifndef MLABELMODEL_H #ifndef MLABELMODEL_H
#define MLABELMODEL_H #define MLABELMODEL_H
#include <QApplication> #include <QApplication>
#include <QList> #include <QList>
#include <QTextOption> #include <QTextOption>
#include <mwidgetmodel.h> #include <mwidgetmodel.h>
#include <mnamespace.h>
class MLabelHighlighter; class MLabelHighlighter;
Q_DECLARE_METATYPE(QTextOption::WrapMode)
/*! /*!
\class MLabelModel \class MLabelModel
\brief Model class for MLabel. \brief Model class for MLabel.
\ingroup models \ingroup models
\sa MLabel \sa MLabel
*/ */
class M_CORE_EXPORT MLabelModel : public MWidgetModel class M_CORE_EXPORT MLabelModel : public MWidgetModel
{ {
 End of changes. 2 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mlocale.h   mlocale.h 
skipping to change at line 28 skipping to change at line 28
*************************************************************************** */ *************************************************************************** */
#ifndef MLOCALE_H #ifndef MLOCALE_H
#define MLOCALE_H #define MLOCALE_H
#include "mexport.h" #include "mexport.h"
#include <float.h> #include <float.h>
#include <QtGlobal> #include <QtGlobal>
#include <QObject> #include <QObject>
#include <QMap>
class QString; class QString;
class QStringList; class QStringList;
class QDateTime; class QDateTime;
class QTranslator; class QTranslator;
class MCollator; class MCollator;
class MAbstractName; class MAbstractName;
class MCalendar; class MCalendar;
class MBreakIteratorPrivate; class MBreakIteratorPrivate;
skipping to change at line 722 skipping to change at line 723
* *
* As can be seen in the above examples, this function tries to * As can be seen in the above examples, this function tries to
* return useful extra buckets for strings which sort out of the * return useful extra buckets for strings which sort out of the
* range of the bucket list of the language of the current locale. * range of the bucket list of the language of the current locale.
* For example if one is running in Czech locale but has also some * For example if one is running in Czech locale but has also some
* Japanese and some Greek names in the contact list these foreign * Japanese and some Greek names in the contact list these foreign
* strings sort outside of the range of the Czech bucket list. * strings sort outside of the range of the Czech bucket list.
* This function tries to create useful extra buckets for these * This function tries to create useful extra buckets for these
* foreign strings. * foreign strings.
* *
* For applications using an MAbstractItemModel, it is probably more
* convenient to use the MLocaleBuckets class that uses this function
* internally.
*
* \sa MLocaleBuckets
* \sa exemplarCharactersIndex() * \sa exemplarCharactersIndex()
*/ */
QString indexBucket(const QString &str) const; QString indexBucket(const QString &str) const;
/*! /*!
* \brief Internal version of MLocale::indexBucket().
*
* \param str String to find a bucket for
* \param buckets bucket list (result of MLocale::exemplarCharactersInd
ex())
* \param collator collator to use for sorting.
*
* This overloaded function is more efficient if a large number of inde
x
* buckets is to be retrieved since it can re-use the buckets list and
the
* collator from one call to the next. Before the first call, initializ
e
* the 'buckets' list with MLocale::exemplarCharactersIndex().
*/
QString indexBucket(const QString &str, const QStringList &buckets, con
st MCollator &collator) const;
/*!
* \brief Returns the language code of the locale in ISO-639 format * \brief Returns the language code of the locale in ISO-639 format
* *
* If the language code cannot be parsed out of the locale name * If the language code cannot be parsed out of the locale name
* an empty string is returned. * an empty string is returned.
* *
* Example: * Example:
* If the locale name is “fi_FI”, this will return “fi”. * If the locale name is “fi_FI”, this will return “fi”.
* *
* \sa name() * \sa name()
* \sa script() * \sa script()
 End of changes. 3 change blocks. 
0 lines changed or deleted 25 lines changed or added


 mnamespace.h   mnamespace.h 
skipping to change at line 25 skipping to change at line 25
** and appearing in the file LICENSE.LGPL included in the packaging ** and appearing in the file LICENSE.LGPL included in the packaging
** of this file. ** of this file.
** **
*************************************************************************** */ *************************************************************************** */
#ifndef MNAMESPACE_H #ifndef MNAMESPACE_H
#define MNAMESPACE_H #define MNAMESPACE_H
#include <QMetaType> #include <QMetaType>
#include <QMessageBox> #include <QMessageBox>
#include <QTextOption>
#include "mexport.h" #include "mexport.h"
namespace M namespace M
{ {
enum AssemblyType { enum AssemblyType {
Library, Library,
Application, Application,
AssemblyNone AssemblyNone
}; };
skipping to change at line 55 skipping to change at line 55
*/ */
M_CORE_EXPORT extern const char* NoMNavigationBar; M_CORE_EXPORT extern const char* NoMNavigationBar;
/*! /*!
* setting a dynamic property to QApplication named NoMStatusBar will h ide the * setting a dynamic property to QApplication named NoMStatusBar will h ide the
* statusbar from qt maemo 6 style * statusbar from qt maemo 6 style
*/ */
M_CORE_EXPORT extern const char* NoMStatusBar; M_CORE_EXPORT extern const char* NoMStatusBar;
/*! /*!
* This enum contains values of the orientation angle of windows in the * \brief An enumeration of different rotation angles.
application.
*
* \sa Orientation * \sa Orientation
*/ */
enum OrientationAngle { enum OrientationAngle {
Angle0 = 0, Angle0 = 0, //!< No rotation.
Angle90 = 90, Angle90 = 90, //!< 90 degrees of rotation, clockwise.
Angle180 = 180, Angle180 = 180, //!< 180 degrees of rotation, clockwise.
Angle270 = 270 Angle270 = 270 //!< 270 degrees of rotation, clockwise.
}; };
/*! /*!
* This enum contains possible values for orientation of windows in the * \brief This enum contains values that defines a basic relationship b
application. etween the width and
* height of windows, displays, rectangles, etc.
* *
* \sa OrientationAngle * \sa OrientationAngle
*/ */
enum Orientation { enum Orientation {
Portrait, //!< equal to either M::Angle90 or M::Angle270 orientatio Portrait, //!< Window's or display's height is larger than its widt
n angles h
Landscape //!< equal to either M::Angle0 or M::Angle180 orientation Landscape //!< Window's or display's width is larger than (or equal
angles to) its height
}; };
/*! /*!
* This enum contains all possible positions for a tile in a layout * This enum contains all possible positions for a tile in a layout
* \code * \code
.---. .-----------------------. .---. .-----------------------.
/ \ / | | \ / \ / | | \
| Default | | H-L x H-C x H-R | | Default | | H-L x H-C x H-R |
\ / \ | | / \ / \ | | /
'---' '-----------------------' '---' '-----------------------'
skipping to change at line 307 skipping to change at line 307
Q_DECLARE_METATYPE(M::Orientation) Q_DECLARE_METATYPE(M::Orientation)
Q_DECLARE_METATYPE(M::Position) Q_DECLARE_METATYPE(M::Position)
Q_DECLARE_METATYPE(M::RecursionMode) Q_DECLARE_METATYPE(M::RecursionMode)
Q_DECLARE_METATYPE(M::InputMethodQueryExtensions) Q_DECLARE_METATYPE(M::InputMethodQueryExtensions)
Q_DECLARE_METATYPE(M::PreeditFace) Q_DECLARE_METATYPE(M::PreeditFace)
Q_DECLARE_METATYPE(M::TextContentType) Q_DECLARE_METATYPE(M::TextContentType)
Q_DECLARE_METATYPE(M::InputMethodMode) Q_DECLARE_METATYPE(M::InputMethodMode)
Q_DECLARE_METATYPE(M::PrestartMode) Q_DECLARE_METATYPE(M::PrestartMode)
Q_DECLARE_METATYPE(M::StandardButton) Q_DECLARE_METATYPE(M::StandardButton)
Q_DECLARE_METATYPE(QTextOption::WrapMode)
#endif #endif
 End of changes. 6 change blocks. 
14 lines changed or deleted 14 lines changed or added


 msheet.h   msheet.h 
skipping to change at line 151 skipping to change at line 151
Typical usage is to set a layout of MButtons to it. Typical usage is to set a layout of MButtons to it.
\code \code
QGraphicsLayout *headerLayout = new QGraphicsLinearLayout(sheet->head erWidget()); QGraphicsLayout *headerLayout = new QGraphicsLinearLayout(sheet->head erWidget());
headerLayout->addItem(new MButton("Cancel")); headerLayout->addItem(new MButton("Cancel"));
headerLayout->addStretch(); headerLayout->addStretch();
headerLayout->addItem(new MButton("Save")); headerLayout->addItem(new MButton("Save"));
\endcode \endcode
\sa setHeaderWidget() For most common cases (such as the example above) you should consider
using MBasicSheetHeader.
\sa setHeaderWidget(), MBasicSheetHeader
*/ */
QGraphicsWidget *headerWidget(); QGraphicsWidget *headerWidget();
/*! /*!
\brief Sets the widget to be placed on sheet's header \brief Sets the widget to be placed on sheet's header
\note MSheet takes ownership of \a widget and deletes it at the appro priate \note MSheet takes ownership of \a widget and deletes it at the appro priate
time. time.
\param widget the widget to be placed on sheet's header \param widget the widget to be placed on sheet's header
 End of changes. 1 change blocks. 
1 lines changed or deleted 4 lines changed or added


 mtextedit.h   mtextedit.h 
skipping to change at line 157 skipping to change at line 157
/*! /*!
* \brief Returns current text * \brief Returns current text
* \return QString containing current widget text * \return QString containing current widget text
*/ */
QString text() const; QString text() const;
/*! /*!
* \brief Returns the current document * \brief Returns the current document
* \return pointer to the document * \return pointer to the document
* \note Caution advised if changes are done using this interface. Chan
ge signals
* are not necessarily emitted and care is needed not to break MTextEdi
t state.
*/ */
QTextDocument *document() const; QTextDocument *document() const;
/*! /*!
* \brief Returns a copy of the currently visible cursor. * \brief Returns a copy of the currently visible cursor.
* \note Caution advised if changes are done using this interface. Chan
ge signals
* are not necessarily emitted and care is needed not to break MTextEdi
t state.
*/ */
QTextCursor textCursor() const; QTextCursor textCursor() const;
/*! /*!
* \brief Sets the currently visible cursor. * \brief Sets the currently visible cursor.
*/ */
void setTextCursor(const QTextCursor &cursor); void setTextCursor(const QTextCursor &cursor);
/*! /*!
* \brief set content type * \brief set content type
skipping to change at line 349 skipping to change at line 353
void setInputMethodAutoCapitalizationEnabled(bool enabled); void setInputMethodAutoCapitalizationEnabled(bool enabled);
/* /*
* \brief returns if auto-capitalization support is enabled for input m ethod servers * \brief returns if auto-capitalization support is enabled for input m ethod servers
*/ */
bool inputMethodAutoCapitalizationEnabled() const; bool inputMethodAutoCapitalizationEnabled() const;
/*! /*!
* \brief sets prompt value * \brief sets prompt value
* \param prompt prompt text * \param prompt prompt text
* Prompt is shown inside text entry when the entry doesn't have focus or contents * Prompt is placeholder text for describing a text enty.
*/ */
void setPrompt(const QString &prompt); void setPrompt(const QString &prompt);
/*! /*!
* \brief returns current prompt text * \brief returns current prompt text
*/ */
QString prompt() const; QString prompt() const;
/*! /*!
* \brief sets the MTextEdit only to accept input that the validator ac cepts. * \brief sets the MTextEdit only to accept input that the validator ac cepts.
skipping to change at line 557 skipping to change at line 561
void returnPressed(); void returnPressed();
protected: protected:
/*! \reimp */ /*! \reimp */
virtual void keyPressEvent(QKeyEvent *event); virtual void keyPressEvent(QKeyEvent *event);
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
virtual void focusInEvent(QFocusEvent *event); virtual void focusInEvent(QFocusEvent *event);
virtual void focusOutEvent(QFocusEvent *event); virtual void focusOutEvent(QFocusEvent *event);
virtual void inputMethodEvent(QInputMethodEvent *); virtual void inputMethodEvent(QInputMethodEvent *);
virtual void changeEvent(QEvent *event); virtual void changeEvent(QEvent *event);
virtual void retranslateUi();
virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const; virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
virtual QVariant itemChange(GraphicsItemChange change, const QVariant & value); virtual QVariant itemChange(GraphicsItemChange change, const QVariant & value);
/*! \reimp_end */ /*! \reimp_end */
private: private:
Q_DECLARE_PRIVATE(MTextEdit) Q_DECLARE_PRIVATE(MTextEdit)
Q_DISABLE_COPY(MTextEdit) Q_DISABLE_COPY(MTextEdit)
friend class MCompleterViewPrivate; friend class MCompleterViewPrivate;
friend class MTextEditViewPrivate; friend class MTextEditViewPrivate;
 End of changes. 4 change blocks. 
1 lines changed or deleted 10 lines changed or added


 mtexteditmodel.h   mtexteditmodel.h 
/************************************************************************** * /************************************************************************** *
** **
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** Copyright (C) 2010-2011 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved. ** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com) ** Contact: Nokia Corporation (directui@nokia.com)
** **
** This file is part of libmeegotouch. ** This file is part of libmeegotouch.
** **
** If you have questions regarding the use of this file, please contact ** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com. ** Nokia at directui@nokia.com.
** **
** This library is free software; you can redistribute it and/or ** This library is free software; you can redistribute it and/or
** modify it under the terms of the GNU Lesser General Public ** modify it under the terms of the GNU Lesser General Public
skipping to change at line 46 skipping to change at line 46
int start; int start;
int length; int length;
QTextCharFormat format; QTextCharFormat format;
}; };
class M_CORE_EXPORT MTextEditModel : public MWidgetModel class M_CORE_EXPORT MTextEditModel : public MWidgetModel
{ {
Q_OBJECT Q_OBJECT
M_MODEL_INTERNAL(MTextEditModel) M_MODEL_INTERNAL(MTextEditModel)
M_MODEL_CUSTOM_DESTRUCTOR
public: public:
//! Edit mode for MTextEdit //! Edit mode for MTextEdit
enum EditMode { enum EditMode {
//! The main mode of operation, no selection or preedit //! The main mode of operation, no selection or preedit
EditModeBasic, EditModeBasic,
//! preedit editing initiated //! preedit editing initiated
EditModeActive, EditModeActive,
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 mwindow.h   mwindow.h 
skipping to change at line 383 skipping to change at line 383
return app.exec(); return app.exec();
\endcode \endcode
\sa lockOrientationAngle(), unlockOrientationAngle() \sa lockOrientationAngle(), unlockOrientationAngle()
*/ */
void setOrientationLocked(bool locked); void setOrientationLocked(bool locked);
/*! Returns true if user can see the window. /*! Returns true if user can see the window.
* This is different from QWidget::isVisible(), which is always * This is different from QWidget::isVisible(), which is always
* explicitly set in the application. QWidget::isVisible() doesn't * explicitly set in the application. QWidget::isVisible() doesn't
* know if the window is e.g. covered by another window and cannot be * know if the window is e.g. covered by an opaque window and cannot b e
* seen. * seen.
*
* \note Translucent windows (windows that have an alpha channel) are
not
* considered to obscure the windows behind them, even if all their pi
xels
* happen to have alpha 1.0.
*
* \sa displayEntered(), displayExited()
*/ */
bool isOnDisplay() const; bool isOnDisplay() const;
/*! Returns true if the window is currently minimized to the switcher. /*! Returns true if the window is currently minimized to the switcher.
* It doesn't matter whether the window is visible or not in the * It doesn't matter whether the window is visible or not in the
* switcher. * switcher.
*/ */
bool isInSwitcher() const; bool isInSwitcher() const;
/*! /*!
skipping to change at line 546 skipping to change at line 552
\note This signal is emitted with every orientation angle change. \note This signal is emitted with every orientation angle change.
\sa orientationChanged() \sa orientationChanged()
*/ */
void orientationChangeFinished(M::Orientation); void orientationChangeFinished(M::Orientation);
/*! /*!
This signal is emitted when: This signal is emitted when:
- the window becomes visible - the window becomes visible
- is not obscured anymore by another window - is not obscured anymore by an opaque window
Calling show() will emit displayEntered() when the window becomes Calling show() will emit displayEntered() when the window becomes
visible. visible.
\sa displayExited(), isOnDisplay()
*/ */
void displayEntered(); void displayEntered();
/*! /*!
A signal that is emitted when: A signal that is emitted when:
- the window has been obscured by another window approximately for one second - the window has been obscured by an opaque window approximately for o ne second
- the window gets hidden - the window gets hidden
- the window gets closed - the window gets closed
Calling close() will immediately emit displayExited(). Calling close() will immediately emit displayExited().
\sa displayEntered(), isOnDisplay()
*/ */
void displayExited(); void displayExited();
/*! /*!
This signal is emitted when the window has entered the task switcer. This signal is emitted when the window has entered the task switcer.
*/ */
void switcherEntered(); void switcherEntered();
/*! /*!
This signal is emitted when the window has exited the task switcer. This signal is emitted when the window has exited the task switcer.
 End of changes. 6 change blocks. 
3 lines changed or deleted 15 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/