From 5116d43f4fed252d621890ca49ebcfaed85538ea Mon Sep 17 00:00:00 2001
From: Alexander Gorshenev <alexander.gorshenev@jetbrains.com>
Date: Mon, 4 Dec 2017 12:39:28 +0300
Subject: [PATCH] Some renaming to reflect reality.

---
 .../kotlin/konan/file/{NoJavaUtil.kt => File.kt}       |  0
 .../org/jetbrains/kotlin/konan/target/ClangArgs.kt     |  4 ++--
 .../konan/target/{ClangCross.kt => ClangManager.kt}    | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename shared/src/main/kotlin/org/jetbrains/kotlin/konan/file/{NoJavaUtil.kt => File.kt} (100%)
 rename shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/{ClangCross.kt => ClangManager.kt} (79%)

diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/file/NoJavaUtil.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/file/File.kt
similarity index 100%
rename from shared/src/main/kotlin/org/jetbrains/kotlin/konan/file/NoJavaUtil.kt
rename to shared/src/main/kotlin/org/jetbrains/kotlin/konan/file/File.kt
diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
index 81e2a3b5592..8471940caa6 100644
--- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
+++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.konan.target
 import org.jetbrains.kotlin.konan.properties.KonanProperties
 import org.jetbrains.kotlin.konan.file.File
 
-class ClangTarget(val target: KonanTarget, konanProperties: KonanProperties) {
+class ClangTargetArgs(val target: KonanTarget, konanProperties: KonanProperties) {
 
     val sysRoot = konanProperties.absoluteTargetSysRoot
     val targetArg = konanProperties.targetArg
@@ -96,7 +96,7 @@ class ClangTarget(val target: KonanTarget, konanProperties: KonanProperties) {
     }
 }
 
-class ClangHost(val hostProperties: KonanProperties) {
+class ClangHostArgs(val hostProperties: KonanProperties) {
 
     val targetToolchain get() = hostProperties.absoluteTargetToolchain
     val gccToolchain get() = hostProperties.absoluteGccToolchain
diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangCross.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangManager.kt
similarity index 79%
rename from shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangCross.kt
rename to shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangManager.kt
index 45fe86e8d80..03a63382a38 100644
--- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangCross.kt
+++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangManager.kt
@@ -25,18 +25,18 @@ class ClangManager(val properties: Properties, val baseDir: String) {
         it to KonanProperties(it, properties, baseDir)
     }.toMap()
 
-    private val targetClangs = enabledTargets.map {
-        it to ClangTarget(it, konanProperties[it]!!) 
+    private val targetClangArgs = enabledTargets.map {
+        it to ClangTargetArgs(it, konanProperties[it]!!) 
     }.toMap()
 
-    private val hostClang = ClangHost(konanProperties[host]!!)
+    private val hostClang = ClangHostArgs(konanProperties[host]!!)
 
     // These are converted to arrays to be convenient
     // in groovy plugins.
-    val hostClangArgs = (hostClang.commonClangArgs + targetClangs[host]!!.specificClangArgs).toTypedArray()
+    val hostClangArgs = (hostClang.commonClangArgs + targetClangArgs[host]!!.specificClangArgs).toTypedArray()
 
     fun targetClangArgs(target: KonanTarget)
-        = (hostClang.commonClangArgs + targetClangs[target]!!.specificClangArgs).toTypedArray()
+        = (hostClang.commonClangArgs + targetClangArgs[target]!!.specificClangArgs).toTypedArray()
 
     val hostCompilerArgsForJni = hostClang.hostCompilerArgsForJni.toTypedArray()
 }