Skip to content
This repository was archived by the owner on Mar 4, 2023. It is now read-only.

Commit 4d531ee

Browse files
ShaturShatur
committed
Rename progress to value
1 parent 8806963 commit 4d531ee

11 files changed

+25
-25
lines changed

‎qtaskbarcontrol.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ void QTaskbarControl::setProgressVisible(bool visible)
9494
emit progressVisibleChanged(visible);
9595
}
9696

97-
void QTaskbarControl::setProgress(double progress)
97+
void QTaskbarControl::setProgress(double value)
9898
{
99-
if (qFuzzyCompare(d->progress, progress))
99+
if (qFuzzyCompare(d->progress, value))
100100
return;
101101

102-
d->progress = progress;
103-
d->setProgress(d->progressVisible, progress);
104-
emit progressChanged(progress);
102+
d->progress = value;
103+
d->setProgress(d->progressVisible, value);
104+
emit progressChanged(value);
105105
}
106106

107107
void QTaskbarControl::setCounterVisible(bool visible)

‎qtaskbarcontrol.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ public slots:
4242
void setWindowsBadgeIcon(const QIcon &icon);
4343
void setWindowsBadgeTextColor(const QColor &color);
4444
void setProgressVisible(bool visible);
45-
void setProgress(double progress);
45+
void setProgress(double value);
4646
void setCounterVisible(bool visible);
4747
void setCounter(int value);
4848

4949
signals:
5050
void progressVisibleChanged(bool visible);
51-
void progressChanged(double progress);
51+
void progressChanged(double value);
5252
void counterVisibleChanged(bool visible);
5353
void counterChanged(int value);
5454

‎qtaskbarcontrol_dummy.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ QTaskbarControlPrivate *QTaskbarControlPrivate::createPrivate(QTaskbarControl *)
55
return new QDummyTaskbarControl{};
66
}
77

8-
void QDummyTaskbarControl::setProgress(bool visible, double progress)
8+
void QDummyTaskbarControl::setProgress(bool visible, double value)
99
{
1010
Q_UNUSED(visible)
11-
Q_UNUSED(progress)
11+
Q_UNUSED(value)
1212
}
1313

1414
void QDummyTaskbarControl::setCounter(bool visible, int value)

‎qtaskbarcontrol_dummy.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class QDummyTaskbarControl : public QTaskbarControlPrivate
77
{
88
public:
99
// QTaskbarControlPrivate interface
10-
void setProgress(bool visible, double progress) override;
10+
void setProgress(bool visible, double value) override;
1111
void setCounter(bool visible, int value) override;
1212
};
1313

‎qtaskbarcontrol_mac.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
double _progress;
1010
}
1111

12-
- (void)setProgress:(double)progress;
12+
- (void)setProgress:(double)value;
1313

1414
@end
1515

@@ -19,7 +19,7 @@ class QMacTaskbarControl : public QTaskbarControlPrivate
1919
QMacTaskbarControl();
2020
~QMacTaskbarControl();
2121

22-
void setProgress(bool visible, double progress) override;
22+
void setProgress(bool visible, double value) override;
2323
void setCounter(bool visible, int value) override;
2424

2525
private:

‎qtaskbarcontrol_mac.mm

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
@implementation TaskProgressView
1313

14-
- (void)setProgress:(double)progress
14+
- (void)setProgress:(double)value
1515
{
16-
_progress = progress;
16+
_progress = value;
1717
}
1818

1919
- (void)drawRect:(NSRect)rect
@@ -73,10 +73,10 @@ - (void)drawRect:(NSRect)rect
7373
[_taskView release];
7474
}
7575

76-
void QMacTaskbarControl::setProgress(bool visible, double progress)
76+
void QMacTaskbarControl::setProgress(bool visible, double value)
7777
{
78-
[_taskView setProgress:progress];
79-
if (visible && progress >= 0.0)
78+
[_taskView setProgress:value];
79+
if (visible && value >= 0.0)
8080
[[NSApp dockTile] setContentView:_taskView];
8181
else
8282
[[NSApp dockTile] setContentView:nil];

‎qtaskbarcontrol_p.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class QTaskbarControlPrivate
2323
virtual QIcon windowsBadgeIcon() const;
2424
virtual void setWindowsBadgeTextColor(const QColor &color);
2525
virtual QColor windowsBadgeTextColor() const;
26-
virtual void setProgress(bool visible, double progress) = 0;
26+
virtual void setProgress(bool visible, double value) = 0;
2727
virtual void setCounter(bool visible, int value) = 0;
2828

2929
private:

‎qtaskbarcontrol_win.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ QColor QWinTaskbarControl::windowsBadgeTextColor() const
6969
return _badgeColor;
7070
}
7171

72-
void QWinTaskbarControl::setProgress(bool visible, double progress)
72+
void QWinTaskbarControl::setProgress(bool visible, double value)
7373
{
74-
if(progress < 0)
74+
if(value < 0)
7575
_button->progress()->setRange(0, 0);
7676
else {
7777
_button->progress()->setRange(0, 1000);
78-
_button->progress()->setValue(static_cast<int>(progress * 1000));
78+
_button->progress()->setValue(static_cast<int>(value * 1000));
7979
}
8080
_button->progress()->setVisible(visible);
8181
}

‎qtaskbarcontrol_win.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class QWinTaskbarControl : public QTaskbarControlPrivate
1818
QIcon windowsBadgeIcon() const override;
1919
void setWindowsBadgeTextColor(const QColor &color) override;
2020
QColor windowsBadgeTextColor() const override;
21-
void setProgress(bool visible, double progress) override;
21+
void setProgress(bool visible, double value) override;
2222
void setCounter(bool visible, int value) override;
2323

2424
private:

‎qtaskbarcontrol_x11.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ QTaskbarControlPrivate *QTaskbarControlPrivate::createPrivate(QTaskbarControl *)
99
return new QX11TaskbarControl{};
1010
}
1111

12-
void QX11TaskbarControl::setProgress(bool visible, double progress)
12+
void QX11TaskbarControl::setProgress(bool visible, double value)
1313
{
1414
QVariantMap properties;
1515
properties.insert(QStringLiteral("progress-visible"), visible);
16-
properties.insert(QStringLiteral("progress"), progress);
16+
properties.insert(QStringLiteral("progress"), value);
1717
sendMessage(properties);
1818
}
1919

‎qtaskbarcontrol_x11.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class QX11TaskbarControl : public QTaskbarControlPrivate
77
{
88
public:
99
// QTaskbarControlPrivate interface
10-
void setProgress(bool visible, double progress) override;
10+
void setProgress(bool visible, double value) override;
1111
void setCounter(bool visible, int value) override;
1212

1313
private:

0 commit comments

Comments
 (0)