From 53a9fff0bcc6b5d77e78c7bbe09f96945ad3e0a1 Mon Sep 17 00:00:00 2001
From: James Strachan <james.strachan@gmail.com>
Date: Wed, 23 May 2012 09:30:03 +0100
Subject: [PATCH] attempt to fix compile error introduced by Stepan's
 refactoring

---
 .../org/jetbrains/kotlin/doc/model/KotlinModel.kt    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt
index 3186ed6f4cb..814407c0bd2 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt
@@ -67,7 +67,7 @@ fun qualifiedName(descriptor: DeclarationDescriptor?): String {
         return ""
     } else {
         val parent = containerName(descriptor)
-        var name = descriptor.getName() ?: ""
+        var name = descriptor.getName()?.getName() ?: ""
         if (name.startsWith("<")) {
             name = ""
         }
@@ -356,7 +356,7 @@ class KModel(var context: BindingContext, val config: KDocConfig) {
             val descriptors = scope.getAllDescriptors()
             for (descriptor in descriptors) {
                 if (descriptor is PropertyDescriptor) {
-                    val name = descriptor.getName()
+                    val name = descriptor.getName()?.getName()
                     val returnType = getType(descriptor.getReturnType())
                     if (returnType != null) {
                         val receiver = descriptor.getReceiverParameter()
@@ -384,7 +384,7 @@ class KModel(var context: BindingContext, val config: KDocConfig) {
     protected fun createFunction(owner: KClassOrPackage, descriptor: CallableDescriptor): KFunction? {
         val returnType = getType(descriptor.getReturnType())
         if (returnType != null) {
-            val name = descriptor.getName() ?: "null"
+            val name = descriptor.getName()?.getName() ?: "null"
             val parameters = ArrayList<KParameter>()
             val params = descriptor.getValueParameters()
             for (param in params) {
@@ -421,7 +421,7 @@ class KModel(var context: BindingContext, val config: KDocConfig) {
     }
 
     protected fun createTypeParameter(descriptor: TypeParameterDescriptor): KTypeParameter? {
-        val name = descriptor.getName()
+        val name = descriptor.getName()?.getName()
         val answer = KTypeParameter(name, descriptor, this)
         configureComments(answer, descriptor)
         return answer
@@ -430,7 +430,7 @@ class KModel(var context: BindingContext, val config: KDocConfig) {
     protected fun createParameter(descriptor: ValueParameterDescriptor): KParameter? {
         val returnType = getType(descriptor.getReturnType())
         if (returnType != null) {
-            val name = descriptor.getName()
+            val name = descriptor.getName()?.getName()
             val answer = KParameter(descriptor, name, returnType)
             configureComments(answer, descriptor)
             return answer
@@ -681,7 +681,7 @@ $highlight"""
     }
 
     fun getClass(classElement: ClassDescriptor): KClass? {
-        val name = classElement.getName()
+        val name = classElement.getName()?.getName()
         if (name != null) {
             var dec: DeclarationDescriptor? = classElement.getContainingDeclaration()
             while (dec != null) {