From f47e2f7b31a9362274e3c85f5becdc333b2b3008 Mon Sep 17 00:00:00 2001
From: Eike Hein <hein@kde.org>
Date: Tue, 19 Apr 2016 18:40:57 +0900
Subject: [PATCH] Switch to naming suggested by native speakers.

---
 .../autotests/client/test_plasma_window_model.cpp      | 10 +++++-----
 src/wayland/plasmawindowmanagement_interface.cpp       |  8 ++++----
 src/wayland/plasmawindowmanagement_interface.h         |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/wayland/autotests/client/test_plasma_window_model.cpp b/src/wayland/autotests/client/test_plasma_window_model.cpp
index f26c424870..0b508ef778 100644
--- a/src/wayland/autotests/client/test_plasma_window_model.cpp
+++ b/src/wayland/autotests/client/test_plasma_window_model.cpp
@@ -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()
diff --git a/src/wayland/plasmawindowmanagement_interface.cpp b/src/wayland/plasmawindowmanagement_interface.cpp
index 1beb586991..6152d6c33d 100644
--- a/src/wayland/plasmawindowmanagement_interface.cpp
+++ b/src/wayland/plasmawindowmanagement_interface.cpp
@@ -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)
diff --git a/src/wayland/plasmawindowmanagement_interface.h b/src/wayland/plasmawindowmanagement_interface.h
index c3bb140c14..17759b132b 100644
--- a/src/wayland/plasmawindowmanagement_interface.h
+++ b/src/wayland/plasmawindowmanagement_interface.h
@@ -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
      */