mcollator.h   mcollator.h 
skipping to change at line 44 skipping to change at line 44
MCollator(const MCollator &other); MCollator(const MCollator &other);
virtual ~MCollator(); virtual ~MCollator();
bool operator()(const QString &s1, const QString &s2) const; bool operator()(const QString &s1, const QString &s2) const;
static MLocale::Comparison compare(const QString &first, const QString &second); static MLocale::Comparison compare(const QString &first, const QString &second);
static MLocale::Comparison compare(MLocale &locale, const QString &firs t, static MLocale::Comparison compare(MLocale &locale, const QString &firs t,
const QString &second); const QString &second);
MCollator &operator=(const MCollator &other);
private: private:
// not implemented // not implemented
bool operator==(const MCollator &other) const; bool operator==(const MCollator &other) const;
bool operator!=(const MCollator &other) const; bool operator!=(const MCollator &other) const;
MCollator &operator=(const MCollator &other);
Q_DECLARE_PRIVATE(MCollator) Q_DECLARE_PRIVATE(MCollator)
MCollatorPrivate *const d_ptr; MCollatorPrivate *const d_ptr;
friend class MLocale; friend class MLocale;
}; };
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 mlocalebuckets.h   mlocalebuckets.h 
skipping to change at line 118 skipping to change at line 118
public: public:
/*! /*!
* \brief Constructor: Create an empty MLocaleBuckets object with the * \brief Constructor: Create an empty MLocaleBuckets object with the
* current locale. * current locale.
* *
* Remember to call setItems() at some point. * Remember to call setItems() at some point.
*/ */
MLocaleBuckets(); MLocaleBuckets();
/*! /*!
* \brief Constructor: Copies locale buckets from the other reference.
*/
MLocaleBuckets(const MLocaleBuckets &other);
/*!
* \brief Constructor: Create an MLocaleBuckets object from the specifi ed * \brief Constructor: Create an MLocaleBuckets object from the specifi ed
* list of items with the current locale. * list of items with the current locale.
* *
* This is equivalent to creating an empty MLocaleBuckets object and * This is equivalent to creating an empty MLocaleBuckets object and
* calling setItems() with that item list. * calling setItems() with that item list.
*/ */
explicit MLocaleBuckets(const QStringList &unsortedItems, Qt::SortOrder sortOrder = Qt::AscendingOrder); explicit MLocaleBuckets(const QStringList &unsortedItems, Qt::SortOrder sortOrder = Qt::AscendingOrder);
/*! /*!
* \brief Destructor. * \brief Destructor.
skipping to change at line 201 skipping to change at line 206
* If there is no item at that position, -1 is returned. * If there is no item at that position, -1 is returned.
* *
* \param bucketIndex index of the bucket. * \param bucketIndex index of the bucket.
* \param indexInBucket index within the bucket. Each bucket starts wit h 0. * \param indexInBucket index within the bucket. Each bucket starts wit h 0.
*/ */
int origItemIndex(int bucketIndex, int indexInBucket) const; int origItemIndex(int bucketIndex, int indexInBucket) const;
/*! /*!
* \brief Return the bucket size for the specified bucket index, i.e. t he * \brief Return the bucket size for the specified bucket index, i.e. t he
* number of items in that bucket. * number of items in that bucket.
*
* This returns -1 if there is no bucket with that index.
*/ */
int bucketSize(int bucketIndex) const; int bucketSize(int bucketIndex) const;
/*! /*!
* \brief Check if there are any buckets or items in this MLocaleBucket s * \brief Check if there are any buckets or items in this MLocaleBucket s
* object. * object.
*/ */
bool isEmpty() const; bool isEmpty() const;
/*! /*!
* \brief Clear this MLocaleBuckets object: Remove all items and all * \brief Clear this MLocaleBuckets object: Remove all items and all
* buckets. * buckets.
* *
* This is equivalent to setting an empty items list. * This is equivalent to setting an empty items list.
*/ */
void clear(); void clear();
/*!
* \brief Removes range of items from bucket.
*/
void removeBucketItems(int bucketIndex, int itemIndex, int count = 1);
/*!
* \brief Copies buckets and bucket items from the other reference.
*/
MLocaleBuckets& operator =(const MLocaleBuckets &other);
private: private:
Q_DISABLE_COPY(MLocaleBuckets)
Q_DECLARE_PRIVATE(MLocaleBuckets) Q_DECLARE_PRIVATE(MLocaleBuckets)
MLocaleBucketsPrivate *const d_ptr; MLocaleBucketsPrivate *const d_ptr;
}; };
#endif // MLOCALEBUCKETS_H #endif // MLOCALEBUCKETS_H
 End of changes. 4 change blocks. 
1 lines changed or deleted 17 lines changed or added


 mobjectmenuview.h   mobjectmenuview.h 
skipping to change at line 75 skipping to change at line 75
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
//! \reimp_end //! \reimp_end
protected slots: protected slots:
void actionAdded(MAction *action); void actionAdded(MAction *action);
void actionModified(MAction *action); void actionModified(MAction *action);
void actionRemoved(MAction *action); void actionRemoved(MAction *action);
private: private:
Q_PRIVATE_SLOT(d_func(), void contentActionTriggered()) Q_PRIVATE_SLOT(d_func(), void contentActionTriggered())
Q_PRIVATE_SLOT(d_func(), void appearing())
#ifdef UNIT_TEST #ifdef UNIT_TEST
friend class Ut_MObjectMenuView; friend class Ut_MObjectMenuView;
#endif #endif
}; };
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 mtheme.h   mtheme.h 
skipping to change at line 422 skipping to change at line 422
//! \internal_end //! \internal_end
private: private:
Q_DISABLE_COPY(MTheme) Q_DISABLE_COPY(MTheme)
Q_DECLARE_PRIVATE(MTheme) Q_DECLARE_PRIVATE(MTheme)
#ifndef UNIT_TEST #ifndef UNIT_TEST
Q_PRIVATE_SLOT(d_func(), void themeChangedSlot(QStringList,QStringList) ) Q_PRIVATE_SLOT(d_func(), void themeChangedSlot(QStringList,QStringList) )
Q_PRIVATE_SLOT(d_func(), void pixmapCreatedOrChangedSlot(QString,QSize, MPixmapHandle)) Q_PRIVATE_SLOT(d_func(), void pixmapCreatedOrChangedSlot(QString,QSize, MPixmapHandle))
Q_PRIVATE_SLOT(d_func(), void localeChangedSlot()) Q_PRIVATE_SLOT(d_func(), void localeChangedSlot())
Q_PRIVATE_SLOT(d_func(), void changeTheme())
#endif #endif
friend class MApplicationPrivate; friend class MApplicationPrivate;
friend class MAssemblyPrivate; friend class MAssemblyPrivate;
friend class MComponentCachePrivate; friend class MComponentCachePrivate;
friend class MComponentData; friend class MComponentData;
friend class MWidgetController; friend class MWidgetController;
friend class MStyle; friend class MStyle;
#ifdef UNIT_TEST #ifdef UNIT_TEST
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 mtoolbarview.h   mtoolbarview.h 
skipping to change at line 80 skipping to change at line 80
/*! /*!
\brief Destructs the view. \brief Destructs the view.
*/ */
virtual ~MToolBarView(); virtual ~MToolBarView();
MWidget *getWidget(QAction *action) const; MWidget *getWidget(QAction *action) const;
//! \reimp //! \reimp
virtual QRectF boundingRect() const; virtual QRectF boundingRect() const;
virtual void resizeEvent(QGraphicsSceneResizeEvent *event); virtual void resizeEvent(QGraphicsSceneResizeEvent *event);
virtual void orientationChangeEvent(MOrientationChangeEvent *event);
//! \reimp_end //! \reimp_end
protected: protected:
//! \reimp //! \reimp
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();
//! \reimp_end //! \reimp_end
/*! /*!
\brief protected constructor \brief protected constructor
 End of changes. 1 change blocks. 
0 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/