QPlatformDialogHelper: remove inheritance from QSharedData
None of the Private classes is now used as a refcounted entity, therefore drop the inheritance from QSharedData. Change-Id: I10708702969454f33cb88cf991560ea87b085aca Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
parent
fe95781897
commit
1719379471
@ -11,7 +11,6 @@
|
|||||||
#if QT_CONFIG(settings)
|
#if QT_CONFIG(settings)
|
||||||
#include <QtCore/QSettings>
|
#include <QtCore/QSettings>
|
||||||
#endif
|
#endif
|
||||||
#include <QtCore/QSharedData>
|
|
||||||
#include <QtCore/QUrl>
|
#include <QtCore/QUrl>
|
||||||
#include <QtCore/QVariant>
|
#include <QtCore/QVariant>
|
||||||
#include <QtGui/QColor>
|
#include <QtGui/QColor>
|
||||||
@ -145,7 +144,7 @@ QVariant QPlatformDialogHelper::defaultStyleHint(QPlatformDialogHelper::StyleHi
|
|||||||
|
|
||||||
// Font dialog
|
// Font dialog
|
||||||
|
|
||||||
class QFontDialogOptionsPrivate : public QSharedData
|
class QFontDialogOptionsPrivate
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
QFontDialogOptionsPrivate() = default;
|
QFontDialogOptionsPrivate() = default;
|
||||||
@ -428,7 +427,7 @@ void QPlatformColorDialogHelper::setOptions(const QSharedPointer<QColorDialogOpt
|
|||||||
|
|
||||||
// File dialog
|
// File dialog
|
||||||
|
|
||||||
class QFileDialogOptionsPrivate : public QSharedData
|
class QFileDialogOptionsPrivate
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
QFileDialogOptions::FileDialogOptions options;
|
QFileDialogOptions::FileDialogOptions options;
|
||||||
@ -762,7 +761,7 @@ QStringList QPlatformFileDialogHelper::cleanFilterList(const QString &filter)
|
|||||||
|
|
||||||
// Message dialog
|
// Message dialog
|
||||||
|
|
||||||
class QMessageDialogOptionsPrivate : public QSharedData
|
class QMessageDialogOptionsPrivate
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
QMessageDialogOptionsPrivate() :
|
QMessageDialogOptionsPrivate() :
|
||||||
|
Loading…
x
Reference in New Issue
Block a user