yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to naming suggested by native speakers.

Browse source
This commit is contained in:
Eike Hein 2016-04-19 18:40:57 +09:00
parent dcc9c00ce5
commit f47e2f7b31
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/wayland/autotests/client/test_plasma_window_model.cpp
View file

@ -60,7 +60,7 @@ private Q_SLOTS:
void testIsOnAllDesktops();
void testIsDemandingAttention();
void testSkipTaskbar();
void testIsShadable();
void testIsShadeable();
void testIsShaded();
void testTitle();
void testAppId();
@ -217,7 +217,7 @@ void PlasmaWindowModelTest::testRoleNames_data()
QTest::newRow("IsOnAllDesktops") << int(PlasmaWindowModel::IsOnAllDesktops) << QByteArrayLiteral("IsOnAllDesktops");
QTest::newRow("IsDemandingAttention") << int(PlasmaWindowModel::IsDemandingAttention) << QByteArrayLiteral("IsDemandingAttention");
QTest::newRow("SkipTaskbar") << int(PlasmaWindowModel::SkipTaskbar) << QByteArrayLiteral("SkipTaskbar");
QTest::newRow("IsShadable") << int(PlasmaWindowModel::IsShadable) << QByteArrayLiteral("IsShadable");
QTest::newRow("IsShadeable") << int(PlasmaWindowModel::IsShadeable) << QByteArrayLiteral("IsShadeable");
QTest::newRow("IsShaded") << int(PlasmaWindowModel::IsShaded) << QByteArrayLiteral("IsShaded");
}
@ -296,7 +296,7 @@ void PlasmaWindowModelTest::testDefaultData_data()
QTest::newRow("VirtualDesktop") << int(PlasmaWindowModel::VirtualDesktop) << QVariant(0);
QTest::newRow("IsOnAllDesktops") << int(PlasmaWindowModel::IsOnAllDesktops) << QVariant(false);
QTest::newRow("IsDemandingAttention") << int(PlasmaWindowModel::IsDemandingAttention) << QVariant(false);
QTest::newRow("IsShadable") << int(PlasmaWindowModel::IsShadable) << QVariant(false);
QTest::newRow("IsShadeable") << int(PlasmaWindowModel::IsShadeable) << QVariant(false);
QTest::newRow("IsShaded") << int(PlasmaWindowModel::IsShaded) << QVariant(false);
QTest::newRow("SkipTaskbar") << int(PlasmaWindowModel::SkipTaskbar) << QVariant(false);
}
@ -378,9 +378,9 @@ void PlasmaWindowModelTest::testSkipTaskbar()
QVERIFY(testBooleanData(PlasmaWindowModel::SkipTaskbar, &PlasmaWindowInterface::setSkipTaskbar));
}
void PlasmaWindowModelTest::testIsShadable()
void PlasmaWindowModelTest::testIsShadeable()
{
QVERIFY(testBooleanData(PlasmaWindowModel::IsShadable, &PlasmaWindowInterface::setShadable));
QVERIFY(testBooleanData(PlasmaWindowModel::IsShadeable, &PlasmaWindowInterface::setShadeable));
}
void PlasmaWindowModelTest::testIsShaded()

8
src/wayland/plasmawindowmanagement_interface.cpp
View file

@ -445,8 +445,8 @@ void PlasmaWindowInterface::Private::setStateCallback(wl_client *client, wl_reso
if (flags & ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STATE_SKIPTASKBAR) {
emit p->q->skipTaskbarRequested(state & ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STATE_SKIPTASKBAR);
}
if (flags & ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STATE_SHADABLE) {
emit p->q->shadableRequested(state & ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STATE_SHADABLE);
if (flags & ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STATE_SHADEABLE) {
emit p->q->shadeableRequested(state & ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STATE_SHADEABLE);
}
if (flags & ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STATE_SHADED) {
emit p->q->shadedRequested(state & ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STATE_SHADED);
@ -595,9 +595,9 @@ void PlasmaWindowInterface::setThemedIconName(const QString &iconName)
d->setThemedIconName(iconName);
}
void PlasmaWindowInterface::setShadable(bool set)
void PlasmaWindowInterface::setShadeable(bool set)
{
d->setState(ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STATE_SHADABLE, set);
d->setState(ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STATE_SHADEABLE, set);
}
void PlasmaWindowInterface::setShaded(bool set)

4
src/wayland/plasmawindowmanagement_interface.h
View file

@ -88,7 +88,7 @@ public:
/**
* @since 5.7
*/
void setShadable(bool set);
void setShadeable(bool set);
/**
* @since 5.7
*/
@ -122,7 +122,7 @@ Q_SIGNALS:
/**
* @since 5.7
*/
void shadableRequested(bool set);
void shadeableRequested(bool set);
/**
* @since 5.7
*/