FIR: replace UnambiguousFqName with ClassId

compiler/fir/cones/src/org/jetbrains/kotlin/fir/UnambiguousFqName.kt

@@ -1,22 +0,0 @@
-
-/*
- * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir
-
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.name.FqNameUnsafe
-
-/*
- * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
- */
-
-data class UnambiguousFqName(val packageFqName: FqNameUnsafe, val classFqName: FqName) {
-
-    override fun toString(): String {
-        return packageFqName.asString() + "/" + classFqName.asString()
-    }
-}

compiler/fir/cones/src/org/jetbrains/kotlin/fir/descriptors/ConeDescriptors.kt

@@ -5,8 +5,8 @@
 
 package org.jetbrains.kotlin.fir.descriptors
 
-import org.jetbrains.kotlin.fir.UnambiguousFqName
 import org.jetbrains.kotlin.fir.types.ConeKotlinType
+import org.jetbrains.kotlin.name.ClassId
 
 
 interface ConeDescriptor
@@ -16,7 +16,7 @@ interface ConeClassifierDescriptor : ConeDescriptor
 interface ConeClassifierDescriptorWithTypeParameters : ConeClassifierDescriptor {
     val typeParameters: List<ConeTypeParameterDescriptor>
 
-    val fqName: UnambiguousFqName
+    val fqName: ClassId
 }
 
 interface ConeTypeParameterDescriptor : ConeClassifierDescriptor

compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeKotlinType.kt

@@ -5,7 +5,7 @@
 
 package org.jetbrains.kotlin.fir.types
 
-import org.jetbrains.kotlin.fir.UnambiguousFqName
+import org.jetbrains.kotlin.name.ClassId
 
 sealed class ConeKotlinTypeProjection(val kind: ProjectionKind)
 
@@ -29,5 +29,5 @@ abstract class ConeKotlinType : ConeKotlinTypeProjection(ProjectionKind.INVARIAN
 }
 
 abstract class ConeClassType : ConeKotlinType() {
-    abstract val fqName: UnambiguousFqName
+    abstract val fqName: ClassId
 }

compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/impl/Impl.kt

@@ -5,11 +5,11 @@
 
 package org.jetbrains.kotlin.fir.types.impl
 
-import org.jetbrains.kotlin.fir.UnambiguousFqName
 import org.jetbrains.kotlin.fir.types.*
+import org.jetbrains.kotlin.name.ClassId
 
 class ConeClassTypeImpl(
-    override val fqName: UnambiguousFqName,
+    override val fqName: ClassId,
     override val typeArguments: List<ConeKotlinTypeProjection>
 ) : ConeClassType()