summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/qnx/qqnxfiledialoghelper.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/platforms/qnx/qqnxfiledialoghelper.h')
-rw-r--r--src/plugins/platforms/qnx/qqnxfiledialoghelper.h33
1 files changed, 8 insertions, 25 deletions
diff --git a/src/plugins/platforms/qnx/qqnxfiledialoghelper.h b/src/plugins/platforms/qnx/qqnxfiledialoghelper.h
index 8d6b03358e..76cceafcfe 100644
--- a/src/plugins/platforms/qnx/qqnxfiledialoghelper.h
+++ b/src/plugins/platforms/qnx/qqnxfiledialoghelper.h
@@ -1,7 +1,7 @@
/***************************************************************************
**
** Copyright (C) 2012 Research In Motion
-** Contact: http://www.qt-project.org/legal
+** Contact: http://www.qt.io/licensing/
**
** This file is part of the plugins of the Qt Toolkit.
**
@@ -10,9 +10,9 @@
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** $QT_END_LICENSE$
@@ -41,13 +41,7 @@ QT_BEGIN_NAMESPACE
class QQnxIntegration;
-#if defined(Q_OS_BLACKBERRY_TABLET)
-#include <bps/dialog.h>
-#define NativeDialogPtr dialog_instance_t
-#else
class QQnxFilePicker;
-#define NativeDialogPtr QQnxFilePicker *
-#endif
class QQnxFileDialogHelper : public QPlatformFileDialogHelper
{
@@ -56,10 +50,6 @@ public:
explicit QQnxFileDialogHelper(const QQnxIntegration *);
~QQnxFileDialogHelper();
-#if defined(Q_OS_BLACKBERRY_TABLET)
- bool handleEvent(bps_event_t *event);
-#endif
-
void exec();
bool show(Qt::WindowFlags flags, Qt::WindowModality modality, QWindow *parent);
@@ -74,29 +64,22 @@ public:
void selectNameFilter(const QString &filter);
QString selectedNameFilter() const;
- NativeDialogPtr nativeDialog() const { return m_dialog; }
+ QQnxFilePicker *nativeDialog() const { return m_dialog; }
Q_SIGNALS:
void dialogClosed();
private Q_SLOTS:
-#if !defined(Q_OS_BLACKBERRY_TABLET)
void emitSignals();
-#endif
private:
void setNameFilter(const QString &filter);
void setNameFilters(const QStringList &filters);
const QQnxIntegration *m_integration;
- NativeDialogPtr m_dialog;
+ QQnxFilePicker *m_dialog;
QFileDialogOptions::AcceptMode m_acceptMode;
QString m_selectedFilter;
-
-#if defined(Q_OS_BLACKBERRY_TABLET)
- QPlatformDialogHelper::DialogCode m_result;
- QList<QUrl> m_paths;
-#endif
};
QT_END_NAMESPACE