diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
tree | 9981f274712c098cabbff0c4667672a3934e5393 /src/gui/dialogs/qprogressdialog.h | |
parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'src/gui/dialogs/qprogressdialog.h')
-rw-r--r-- | src/gui/dialogs/qprogressdialog.h | 145 |
1 files changed, 0 insertions, 145 deletions
diff --git a/src/gui/dialogs/qprogressdialog.h b/src/gui/dialogs/qprogressdialog.h deleted file mode 100644 index ca3ea5a0d9..0000000000 --- a/src/gui/dialogs/qprogressdialog.h +++ /dev/null @@ -1,145 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QPROGRESSDIALOG_H -#define QPROGRESSDIALOG_H - -#include <QtGui/qdialog.h> - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Gui) - -#ifndef QT_NO_PROGRESSDIALOG - -class QPushButton; -class QLabel; -class QProgressBar; -class QTimer; -class QProgressDialogPrivate; - -class Q_GUI_EXPORT QProgressDialog : public QDialog -{ - Q_OBJECT - Q_DECLARE_PRIVATE(QProgressDialog) - Q_PROPERTY(bool wasCanceled READ wasCanceled) - Q_PROPERTY(int minimum READ minimum WRITE setMinimum) - Q_PROPERTY(int maximum READ maximum WRITE setMaximum) - Q_PROPERTY(int value READ value WRITE setValue) - Q_PROPERTY(bool autoReset READ autoReset WRITE setAutoReset) - Q_PROPERTY(bool autoClose READ autoClose WRITE setAutoClose) - Q_PROPERTY(int minimumDuration READ minimumDuration WRITE setMinimumDuration) - Q_PROPERTY(QString labelText READ labelText WRITE setLabelText) - -public: - explicit QProgressDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0); - QProgressDialog(const QString &labelText, const QString &cancelButtonText, - int minimum, int maximum, QWidget *parent = 0, Qt::WindowFlags flags = 0); - ~QProgressDialog(); - - void setLabel(QLabel *label); - void setCancelButton(QPushButton *button); - void setBar(QProgressBar *bar); - - bool wasCanceled() const; - - int minimum() const; - int maximum() const; - - int value() const; - - QSize sizeHint() const; - - QString labelText() const; - int minimumDuration() const; - - void setAutoReset(bool reset); - bool autoReset() const; - void setAutoClose(bool close); - bool autoClose() const; - -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - void open() { QDialog::open(); } -#endif -#else - using QDialog::open; -#endif - void open(QObject *receiver, const char *member); - -public Q_SLOTS: - void cancel(); - void reset(); - void setMaximum(int maximum); - void setMinimum(int minimum); - void setRange(int minimum, int maximum); - void setValue(int progress); - void setLabelText(const QString &text); - void setCancelButtonText(const QString &text); - void setMinimumDuration(int ms); - -Q_SIGNALS: - void canceled(); - -protected: - void resizeEvent(QResizeEvent *event); - void closeEvent(QCloseEvent *event); - void changeEvent(QEvent *event); - void showEvent(QShowEvent *event); - -protected Q_SLOTS: - void forceShow(); - -private: - Q_DISABLE_COPY(QProgressDialog) - - Q_PRIVATE_SLOT(d_func(), void _q_disconnectOnClose()) -}; - -#endif // QT_NO_PROGRESSDIALOG - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QPROGRESSDIALOG_H |