From d08947ce59d89a6a09bd83387ff816feed95dc8a Mon Sep 17 00:00:00 2001
From: Max Medvedev <maxim.medvedev@jetbrains.com>
Date: Fri, 22 Jun 2018 10:03:55 +0300
Subject: [PATCH] kotlin-objective-c cross resolve: rename
 ObjCExportNamer#getName -> getPropertyName

---
 .../backend/konan/objcexport/ObjCExportHeaderGenerator.kt     | 4 ++--
 .../kotlin/backend/konan/objcexport/ObjCExportNamer.kt        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt
index 22bea5327a9..b4ac5dc6d97 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt
@@ -500,7 +500,7 @@ abstract class ObjCExportHeaderGenerator(
     private fun buildProperties(property: PropertyDescriptor): Set<RenderedStub<ObjCProperty>> = propertyToSignatures.getOrPut(property) {
         mapper.getBaseProperties(property)
                 .asSequence()
-                .distinctBy { namer.getName(it) }
+                .distinctBy { namer.getPropertyName(it) }
                 .map { base -> buildProperty(property, base) }
                 .map { property -> RenderedStub(property) }
                 .toSet()
@@ -518,7 +518,7 @@ abstract class ObjCExportHeaderGenerator(
 
         val getterBridge = mapper.bridgeMethod(baseProperty.getter!!)
         val type = mapReturnType(getterBridge.returnBridge, property.getter!!)
-        val name = namer.getName(baseProperty)
+        val name = namer.getPropertyName(baseProperty)
 
         val attributes = mutableListOf<String>()
 
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt
index 51eb53993ba..ed0a3c7ad72 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt
@@ -205,7 +205,7 @@ internal class ObjCExportNamer(val moduleDescriptor: ModuleDescriptor,
         }
     }
 
-    fun getName(property: PropertyDescriptor): String = propertyNames.getOrPut(property) {
+    fun getPropertyName(property: PropertyDescriptor): String = propertyNames.getOrPut(property) {
         assert(mapper.isBaseProperty(property))
         assert(mapper.isObjCProperty(property))