summaryrefslogtreecommitdiff
path: root/src/dialogs
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2018-03-12 10:28:42 +0100
committerAndy Shaw <andy.shaw@qt.io>2018-03-12 10:05:16 +0000
commit710058343297bba7cc44fa2369b7cec742f34cb2 (patch)
treee5ea30909a51467de811a8ebce632215b032ddc9 /src/dialogs
parent949884153ae14724c30f17c75656aa0c6f072559 (diff)
downloadqtquickcontrols-710058343297bba7cc44fa2369b7cec742f34cb2.tar.gz
Don't conflict with Qt Quick Controls 2 when using the platform dialogs
Change-Id: I7ca87ee59c8d65537713d5d912fdb3ec5bd7dcdb Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/dialogs')
-rw-r--r--src/dialogs/plugin.cpp8
-rw-r--r--src/dialogs/qquickplatformcolordialog.cpp12
-rw-r--r--src/dialogs/qquickplatformcolordialog_p.h10
-rw-r--r--src/dialogs/qquickplatformfiledialog.cpp18
-rw-r--r--src/dialogs/qquickplatformfiledialog_p.h10
-rw-r--r--src/dialogs/qquickplatformfontdialog.cpp14
-rw-r--r--src/dialogs/qquickplatformfontdialog_p.h10
-rw-r--r--src/dialogs/qquickplatformmessagedialog.cpp12
-rw-r--r--src/dialogs/qquickplatformmessagedialog_p.h10
9 files changed, 52 insertions, 52 deletions
diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp
index 2e861fa5..8ee1e65d 100644
--- a/src/dialogs/plugin.cpp
+++ b/src/dialogs/plugin.cpp
@@ -140,7 +140,7 @@ public:
QLatin1String("Do not create objects of type StandardIcon"));
#ifndef PURE_QML_ONLY
if (QGuiApplicationPrivate::platformTheme()->usePlatformNativeDialog(QPlatformTheme::MessageDialog))
- qmlRegisterType<QQuickPlatformMessageDialog>(uri, 1, 0, "MessageDialog");
+ qmlRegisterType<QQuickPlatformMessageDialog1>(uri, 1, 0, "MessageDialog");
else
#endif
registerWidgetOrQmlImplementation<QQuickMessageDialog>(widgetsDir, qmlDir, "MessageDialog", uri, hasTopLevelWindows, 1, 1);
@@ -151,7 +151,7 @@ public:
// QQuickAbstractDialog::setVisible() will check if a native dialog can be shown, and
// only fall back to use the QML version if showing fails.
if (QGuiApplicationPrivate::platformTheme()->usePlatformNativeDialog(QPlatformTheme::FileDialog))
- registerQmlImplementation<QQuickPlatformFileDialog>(qmlDir, "FileDialog", uri, 1, 0);
+ registerQmlImplementation<QQuickPlatformFileDialog1>(qmlDir, "FileDialog", uri, 1, 0);
else
#endif
registerWidgetOrQmlImplementation<QQuickFileDialog>(widgetsDir, qmlDir, "FileDialog", uri, hasTopLevelWindows, 1, 0);
@@ -159,7 +159,7 @@ public:
// ColorDialog
#ifndef PURE_QML_ONLY
if (QGuiApplicationPrivate::platformTheme()->usePlatformNativeDialog(QPlatformTheme::ColorDialog))
- qmlRegisterType<QQuickPlatformColorDialog>(uri, 1, 0, "ColorDialog");
+ qmlRegisterType<QQuickPlatformColorDialog1>(uri, 1, 0, "ColorDialog");
else
#endif
registerWidgetOrQmlImplementation<QQuickColorDialog>(widgetsDir, qmlDir, "ColorDialog", uri, hasTopLevelWindows, 1, 0);
@@ -167,7 +167,7 @@ public:
// FontDialog
#ifndef PURE_QML_ONLY
if (QGuiApplicationPrivate::platformTheme()->usePlatformNativeDialog(QPlatformTheme::FontDialog))
- qmlRegisterType<QQuickPlatformFontDialog>(uri, 1, 1, "FontDialog");
+ qmlRegisterType<QQuickPlatformFontDialog1>(uri, 1, 1, "FontDialog");
else
#endif
registerWidgetOrQmlImplementation<QQuickFontDialog>(widgetsDir, qmlDir, "FontDialog", uri, hasTopLevelWindows, 1, 1);
diff --git a/src/dialogs/qquickplatformcolordialog.cpp b/src/dialogs/qquickplatformcolordialog.cpp
index c002f322..4fe834ca 100644
--- a/src/dialogs/qquickplatformcolordialog.cpp
+++ b/src/dialogs/qquickplatformcolordialog.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmltype ColorDialog
- \instantiates QQuickPlatformColorDialog
+ \instantiates QQuickPlatformColorDialog1
\inqmlmodule QtQuick.Dialogs
\ingroup qtquickdialogs
\brief Dialog component for choosing a color.
@@ -124,11 +124,11 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \class QQuickPlatformColorDialog
+ \class QQuickPlatformColorDialog1
\inmodule QtQuick.Dialogs
\internal
- \brief The QQuickPlatformColorDialog class provides a color dialog
+ \brief The QQuickPlatformColorDialog1 class provides a color dialog
The dialog is implemented via the QPlatformColorDialogHelper when possible;
otherwise it falls back to a QColorDialog or a QML implementation.
@@ -139,7 +139,7 @@ QT_BEGIN_NAMESPACE
/*!
Constructs a color dialog with parent window \a parent.
*/
-QQuickPlatformColorDialog::QQuickPlatformColorDialog(QObject *parent) :
+QQuickPlatformColorDialog1::QQuickPlatformColorDialog1(QObject *parent) :
QQuickAbstractColorDialog(parent)
{
}
@@ -147,14 +147,14 @@ QQuickPlatformColorDialog::QQuickPlatformColorDialog(QObject *parent) :
/*!
Destroys the color dialog.
*/
-QQuickPlatformColorDialog::~QQuickPlatformColorDialog()
+QQuickPlatformColorDialog1::~QQuickPlatformColorDialog1()
{
if (m_dlgHelper)
m_dlgHelper->hide();
delete m_dlgHelper;
}
-QPlatformColorDialogHelper *QQuickPlatformColorDialog::helper()
+QPlatformColorDialogHelper *QQuickPlatformColorDialog1::helper()
{
QQuickItem *parentItem = qobject_cast<QQuickItem *>(parent());
if (parentItem)
diff --git a/src/dialogs/qquickplatformcolordialog_p.h b/src/dialogs/qquickplatformcolordialog_p.h
index 0c7a66ce..d4d79d42 100644
--- a/src/dialogs/qquickplatformcolordialog_p.h
+++ b/src/dialogs/qquickplatformcolordialog_p.h
@@ -55,22 +55,22 @@
QT_BEGIN_NAMESPACE
-class QQuickPlatformColorDialog : public QQuickAbstractColorDialog
+class QQuickPlatformColorDialog1 : public QQuickAbstractColorDialog
{
Q_OBJECT
public:
- QQuickPlatformColorDialog(QObject *parent = 0);
- virtual ~QQuickPlatformColorDialog();
+ QQuickPlatformColorDialog1(QObject *parent = 0);
+ virtual ~QQuickPlatformColorDialog1();
protected:
QPlatformColorDialogHelper *helper();
- Q_DISABLE_COPY(QQuickPlatformColorDialog)
+ Q_DISABLE_COPY(QQuickPlatformColorDialog1)
};
QT_END_NAMESPACE
-QML_DECLARE_TYPE(QQuickPlatformColorDialog *)
+QML_DECLARE_TYPE(QQuickPlatformColorDialog1 *)
#endif // QQUICKPLATFORMCOLORDIALOG_P_H
diff --git a/src/dialogs/qquickplatformfiledialog.cpp b/src/dialogs/qquickplatformfiledialog.cpp
index b30f2b2b..aaf15197 100644
--- a/src/dialogs/qquickplatformfiledialog.cpp
+++ b/src/dialogs/qquickplatformfiledialog.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmltype FileDialog
- \instantiates QQuickPlatformFileDialog
+ \instantiates QQuickPlatformFileDialog1
\inqmlmodule QtQuick.Dialogs
\ingroup qtquickdialogs
\brief Dialog component for choosing files from a local filesystem.
@@ -149,12 +149,12 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \class QQuickPlatformFileDialog
+ \class QQuickPlatformFileDialog1
\inmodule QtQuick.Dialogs
\internal
\since 5.1
- \brief The QQuickPlatformFileDialog class provides a file dialog
+ \brief The QQuickPlatformFileDialog1 class provides a file dialog
The dialog is implemented via the QPlatformFileDialogHelper when possible;
otherwise it falls back to a QFileDialog or a QML implementation.
@@ -163,7 +163,7 @@ QT_BEGIN_NAMESPACE
/*!
Constructs a file dialog with parent window \a parent.
*/
-QQuickPlatformFileDialog::QQuickPlatformFileDialog(QObject *parent) :
+QQuickPlatformFileDialog1::QQuickPlatformFileDialog1(QObject *parent) :
QQuickFileDialog(parent)
{
}
@@ -171,21 +171,21 @@ QQuickPlatformFileDialog::QQuickPlatformFileDialog(QObject *parent) :
/*!
Destroys the file dialog.
*/
-QQuickPlatformFileDialog::~QQuickPlatformFileDialog()
+QQuickPlatformFileDialog1::~QQuickPlatformFileDialog1()
{
if (m_dlgHelper)
m_dlgHelper->hide();
delete m_dlgHelper;
}
-QList<QUrl> QQuickPlatformFileDialog::fileUrls() const
+QList<QUrl> QQuickPlatformFileDialog1::fileUrls() const
{
if (m_dialogHelperInUse)
return m_dlgHelper->selectedFiles();
return QQuickFileDialog::fileUrls();
}
-void QQuickPlatformFileDialog::setModality(Qt::WindowModality m)
+void QQuickPlatformFileDialog1::setModality(Qt::WindowModality m)
{
#ifdef Q_OS_WIN
// A non-modal native file dialog is not possible on Windows, so
@@ -200,7 +200,7 @@ void QQuickPlatformFileDialog::setModality(Qt::WindowModality m)
QQuickAbstractFileDialog::setModality(m);
}
-QPlatformFileDialogHelper *QQuickPlatformFileDialog::helper()
+QPlatformFileDialogHelper *QQuickPlatformFileDialog1::helper()
{
QQuickItem *parentItem = qobject_cast<QQuickItem *>(parent());
if (parentItem)
@@ -221,7 +221,7 @@ QPlatformFileDialogHelper *QQuickPlatformFileDialog::helper()
return m_dlgHelper;
}
-void QQuickPlatformFileDialog::accept()
+void QQuickPlatformFileDialog1::accept()
{
updateFolder(folder());
QQuickFileDialog::accept();
diff --git a/src/dialogs/qquickplatformfiledialog_p.h b/src/dialogs/qquickplatformfiledialog_p.h
index 600e9336..0524cc36 100644
--- a/src/dialogs/qquickplatformfiledialog_p.h
+++ b/src/dialogs/qquickplatformfiledialog_p.h
@@ -55,13 +55,13 @@
QT_BEGIN_NAMESPACE
-class QQuickPlatformFileDialog : public QQuickFileDialog
+class QQuickPlatformFileDialog1 : public QQuickFileDialog
{
Q_OBJECT
public:
- QQuickPlatformFileDialog(QObject *parent = 0);
- virtual ~QQuickPlatformFileDialog();
+ QQuickPlatformFileDialog1(QObject *parent = 0);
+ virtual ~QQuickPlatformFileDialog1();
void setModality(Qt::WindowModality m) override;
QList<QUrl> fileUrls() const override;
@@ -69,11 +69,11 @@ protected:
QPlatformFileDialogHelper *helper() override;
void accept() override;
- Q_DISABLE_COPY(QQuickPlatformFileDialog)
+ Q_DISABLE_COPY(QQuickPlatformFileDialog1)
};
QT_END_NAMESPACE
-QML_DECLARE_TYPE(QQuickPlatformFileDialog *)
+QML_DECLARE_TYPE(QQuickPlatformFileDialog1 *)
#endif // QQUICKPLATFORMFILEDIALOG_P_H
diff --git a/src/dialogs/qquickplatformfontdialog.cpp b/src/dialogs/qquickplatformfontdialog.cpp
index 2c501a1c..2098b32e 100644
--- a/src/dialogs/qquickplatformfontdialog.cpp
+++ b/src/dialogs/qquickplatformfontdialog.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmltype FontDialog
- \instantiates QQuickPlatformFontDialog
+ \instantiates QQuickPlatformFontDialog1
\inqmlmodule QtQuick.Dialogs
\ingroup qtquick-visual
\ingroup qtquickdialogs
@@ -126,13 +126,13 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \class QQuickPlatformFontDialog
+ \class QQuickPlatformFontDialog1
\inmodule QtQuick.Dialogs
\internal
- \brief The QQuickPlatformFontDialog class provides a font dialog
+ \brief The QQuickPlatformFontDialog1 class provides a font dialog
- The dialog is implemented via the QQuickPlatformFontDialogHelper when possible;
+ The dialog is implemented via the QQuickPlatformFontDialog1Helper when possible;
otherwise it falls back to a QFontDialog or a QML implementation.
\since 5.2
@@ -141,7 +141,7 @@ QT_BEGIN_NAMESPACE
/*!
Constructs a file dialog with parent window \a parent.
*/
-QQuickPlatformFontDialog::QQuickPlatformFontDialog(QObject *parent) :
+QQuickPlatformFontDialog1::QQuickPlatformFontDialog1(QObject *parent) :
QQuickAbstractFontDialog(parent)
{
}
@@ -149,14 +149,14 @@ QQuickPlatformFontDialog::QQuickPlatformFontDialog(QObject *parent) :
/*!
Destroys the file dialog.
*/
-QQuickPlatformFontDialog::~QQuickPlatformFontDialog()
+QQuickPlatformFontDialog1::~QQuickPlatformFontDialog1()
{
if (m_dlgHelper)
m_dlgHelper->hide();
delete m_dlgHelper;
}
-QPlatformFontDialogHelper *QQuickPlatformFontDialog::helper()
+QPlatformFontDialogHelper *QQuickPlatformFontDialog1::helper()
{
QQuickItem *parentItem = qobject_cast<QQuickItem *>(parent());
if (parentItem)
diff --git a/src/dialogs/qquickplatformfontdialog_p.h b/src/dialogs/qquickplatformfontdialog_p.h
index 119575f7..096f26b2 100644
--- a/src/dialogs/qquickplatformfontdialog_p.h
+++ b/src/dialogs/qquickplatformfontdialog_p.h
@@ -55,22 +55,22 @@
QT_BEGIN_NAMESPACE
-class QQuickPlatformFontDialog : public QQuickAbstractFontDialog
+class QQuickPlatformFontDialog1 : public QQuickAbstractFontDialog
{
Q_OBJECT
public:
- QQuickPlatformFontDialog(QObject *parent = 0);
- virtual ~QQuickPlatformFontDialog();
+ QQuickPlatformFontDialog1(QObject *parent = 0);
+ virtual ~QQuickPlatformFontDialog1();
protected:
QPlatformFontDialogHelper *helper();
- Q_DISABLE_COPY(QQuickPlatformFontDialog)
+ Q_DISABLE_COPY(QQuickPlatformFontDialog1)
};
QT_END_NAMESPACE
-QML_DECLARE_TYPE(QQuickPlatformFontDialog *)
+QML_DECLARE_TYPE(QQuickPlatformFontDialog1 *)
#endif // QQUICKPLATFORMFONTDIALOG_P_H
diff --git a/src/dialogs/qquickplatformmessagedialog.cpp b/src/dialogs/qquickplatformmessagedialog.cpp
index 2e3afa48..8ba1ea6a 100644
--- a/src/dialogs/qquickplatformmessagedialog.cpp
+++ b/src/dialogs/qquickplatformmessagedialog.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmltype MessageDialog
- \instantiates QQuickPlatformMessageDialog
+ \instantiates QQuickPlatformMessageDialog1
\inqmlmodule QtQuick.Dialogs
\ingroup qtquickdialogs
\brief Dialog component for displaying popup messages.
@@ -184,11 +184,11 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \class QQuickPlatformMessageDialog
+ \class QQuickPlatformMessageDialog1
\inmodule QtQuick.Dialogs
\internal
- \brief The QQuickPlatformMessageDialog class provides a message dialog
+ \brief The QQuickPlatformMessageDialog1 class provides a message dialog
The dialog is implemented via the QPlatformMessageDialogHelper when possible;
otherwise it falls back to a QMessageBox or a QML implementation.
@@ -199,7 +199,7 @@ QT_BEGIN_NAMESPACE
/*!
Constructs a file dialog with parent window \a parent.
*/
-QQuickPlatformMessageDialog::QQuickPlatformMessageDialog(QObject *parent) :
+QQuickPlatformMessageDialog1::QQuickPlatformMessageDialog1(QObject *parent) :
QQuickAbstractMessageDialog(parent)
{
}
@@ -207,14 +207,14 @@ QQuickPlatformMessageDialog::QQuickPlatformMessageDialog(QObject *parent) :
/*!
Destroys the file dialog.
*/
-QQuickPlatformMessageDialog::~QQuickPlatformMessageDialog()
+QQuickPlatformMessageDialog1::~QQuickPlatformMessageDialog1()
{
if (m_dlgHelper)
m_dlgHelper->hide();
delete m_dlgHelper;
}
-QPlatformMessageDialogHelper *QQuickPlatformMessageDialog::helper()
+QPlatformMessageDialogHelper *QQuickPlatformMessageDialog1::helper()
{
QQuickItem *parentItem = qobject_cast<QQuickItem *>(parent());
if (parentItem)
diff --git a/src/dialogs/qquickplatformmessagedialog_p.h b/src/dialogs/qquickplatformmessagedialog_p.h
index 8e545c5e..045dabd0 100644
--- a/src/dialogs/qquickplatformmessagedialog_p.h
+++ b/src/dialogs/qquickplatformmessagedialog_p.h
@@ -55,22 +55,22 @@
QT_BEGIN_NAMESPACE
-class QQuickPlatformMessageDialog : public QQuickAbstractMessageDialog
+class QQuickPlatformMessageDialog1 : public QQuickAbstractMessageDialog
{
Q_OBJECT
public:
- QQuickPlatformMessageDialog(QObject *parent = 0);
- virtual ~QQuickPlatformMessageDialog();
+ QQuickPlatformMessageDialog1(QObject *parent = 0);
+ virtual ~QQuickPlatformMessageDialog1();
protected:
QPlatformMessageDialogHelper *helper();
- Q_DISABLE_COPY(QQuickPlatformMessageDialog)
+ Q_DISABLE_COPY(QQuickPlatformMessageDialog1)
};
QT_END_NAMESPACE
-QML_DECLARE_TYPE(QQuickPlatformMessageDialog *)
+QML_DECLARE_TYPE(QQuickPlatformMessageDialog1 *)
#endif // QQUICKPLATFORMMESSAGEDIALOG_P_H