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

Commit 56a0aea

Browse files
Skycoder42Skycoder42
authored
Merge pull request #6 from Shatur95/fix-member-overwriting
Fix members overwriting
2 parents 69d6944 + 5c5bed1 commit 56a0aea

11 files changed

+51
-51
lines changed

‎qtaskbarcontrol.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@ void QTaskbarControl::setWindowsBadgeTextColor(const QColor &color)
8484
d->setWindowsBadgeTextColor(color);
8585
}
8686

87-
void QTaskbarControl::setProgressVisible(bool progressVisible)
87+
void QTaskbarControl::setProgressVisible(bool visible)
8888
{
89-
if (d->progressVisible == progressVisible)
89+
if (d->progressVisible == visible)
9090
return;
9191

92-
d->progressVisible = progressVisible;
93-
d->setProgress(progressVisible, d->progress);
94-
emit progressVisibleChanged(progressVisible);
92+
d->progressVisible = visible;
93+
d->setProgress(visible, d->progress);
94+
emit progressVisibleChanged(visible);
9595
}
9696

9797
void QTaskbarControl::setProgress(double progress)
@@ -104,24 +104,24 @@ void QTaskbarControl::setProgress(double progress)
104104
emit progressChanged(progress);
105105
}
106106

107-
void QTaskbarControl::setCounterVisible(bool counterVisible)
107+
void QTaskbarControl::setCounterVisible(bool visible)
108108
{
109-
if (d->counterVisible == counterVisible)
109+
if (d->counterVisible == visible)
110110
return;
111111

112-
d->counterVisible = counterVisible;
113-
d->setCounter(counterVisible, d->counter);
114-
emit counterVisibleChanged(counterVisible);
112+
d->counterVisible = visible;
113+
d->setCounter(visible, d->counter);
114+
emit counterVisibleChanged(visible);
115115
}
116116

117-
void QTaskbarControl::setCounter(int counter)
117+
void QTaskbarControl::setCounter(int value)
118118
{
119-
if (d->counter == counter)
119+
if (d->counter == value)
120120
return;
121121

122-
d->counter = counter;
123-
d->setCounter(d->counterVisible, counter);
124-
emit counterChanged(counter);
122+
d->counter = value;
123+
d->setCounter(d->counterVisible, value);
124+
emit counterChanged(value);
125125
}
126126

127127
bool QTaskbarControl::eventFilter(QObject *watched, QEvent *event)

‎qtaskbarcontrol.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ public slots:
4141
void setWindowsProgressState(WinProgressState state);
4242
void setWindowsBadgeIcon(const QIcon &icon);
4343
void setWindowsBadgeTextColor(const QColor &color);
44-
void setProgressVisible(bool progressVisible);
44+
void setProgressVisible(bool visible);
4545
void setProgress(double progress);
46-
void setCounterVisible(bool counterVisible);
47-
void setCounter(int counter);
46+
void setCounterVisible(bool visible);
47+
void setCounter(int value);
4848

4949
signals:
50-
void progressVisibleChanged(bool progressVisible);
50+
void progressVisibleChanged(bool visible);
5151
void progressChanged(double progress);
52-
void counterVisibleChanged(bool counterVisible);
53-
void counterChanged(int counter);
52+
void counterVisibleChanged(bool visible);
53+
void counterChanged(int value);
5454

5555
private:
5656
QScopedPointer<QTaskbarControlPrivate> d;

‎qtaskbarcontrol_dummy.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ QTaskbarControlPrivate *QTaskbarControlPrivate::createPrivate(QTaskbarControl *)
55
return new QDummyTaskbarControl{};
66
}
77

8-
void QDummyTaskbarControl::setProgress(bool progressVisible, double progress)
8+
void QDummyTaskbarControl::setProgress(bool visible, double progress)
99
{
10-
Q_UNUSED(progressVisible)
10+
Q_UNUSED(visible)
1111
Q_UNUSED(progress)
1212
}
1313

14-
void QDummyTaskbarControl::setCounter(bool counterVisible, int counter)
14+
void QDummyTaskbarControl::setCounter(bool visible, int value)
1515
{
16-
Q_UNUSED(counterVisible)
17-
Q_UNUSED(counter)
16+
Q_UNUSED(visible)
17+
Q_UNUSED(value)
1818
}

‎qtaskbarcontrol_dummy.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ class QDummyTaskbarControl : public QTaskbarControlPrivate
77
{
88
public:
99
// QTaskbarControlPrivate interface
10-
void setProgress(bool progressVisible, double progress) override;
11-
void setCounter(bool counterVisible, int counter) override;
10+
void setProgress(bool visible, double progress) override;
11+
void setCounter(bool visible, int value) override;
1212
};
1313

1414
#endif // QTASKBARCONTROL_DUMMY_H

‎qtaskbarcontrol_mac.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ class QMacTaskbarControl : public QTaskbarControlPrivate
1919
QMacTaskbarControl();
2020
~QMacTaskbarControl();
2121

22-
void setProgress(bool progressVisible, double progress) override;
23-
void setCounter(bool counterVisible, int counter) override;
22+
void setProgress(bool visible, double progress) override;
23+
void setCounter(bool visible, int value) override;
2424

2525
private:
2626
TaskProgressView *_taskView;

‎qtaskbarcontrol_mac.mm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,20 @@ - (void)drawRect:(NSRect)rect
7373
[_taskView release];
7474
}
7575

76-
void QMacTaskbarControl::setProgress(bool progressVisible, double progress)
76+
void QMacTaskbarControl::setProgress(bool visible, double progress)
7777
{
7878
[_taskView setProgress:progress];
79-
if (progressVisible && progress >= 0.0)
79+
if (visible && progress >= 0.0)
8080
[[NSApp dockTile] setContentView:_taskView];
8181
else
8282
[[NSApp dockTile] setContentView:nil];
8383
[[NSApp dockTile] display];
8484
}
8585

86-
void QMacTaskbarControl::setCounter(bool counterVisible, int counter)
86+
void QMacTaskbarControl::setCounter(bool visible, int value)
8787
{
88-
if(counterVisible)
89-
QtMac::setBadgeLabelText(QLocale().toString(counter));
88+
if(visible)
89+
QtMac::setBadgeLabelText(QLocale().toString(value));
9090
else
9191
QtMac::setBadgeLabelText(QString());
9292
}

‎qtaskbarcontrol_p.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ class QTaskbarControlPrivate
2323
virtual QIcon windowsBadgeIcon() const;
2424
virtual void setWindowsBadgeTextColor(const QColor &color);
2525
virtual QColor windowsBadgeTextColor() const;
26-
virtual void setProgress(bool progressVisible, double progress) = 0;
27-
virtual void setCounter(bool counterVisible, int counter) = 0;
26+
virtual void setProgress(bool visible, double progress) = 0;
27+
virtual void setCounter(bool visible, int value) = 0;
2828

2929
private:
3030
QPointer<QWidget> watchedWidget;

‎qtaskbarcontrol_win.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,22 @@ QColor QWinTaskbarControl::windowsBadgeTextColor() const
6969
return _badgeColor;
7070
}
7171

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

83-
void QWinTaskbarControl::setCounter(bool counterVisible, int counter)
83+
void QWinTaskbarControl::setCounter(bool visible, int visible)
8484
{
85-
if(counterVisible) {
85+
if(visible) {
8686
QIcon currentBadge;
87-
auto text = QLocale{}.toString(counter);
87+
auto text = QLocale{}.toString(visible);
8888

8989
foreach(auto size, _badgeIcon.availableSizes()) {
9090
auto pm = _badgeIcon.pixmap(size);

‎qtaskbarcontrol_win.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ 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 progressVisible, double progress) override;
22-
void setCounter(bool counterVisible, int counter) override;
21+
void setProgress(bool visible, double progress) override;
22+
void setCounter(bool visible, int counter) override;
2323

2424
private:
2525
QTaskbarControl *_q_ptr;

‎qtaskbarcontrol_x11.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ QTaskbarControlPrivate *QTaskbarControlPrivate::createPrivate(QTaskbarControl *)
99
return new QX11TaskbarControl{};
1010
}
1111

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

20-
void QX11TaskbarControl::setCounter(bool counterVisible, int counter)
20+
void QX11TaskbarControl::setCounter(bool visible, int value)
2121
{
2222
QVariantMap properties;
23-
properties.insert(QStringLiteral("count-visible"), counterVisible);
24-
properties.insert(QStringLiteral("count"), counter);
23+
properties.insert(QStringLiteral("count-visible"), visible);
24+
properties.insert(QStringLiteral("count"), value);
2525
sendMessage(properties);
2626
}
2727

0 commit comments

Comments
 (0)