QScopedPointer in Qt6 doesn't implicitly cast to bool anymore
This commit is contained in:
parent
e0c1d2583a
commit
e5a85f503a
1 changed files with 6 additions and 6 deletions
|
@ -352,7 +352,7 @@ void SeatInterface::setHasKeyboard(bool has)
|
||||||
d->accumulatedCapabilities |= d->capabilities;
|
d->accumulatedCapabilities |= d->capabilities;
|
||||||
|
|
||||||
d->sendCapabilities();
|
d->sendCapabilities();
|
||||||
Q_EMIT hasKeyboardChanged(d->keyboard);
|
Q_EMIT hasKeyboardChanged(!d->keyboard.isNull());
|
||||||
}
|
}
|
||||||
|
|
||||||
void SeatInterface::setHasPointer(bool has)
|
void SeatInterface::setHasPointer(bool has)
|
||||||
|
@ -370,7 +370,7 @@ void SeatInterface::setHasPointer(bool has)
|
||||||
d->accumulatedCapabilities |= d->capabilities;
|
d->accumulatedCapabilities |= d->capabilities;
|
||||||
|
|
||||||
d->sendCapabilities();
|
d->sendCapabilities();
|
||||||
Q_EMIT hasPointerChanged(d->pointer);
|
Q_EMIT hasPointerChanged(!d->pointer.isNull());
|
||||||
}
|
}
|
||||||
|
|
||||||
void SeatInterface::setHasTouch(bool has)
|
void SeatInterface::setHasTouch(bool has)
|
||||||
|
@ -388,7 +388,7 @@ void SeatInterface::setHasTouch(bool has)
|
||||||
d->accumulatedCapabilities |= d->capabilities;
|
d->accumulatedCapabilities |= d->capabilities;
|
||||||
|
|
||||||
d->sendCapabilities();
|
d->sendCapabilities();
|
||||||
Q_EMIT hasTouchChanged(d->touch);
|
Q_EMIT hasTouchChanged(!d->touch.isNull());
|
||||||
}
|
}
|
||||||
|
|
||||||
void SeatInterface::setName(const QString &name)
|
void SeatInterface::setName(const QString &name)
|
||||||
|
@ -415,17 +415,17 @@ QString SeatInterface::name() const
|
||||||
|
|
||||||
bool SeatInterface::hasPointer() const
|
bool SeatInterface::hasPointer() const
|
||||||
{
|
{
|
||||||
return d->pointer;
|
return !d->pointer.isNull();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool SeatInterface::hasKeyboard() const
|
bool SeatInterface::hasKeyboard() const
|
||||||
{
|
{
|
||||||
return d->keyboard;
|
return !d->keyboard.isNull();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool SeatInterface::hasTouch() const
|
bool SeatInterface::hasTouch() const
|
||||||
{
|
{
|
||||||
return d->touch;
|
return !d->touch.isNull();
|
||||||
}
|
}
|
||||||
|
|
||||||
Display *SeatInterface::display() const
|
Display *SeatInterface::display() const
|
||||||
|
|
Loading…
Reference in a new issue