default -> companion: replace all mentions of default and default object

This commit is contained in:
Pavel V. Talanov
2015-03-16 14:56:06 +03:00
parent a0783757e8
commit 06916d98c6
1019 changed files with 2468 additions and 2469 deletions
@@ -2,19 +2,19 @@ package library
class KtClass {
class Inner {
default object {
companion object {
fun foo(): Int = 1
}
}
default object {
companion object {
fun foo(): Int = 1
}
}
object KtObject {
class Inner {
default object {
companion object {
fun foo(): Int = 1
}
}
@@ -3,7 +3,7 @@ package source
import library.*
class Bar {
default object {
companion object {
val c : Int
}
}
@@ -2,19 +2,19 @@ package library
class KtClass {
class Inner {
default object {
companion object {
fun foo(): Int = 1
}
}
default object {
companion object {
fun foo(): Int = 1
}
}
object KtObject {
class Inner {
default object {
companion object {
fun foo(): Int = 1
}
}
@@ -11,17 +11,17 @@ class <caret>Foo {
val kt2 = KtObject.foo()
val kt3 = KtClass.Inner.foo()
val kt4 = KtObject.Inner.foo()
val kt5 = KtClass.Default.foo()
val kt6 = KtClass.Default
val kt5 = KtClass.Companion.foo()
val kt6 = KtClass.Companion
val kt7 = KtClass
val kt8 = Bar
val kt9 = Bar.Default
val kt10 = Bar.Default.c
val kt9 = Bar.Companion
val kt10 = Bar.Companion.c
}
class Bar {
default object {
companion object {
val c : Int
}
}