Rename TabletSeatV2Interface::addTabletPad()

Drop "tablet" to match addTool(). We could the other way around, i.e.
rename addTool() to addTabletTool(), but "tablet" would be redundant.
wilder/Plasma/6.3
Vlad Zahorodnii 1 year ago
parent a61a6847e1
commit 55960e17c4
  1. 2
      autotests/wayland/server/test_tablet_interface.cpp
  2. 2
      src/tablet_input.cpp
  3. 18
      src/wayland/tablet_v2.cpp
  4. 18
      src/wayland/tablet_v2.h

@ -297,7 +297,7 @@ void TestTabletInterface::testAddPad()
QSignalSpy tabletPadSpy(m_tabletSeatClient, &TabletSeat::padAdded);
m_tabletPad =
seatInterface->addTabletPad(QStringLiteral("my tablet pad"), QStringLiteral("tabletpad"), {QStringLiteral("/test/event33")}, 1, 1, 1, 1, 0, m_tablet);
seatInterface->addPad(QStringLiteral("my tablet pad"), QStringLiteral("tabletpad"), {QStringLiteral("/test/event33")}, 1, 1, 1, 1, 0, m_tablet);
QVERIFY(m_tabletPad);
QVERIFY(tabletPadSpy.wait() || tabletPadSpy.count() == 1);
QCOMPARE(m_tabletSeatClient->m_pads.count(), 1);

@ -146,7 +146,7 @@ void TabletInputRedirection::integrateDevice(InputDevice *inputDevice)
const int modes = libinput_device_tablet_pad_get_num_mode_groups(device->device());
auto firstGroup = libinput_device_tablet_pad_get_mode_group(device->device(), 0);
tabletSeat->addTabletPad(device->sysName(), device->name(), {QString::fromUtf8(devnode)}, buttonsCount, ringsCount, stripsCount, modes, libinput_tablet_pad_mode_group_get_mode(firstGroup), tablet);
tabletSeat->addPad(device->sysName(), device->name(), {QString::fromUtf8(devnode)}, buttonsCount, ringsCount, stripsCount, modes, libinput_tablet_pad_mode_group_get_mode(firstGroup), tablet);
}
}

@ -864,15 +864,15 @@ TabletSeatV2Interface::addTablet(uint32_t vendorId, uint32_t productId, const QS
return iface;
}
TabletPadV2Interface *TabletSeatV2Interface::addTabletPad(const QString &sysname,
const QString &name,
const QStringList &paths,
quint32 buttons,
quint32 rings,
quint32 strips,
quint32 modes,
quint32 currentMode,
TabletV2Interface *tablet)
TabletPadV2Interface *TabletSeatV2Interface::addPad(const QString &sysname,
const QString &name,
const QStringList &paths,
quint32 buttons,
quint32 rings,
quint32 strips,
quint32 modes,
quint32 currentMode,
TabletV2Interface *tablet)
{
auto iface = new TabletPadV2Interface(paths.at(0), buttons, rings, strips, modes, currentMode, d->m_display, this);
iface->d->m_seat = this;

@ -276,15 +276,15 @@ public:
virtual ~TabletSeatV2Interface();
TabletV2Interface *addTablet(quint32 vendorId, quint32 productId, const QString &sysname, const QString &name, const QStringList &paths);
TabletPadV2Interface *addTabletPad(const QString &sysname,
const QString &name,
const QStringList &paths,
quint32 buttons,
quint32 rings,
quint32 strips,
quint32 modes,
quint32 currentMode,
TabletV2Interface *tablet);
TabletPadV2Interface *addPad(const QString &sysname,
const QString &name,
const QStringList &paths,
quint32 buttons,
quint32 rings,
quint32 strips,
quint32 modes,
quint32 currentMode,
TabletV2Interface *tablet);
TabletToolV2Interface *
addTool(TabletToolV2Interface::Type type, quint64 hardwareSerial, quint64 hardwareId, const QList<TabletToolV2Interface::Capability> &capabilities, const QString &deviceSysName);

Loading…
Cancel
Save