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,7 +2,7 @@
package test
class ConstructorTypeParamClassObjectTypeConflict<test> {
default object {
companion object {
trait test
}
@@ -10,7 +10,7 @@ class ConstructorTypeParamClassObjectTypeConflict<test> {
}
class ConstructorTypeParamClassObjectConflict<test> {
default object {
companion object {
val test = 12
}
@@ -18,7 +18,7 @@ class ConstructorTypeParamClassObjectConflict<test> {
}
class TestConstructorParamClassObjectConflict(test: String) {
default object {
companion object {
val test = 12
}
@@ -27,7 +27,7 @@ class TestConstructorParamClassObjectConflict(test: String) {
class TestConstructorValClassObjectConflict(val test: String) {
default object {
companion object {
val test = 12
}
@@ -35,7 +35,7 @@ class TestConstructorValClassObjectConflict(val test: String) {
}
class TestClassObjectAndClassConflict {
default object {
companion object {
val bla = 12
}