From 9146d36552c2eb99166b773bb027d34c671d66e5 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Thu, 28 Feb 2013 17:57:38 +0100 Subject: Create common base class for declarative dialogs QQuickAbstractFileDialog inherits QQuickAbstractDialog, and so can the future platform dialog types. Also some header comment corrections. Change-Id: I86bc6d975223979c19d94a3fd70e4b5130b73f47 Reviewed-by: Liang Qi --- src/imports/dialogs/qquickfiledialog_p.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/imports/dialogs/qquickfiledialog_p.h') diff --git a/src/imports/dialogs/qquickfiledialog_p.h b/src/imports/dialogs/qquickfiledialog_p.h index 0a660b316b..93e11f9e3e 100644 --- a/src/imports/dialogs/qquickfiledialog_p.h +++ b/src/imports/dialogs/qquickfiledialog_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtQml module of the Qt Toolkit. +** This file is part of the QtQuick.Dialogs module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -60,21 +60,17 @@ QT_BEGIN_NAMESPACE class QQuickFileDialog : public QQuickAbstractFileDialog { Q_OBJECT - Q_PROPERTY(QObject* implementation READ implementation WRITE setImplementation DESIGNABLE false) + Q_PROPERTY(QObject* implementation READ qmlImplementation WRITE setQmlImplementation DESIGNABLE false) Q_CLASSINFO("DefaultProperty", "implementation") // AbstractFileDialog in QML can have only one child public: explicit QQuickFileDialog(QObject *parent = 0); ~QQuickFileDialog(); - QObject* implementation() { return m_implementation; } virtual QList fileUrls(); signals: public Q_SLOTS: - void setImplementation(QObject* obj); - virtual void setVisible(bool v); - void clearSelection(); bool addSelection(QString path); @@ -85,8 +81,6 @@ protected: Q_INVOKABLE QUrl pathFolder(const QString &path); private: - QObject *m_implementation; - QWindow *m_dialogWindow; QStringList m_selections; Q_DISABLE_COPY(QQuickFileDialog) -- cgit v1.2.3