FIR: replace UnambiguousFqName with ClassId

compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt

@@ -384,7 +384,7 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
                     sb.append(packageFqName.asString().replace('.', '/'))
                 }
                 sb.append('.')
-                sb.append(fqName.classFqName.asString())
+                sb.append(fqName.relativeClassName.asString())
                 sb.append(typeArguments.joinToString { it ->
                     when (it) {
                         StarProjection -> "*"

compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolvedImport.kt

@@ -5,11 +5,11 @@
 
 package org.jetbrains.kotlin.fir.declarations
 
-import org.jetbrains.kotlin.fir.UnambiguousFqName
 import org.jetbrains.kotlin.fir.visitors.FirVisitor
+import org.jetbrains.kotlin.name.ClassId
 
 interface FirResolvedImport : FirImport {
-    val resolvedFqName: UnambiguousFqName
+    val resolvedFqName: ClassId
 
     override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R =
         visitor.visitResolvedImport(this, data)

compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirResolvedImportImpl.kt

@@ -5,14 +5,14 @@
 
 package org.jetbrains.kotlin.fir.declarations.impl
 
-import org.jetbrains.kotlin.fir.UnambiguousFqName
 import org.jetbrains.kotlin.fir.declarations.FirImport
 import org.jetbrains.kotlin.fir.declarations.FirResolvedImport
 import org.jetbrains.kotlin.fir.visitors.FirVisitor
+import org.jetbrains.kotlin.name.ClassId
 
 class FirResolvedImportImpl(
     val delegate: FirImport,
-    override val resolvedFqName: UnambiguousFqName
+    override val resolvedFqName: ClassId
 ) : FirResolvedImport, FirImport by delegate {
     override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R =
         visitor.visitResolvedImport(this, data)

compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirBuiltinType.kt

@@ -7,12 +7,11 @@ package org.jetbrains.kotlin.fir.types.impl
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.fir.FirSession
-import org.jetbrains.kotlin.fir.UnambiguousFqName
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirResolvedType
+import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.name.FqNameUnsafe
 import org.jetbrains.kotlin.name.Name
 
 sealed class FirBuiltinType(
@@ -21,9 +20,9 @@ sealed class FirBuiltinType(
     val name: String
 ) : FirResolvedType {
     final override val type: ConeKotlinType = ConeClassTypeImpl(
-        UnambiguousFqName(
+        ClassId(
             KOTLIN_PACKAGE_FQ_NAME,
-            FqName.topLevel(Name.identifier(name))
+            Name.identifier(name)
         ), emptyList()
     )
 
@@ -33,7 +32,7 @@ sealed class FirBuiltinType(
         get() = emptyList()
 
     companion object {
-        private val KOTLIN_PACKAGE_FQ_NAME = FqNameUnsafe.topLevel(Name.identifier("kotlin"))
+        private val KOTLIN_PACKAGE_FQ_NAME = FqName.topLevel(Name.identifier("kotlin"))
     }
 }