diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-08-30 15:40:22 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-30 16:19:31 +0200 |
| commit | 3b533df1e46d509aaa0cda36e300b63272feb230 (patch) | |
| tree | 3f28556cae1744838863325c935fbac8fd2033b2 /src | |
| parent | ee7af2e9aaa2041bf51e2ec24157e505020b8bfa (diff) | |
QWinTaskbarButton::progressBar() -> progress()
The class is called QWinTaskbarProgress -> use the same name for
the accessor. That name was also used for the QML grouped property
name since it looks really nice. :)
Change-Id: I6c46ea4336dd3f420b16a305de47b490f7629adb
Reviewed-by: Ivan Vizir <define-true-false@yandex.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/winextras/qquickwintaskbarbutton.cpp | 2 | ||||
| -rw-r--r-- | src/winextras/qwintaskbarbutton.cpp | 4 | ||||
| -rw-r--r-- | src/winextras/qwintaskbarbutton.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/winextras/qquickwintaskbarbutton.cpp b/src/imports/winextras/qquickwintaskbarbutton.cpp index 29348f8..2148d56 100644 --- a/src/imports/winextras/qquickwintaskbarbutton.cpp +++ b/src/imports/winextras/qquickwintaskbarbutton.cpp @@ -82,7 +82,7 @@ QQuickWinTaskbarButton::~QQuickWinTaskbarButton() */ QWinTaskbarProgress *QQuickWinTaskbarButton::progress() const { - return button->progressBar(); + return button->progress(); } /*! diff --git a/src/winextras/qwintaskbarbutton.cpp b/src/winextras/qwintaskbarbutton.cpp index 75dc12e..a8de844 100644 --- a/src/winextras/qwintaskbarbutton.cpp +++ b/src/winextras/qwintaskbarbutton.cpp @@ -248,10 +248,10 @@ void QWinTaskbarButton::setOverlayIconAccessibilityDescription(const QString &de } /*! - \property QWinTaskbarButton::progressBar + \property QWinTaskbarButton::progress \brief the progress indicator of the taskbar button */ -QWinTaskbarProgress *QWinTaskbarButton::progressBar() const +QWinTaskbarProgress *QWinTaskbarButton::progress() const { Q_D(const QWinTaskbarButton); if (!d->progressBar) { diff --git a/src/winextras/qwintaskbarbutton.h b/src/winextras/qwintaskbarbutton.h index 8d91351..ecaa15b 100644 --- a/src/winextras/qwintaskbarbutton.h +++ b/src/winextras/qwintaskbarbutton.h @@ -57,7 +57,7 @@ class Q_WINEXTRAS_EXPORT QWinTaskbarButton : public QObject Q_OBJECT Q_PROPERTY(QIcon overlayIcon READ overlayIcon WRITE setOverlayIcon) Q_PROPERTY(QString overlayIconAccessibilityDescription READ overlayIconAccessibilityDescription WRITE setOverlayIconAccessibilityDescription) - Q_PROPERTY(QWinTaskbarProgress *progressBar READ progressBar) + Q_PROPERTY(QWinTaskbarProgress *progress READ progress) Q_PROPERTY(QWindow *window READ window WRITE setWindow) public: @@ -70,7 +70,7 @@ public: QIcon overlayIcon() const; QString overlayIconAccessibilityDescription() const; - QWinTaskbarProgress *progressBar() const; + QWinTaskbarProgress *progress() const; bool eventFilter(QObject *, QEvent *); |