Remove hacks introduced for 172 platform compatibility

idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/KtLightClassForDecompiledDeclaration.kt

@@ -24,7 +24,6 @@ import org.jetbrains.kotlin.asJava.classes.KtLightClassBase
 import org.jetbrains.kotlin.asJava.elements.KtLightFieldImpl
 import org.jetbrains.kotlin.asJava.elements.KtLightMethodImpl
 import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile
-import org.jetbrains.kotlin.idea.util.qualifiedNameEx
 import org.jetbrains.kotlin.load.java.structure.LightClassOriginKind
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtClassOrObject
@@ -34,7 +33,7 @@ class KtLightClassForDecompiledDeclaration(
     override val kotlinOrigin: KtClassOrObject?,
     private val file: KtClsFile
 ) : KtLightClassBase(clsDelegate.manager) {
-    val fqName = kotlinOrigin?.fqName ?: FqName(clsDelegate.qualifiedNameEx.orEmpty())
+    val fqName = kotlinOrigin?.fqName ?: FqName(clsDelegate.qualifiedName.orEmpty())
 
     override fun copy() = this
 

idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/overridersSearch.kt

@@ -12,6 +12,7 @@ import com.intellij.psi.search.searches.DirectClassInheritorsSearch
 import com.intellij.psi.search.searches.FunctionalExpressionSearch
 import com.intellij.psi.search.searches.OverridingMethodsSearch
 import com.intellij.psi.util.MethodSignatureUtil
+import com.intellij.psi.util.PsiUtil
 import com.intellij.psi.util.TypeConversionUtil
 import com.intellij.util.EmptyQuery
 import com.intellij.util.MergeQuery
@@ -30,7 +31,6 @@ import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
 import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor
 import org.jetbrains.kotlin.idea.core.getDeepestSuperDeclarations
 import org.jetbrains.kotlin.idea.core.isOverridable
-import org.jetbrains.kotlin.idea.core.util.compat.psi.canBeOverridden
 import org.jetbrains.kotlin.idea.search.allScope
 import org.jetbrains.kotlin.idea.search.excludeKotlinSources
 import org.jetbrains.kotlin.idea.util.application.runReadAction
@@ -42,7 +42,7 @@ import org.jetbrains.kotlin.util.findCallableMemberBySignature
 import java.util.*
 
 fun PsiElement.isOverridableElement(): Boolean = when (this) {
-    is PsiMethod -> canBeOverridden(this)
+    is PsiMethod -> PsiUtil.canBeOverridden(this)
     is KtDeclaration -> isOverridable()
     else -> false
 }
@@ -104,7 +104,7 @@ object KotlinPsiMethodOverridersSearch : HierarchySearch<PsiMethod>(PsiMethodOve
 
 object PsiMethodOverridingHierarchyTraverser: HierarchyTraverser<PsiMethod> {
     override fun nextElements(current: PsiMethod): Iterable<PsiMethod> = KotlinPsiMethodOverridersSearch.searchDirectOverriders(current)
-    override fun shouldDescend(element: PsiMethod): Boolean = canBeOverridden(element)
+    override fun shouldDescend(element: PsiMethod): Boolean = PsiUtil.canBeOverridden(element)
 }
 
 fun PsiElement.toPossiblyFakeLightMethods(): List<PsiMethod> {

idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/clsClassImplUtil.kt

@@ -1,15 +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.idea.util
-
-import com.intellij.psi.impl.compiled.ClsClassImpl
-
-/**
- * Nullable wrapper for qualifiedName.
- * BUNCH: 173
- */
-@Suppress("IncompatibleAPI")
-val ClsClassImpl.qualifiedNameEx: String? get() = qualifiedName