QtGui: declare some classes as shared
Change-Id: I0ebb0ca8b8edcecc939021407d1755693f97e553 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
This commit is contained in:
parent
340bd0d429
commit
6f86fea820
@ -186,6 +186,8 @@ private:
|
|||||||
friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &s, const QPalette &p);
|
friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &s, const QPalette &p);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_SHARED(QPalette)
|
||||||
|
|
||||||
inline void QPalette::setColor(ColorGroup acg, ColorRole acr,
|
inline void QPalette::setColor(ColorGroup acg, ColorRole acr,
|
||||||
const QColor &acolor)
|
const QColor &acolor)
|
||||||
{ setBrush(acg, acr, QBrush(acolor)); }
|
{ setBrush(acg, acr, QBrush(acolor)); }
|
||||||
|
@ -140,6 +140,8 @@ private:
|
|||||||
QSharedDataPointer<QColorDialogOptionsPrivate> d;
|
QSharedDataPointer<QColorDialogOptionsPrivate> d;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_SHARED(QColorDialogOptions)
|
||||||
|
|
||||||
class Q_GUI_EXPORT QPlatformColorDialogHelper : public QPlatformDialogHelper
|
class Q_GUI_EXPORT QPlatformColorDialogHelper : public QPlatformDialogHelper
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
@ -187,6 +189,8 @@ private:
|
|||||||
QSharedDataPointer<QFontDialogOptionsPrivate> d;
|
QSharedDataPointer<QFontDialogOptionsPrivate> d;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_SHARED(QFontDialogOptions)
|
||||||
|
|
||||||
class Q_GUI_EXPORT QPlatformFontDialogHelper : public QPlatformDialogHelper
|
class Q_GUI_EXPORT QPlatformFontDialogHelper : public QPlatformDialogHelper
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
@ -281,6 +285,8 @@ private:
|
|||||||
QSharedDataPointer<QFileDialogOptionsPrivate> d;
|
QSharedDataPointer<QFileDialogOptionsPrivate> d;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_SHARED(QFileDialogOptions)
|
||||||
|
|
||||||
class Q_GUI_EXPORT QPlatformFileDialogHelper : public QPlatformDialogHelper
|
class Q_GUI_EXPORT QPlatformFileDialogHelper : public QPlatformDialogHelper
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
@ -316,6 +316,7 @@ private:
|
|||||||
uint resolve_mask;
|
uint resolve_mask;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_SHARED(QFont)
|
||||||
|
|
||||||
inline bool QFont::bold() const
|
inline bool QFont::bold() const
|
||||||
{ return weight() > Normal; }
|
{ return weight() > Normal; }
|
||||||
|
@ -83,6 +83,8 @@ private:
|
|||||||
QExplicitlySharedDataPointer<QFontPrivate> d;
|
QExplicitlySharedDataPointer<QFontPrivate> d;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_SHARED(QFontInfo)
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
QT_END_HEADER
|
QT_END_HEADER
|
||||||
|
@ -125,6 +125,7 @@ private:
|
|||||||
QExplicitlySharedDataPointer<QFontPrivate> d;
|
QExplicitlySharedDataPointer<QFontPrivate> d;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_SHARED(QFontMetrics)
|
||||||
|
|
||||||
class Q_GUI_EXPORT QFontMetricsF
|
class Q_GUI_EXPORT QFontMetricsF
|
||||||
{
|
{
|
||||||
@ -186,6 +187,8 @@ private:
|
|||||||
QExplicitlySharedDataPointer<QFontPrivate> d;
|
QExplicitlySharedDataPointer<QFontPrivate> d;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_SHARED(QFontMetricsF)
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
QT_END_HEADER
|
QT_END_HEADER
|
||||||
|
@ -126,7 +126,7 @@ private:
|
|||||||
QExplicitlySharedDataPointer<QGlyphRunPrivate> d;
|
QExplicitlySharedDataPointer<QGlyphRunPrivate> d;
|
||||||
};
|
};
|
||||||
|
|
||||||
Q_DECLARE_TYPEINFO(QGlyphRun, Q_MOVABLE_TYPE);
|
Q_DECLARE_SHARED(QGlyphRun)
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
@ -145,6 +145,8 @@ private:
|
|||||||
QExplicitlySharedDataPointer<QRawFontPrivate> d;
|
QExplicitlySharedDataPointer<QRawFontPrivate> d;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_SHARED(QRawFont)
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
QT_END_HEADER
|
QT_END_HEADER
|
||||||
|
@ -101,6 +101,8 @@ private:
|
|||||||
friend class QStaticTextPrivate;
|
friend class QStaticTextPrivate;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_SHARED(QStaticText)
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
Q_DECLARE_METATYPE(QStaticText)
|
Q_DECLARE_METATYPE(QStaticText)
|
||||||
|
@ -235,6 +235,8 @@ private:
|
|||||||
friend class QWidgetTextControlPrivate;
|
friend class QWidgetTextControlPrivate;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_SHARED(QTextCursor)
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
QT_END_HEADER
|
QT_END_HEADER
|
||||||
|
@ -376,6 +376,8 @@ private:
|
|||||||
friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QTextFormat &);
|
friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QTextFormat &);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_SHARED(QTextFormat)
|
||||||
|
|
||||||
inline void QTextFormat::setObjectType(int atype)
|
inline void QTextFormat::setObjectType(int atype)
|
||||||
{ setProperty(ObjectType, atype); }
|
{ setProperty(ObjectType, atype); }
|
||||||
|
|
||||||
@ -549,6 +551,8 @@ protected:
|
|||||||
friend class QTextFormat;
|
friend class QTextFormat;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_SHARED(QTextCharFormat)
|
||||||
|
|
||||||
inline void QTextCharFormat::setTableCellRowSpan(int _tableCellRowSpan)
|
inline void QTextCharFormat::setTableCellRowSpan(int _tableCellRowSpan)
|
||||||
{
|
{
|
||||||
if (_tableCellRowSpan <= 1)
|
if (_tableCellRowSpan <= 1)
|
||||||
@ -639,6 +643,8 @@ protected:
|
|||||||
friend class QTextFormat;
|
friend class QTextFormat;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_SHARED(QTextBlockFormat)
|
||||||
|
|
||||||
inline void QTextBlockFormat::setAlignment(Qt::Alignment aalignment)
|
inline void QTextBlockFormat::setAlignment(Qt::Alignment aalignment)
|
||||||
{ setProperty(BlockAlignment, int(aalignment)); }
|
{ setProperty(BlockAlignment, int(aalignment)); }
|
||||||
|
|
||||||
@ -702,6 +708,8 @@ protected:
|
|||||||
friend class QTextFormat;
|
friend class QTextFormat;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_SHARED(QTextListFormat)
|
||||||
|
|
||||||
inline void QTextListFormat::setStyle(Style astyle)
|
inline void QTextListFormat::setStyle(Style astyle)
|
||||||
{ setProperty(ListStyle, astyle); }
|
{ setProperty(ListStyle, astyle); }
|
||||||
|
|
||||||
@ -738,6 +746,8 @@ protected:
|
|||||||
friend class QTextFormat;
|
friend class QTextFormat;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_SHARED(QTextImageFormat)
|
||||||
|
|
||||||
inline void QTextImageFormat::setName(const QString &aname)
|
inline void QTextImageFormat::setName(const QString &aname)
|
||||||
{ setProperty(ImageName, aname); }
|
{ setProperty(ImageName, aname); }
|
||||||
|
|
||||||
@ -836,6 +846,8 @@ protected:
|
|||||||
friend class QTextFormat;
|
friend class QTextFormat;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_SHARED(QTextFrameFormat)
|
||||||
|
|
||||||
inline void QTextFrameFormat::setBorder(qreal aborder)
|
inline void QTextFrameFormat::setBorder(qreal aborder)
|
||||||
{ setProperty(FrameBorder, aborder); }
|
{ setProperty(FrameBorder, aborder); }
|
||||||
|
|
||||||
@ -905,6 +917,8 @@ protected:
|
|||||||
friend class QTextFormat;
|
friend class QTextFormat;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_SHARED(QTextTableFormat)
|
||||||
|
|
||||||
inline void QTextTableFormat::setColumns(int acolumns)
|
inline void QTextTableFormat::setColumns(int acolumns)
|
||||||
{
|
{
|
||||||
if (acolumns == 1)
|
if (acolumns == 1)
|
||||||
@ -944,6 +958,8 @@ protected:
|
|||||||
friend class QTextFormat;
|
friend class QTextFormat;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_SHARED(QTextTableCellFormat)
|
||||||
|
|
||||||
inline void QTextTableCellFormat::setTopPadding(qreal padding)
|
inline void QTextTableCellFormat::setTopPadding(qreal padding)
|
||||||
{
|
{
|
||||||
setProperty(TableCellTopPadding, padding);
|
setProperty(TableCellTopPadding, padding);
|
||||||
|
Loading…
Reference in New Issue
Block a user