aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2015-03-10 17:06:26 +0100
committerDmitry Jemerov <yole@jetbrains.com>2015-03-10 17:06:26 +0100
commit8d3999eb1fc3db7ab160c1f06b5ad35e5861bd6a (patch)
tree6d9761a28ac96e9d8374fdfd67e0c75e96b4e3d6
parent2e6eda906df5e66273deddbe7215c6dd15e4cc8c (diff)
downloaddokka-8d3999eb1fc3db7ab160c1f06b5ad35e5861bd6a.tar.gz
dokka-8d3999eb1fc3db7ab160c1f06b5ad35e5861bd6a.tar.bz2
dokka-8d3999eb1fc3db7ab160c1f06b5ad35e5861bd6a.zip
class object -> default object
-rw-r--r--src/Formats/HtmlTemplateService.kt2
-rw-r--r--src/Model/Content.kt4
-rw-r--r--test/data/classes/classWithDefaultObject.kt2
-rw-r--r--test/data/classes/defaultObjectExtension.kt2
-rw-r--r--test/data/format/classWithDefaultObject.kt2
-rw-r--r--test/data/format/defaultObjectExtension.kt2
-rw-r--r--test/src/markdown/MarkdownTestRunner.kt2
7 files changed, 8 insertions, 8 deletions
diff --git a/src/Formats/HtmlTemplateService.kt b/src/Formats/HtmlTemplateService.kt
index 54bfa300..859c37b7 100644
--- a/src/Formats/HtmlTemplateService.kt
+++ b/src/Formats/HtmlTemplateService.kt
@@ -4,7 +4,7 @@ public trait HtmlTemplateService {
fun appendHeader(to: StringBuilder, title: String?)
fun appendFooter(to: StringBuilder)
- class object {
+ default object {
public fun default(css: String? = null): HtmlTemplateService {
return object : HtmlTemplateService {
override fun appendFooter(to: StringBuilder) {
diff --git a/src/Model/Content.kt b/src/Model/Content.kt
index b9d67d5b..176be8d3 100644
--- a/src/Model/Content.kt
+++ b/src/Model/Content.kt
@@ -3,7 +3,7 @@ package org.jetbrains.dokka
import kotlin.properties.Delegates
public abstract class ContentNode {
- class object {
+ default object {
val empty = ContentEmpty
}
}
@@ -126,7 +126,7 @@ public open class Content(): ContentBlock() {
fun findSectionByTag(tag: String): ContentSection? =
sections.firstOrNull { tag.equalsIgnoreCase(it.tag) }
- class object {
+ default object {
val Empty = Content()
}
}
diff --git a/test/data/classes/classWithDefaultObject.kt b/test/data/classes/classWithDefaultObject.kt
index 459efad6..92e1a695 100644
--- a/test/data/classes/classWithDefaultObject.kt
+++ b/test/data/classes/classWithDefaultObject.kt
@@ -1,5 +1,5 @@
class Klass() {
- class object {
+ default object {
val x = 1
fun foo() {}
diff --git a/test/data/classes/defaultObjectExtension.kt b/test/data/classes/defaultObjectExtension.kt
index 0bef8a49..58d2e86a 100644
--- a/test/data/classes/defaultObjectExtension.kt
+++ b/test/data/classes/defaultObjectExtension.kt
@@ -1,5 +1,5 @@
class Foo {
- class object Default {
+ default object Default {
}
}
diff --git a/test/data/format/classWithDefaultObject.kt b/test/data/format/classWithDefaultObject.kt
index 459efad6..92e1a695 100644
--- a/test/data/format/classWithDefaultObject.kt
+++ b/test/data/format/classWithDefaultObject.kt
@@ -1,5 +1,5 @@
class Klass() {
- class object {
+ default object {
val x = 1
fun foo() {}
diff --git a/test/data/format/defaultObjectExtension.kt b/test/data/format/defaultObjectExtension.kt
index e367aa41..78df38c5 100644
--- a/test/data/format/defaultObjectExtension.kt
+++ b/test/data/format/defaultObjectExtension.kt
@@ -1,5 +1,5 @@
class Foo {
- class object Default {
+ default object Default {
}
}
diff --git a/test/src/markdown/MarkdownTestRunner.kt b/test/src/markdown/MarkdownTestRunner.kt
index 4ba9675e..7dc2e82e 100644
--- a/test/src/markdown/MarkdownTestRunner.kt
+++ b/test/src/markdown/MarkdownTestRunner.kt
@@ -9,7 +9,7 @@ import kotlin.properties.Delegates
import org.junit.ComparisonFailure
data class MarkdownTestUniqueId(val id: Int) : Serializable {
- class object {
+ default object {
var id = 0
fun next() = MarkdownTestUniqueId(id++)
}