From faa78e187e5349a26c66adbb425096a8688fd384 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Tue, 11 Nov 2014 14:33:31 +0100
Subject: [PATCH] Rename DecoratedClient::borderingScreenEdges to
 adjacentScreenEdges

---
 decorations/decoratedclient.cpp                             | 4 ++--
 decorations/decoratedclient.h                               | 2 +-
 kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp | 4 ++--
 kcmkwin/kwindecoration/declarative-plugin/previewclient.h   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/decorations/decoratedclient.cpp b/decorations/decoratedclient.cpp
index 83cbc43d54..3d7700f456 100644
--- a/decorations/decoratedclient.cpp
+++ b/decorations/decoratedclient.cpp
@@ -88,7 +88,7 @@ DecoratedClientImpl::DecoratedClientImpl(Client *client, KDecoration2::Decorated
     );
     connect(client, &Client::quickTileModeChanged, decoratedClient,
         [this, decoratedClient]() {
-            emit decoratedClient->borderingScreenEdgesChanged(borderingScreenEdges());
+            emit decoratedClient->adjacentScreenEdgesChanged(adjacentScreenEdges());
         }
     );
     connect(client, &Client::closeableChanged, decoratedClient, &KDecoration2::DecoratedClient::closeableChanged);
@@ -200,7 +200,7 @@ bool DecoratedClientImpl::isMaximizedHorizontally() const
     return m_client->maximizeMode() & KDecorationDefines::MaximizeHorizontal;
 }
 
-Qt::Edges DecoratedClientImpl::borderingScreenEdges() const
+Qt::Edges DecoratedClientImpl::adjacentScreenEdges() const
 {
     Qt::Edges edges;
     const KDecorationDefines::QuickTileMode mode = m_client->quickTileMode();
diff --git a/decorations/decoratedclient.h b/decorations/decoratedclient.h
index fe870e1be2..898c9c58dd 100644
--- a/decorations/decoratedclient.h
+++ b/decorations/decoratedclient.h
@@ -65,7 +65,7 @@ public:
     int width() const override;
     WId windowId() const override;
 
-    Qt::Edges borderingScreenEdges() const override;
+    Qt::Edges adjacentScreenEdges() const override;
 
     void requestClose() override;
     void requestContextHelp() override;
diff --git a/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp b/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp
index 7ee1fc28e0..8ca0ae4a14 100644
--- a/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp
+++ b/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp
@@ -124,7 +124,7 @@ PreviewClient::PreviewClient(DecoratedClient *c, Decoration *decoration)
         }
     );
     auto emitEdgesChanged = [this, c]() {
-        c->borderingScreenEdgesChanged(borderingScreenEdges());
+        c->adjacentScreenEdgesChanged(adjacentScreenEdges());
     };
     connect(this, &PreviewClient::bordersTopEdgeChanged,    this, emitEdgesChanged);
     connect(this, &PreviewClient::bordersLeftEdgeChanged,   this, emitEdgesChanged);
@@ -296,7 +296,7 @@ void PreviewClient::setColorSchemeIndex(int index)
     emit colorSchemeIndexChanged(m_colorSchemeIndex);
 }
 
-Qt::Edges PreviewClient::borderingScreenEdges() const
+Qt::Edges PreviewClient::adjacentScreenEdges() const
 {
     Qt::Edges edges;
     if (m_bordersBottomEdge) {
diff --git a/kcmkwin/kwindecoration/declarative-plugin/previewclient.h b/kcmkwin/kwindecoration/declarative-plugin/previewclient.h
index fbf2d8f297..c04c7bff51 100644
--- a/kcmkwin/kwindecoration/declarative-plugin/previewclient.h
+++ b/kcmkwin/kwindecoration/declarative-plugin/previewclient.h
@@ -92,7 +92,7 @@ public:
     int width() const override;
     int height() const override;
     QPalette palette() const override;
-    Qt::Edges borderingScreenEdges() const override;
+    Qt::Edges adjacentScreenEdges() const override;
 
     void requestClose() override;
     void requestContextHelp() override;