Rename Documentables to avoid name conflicts

5 files changed, 10 insertions, 10 deletions

diff --git a/core/src/main/kotlin/transformers/descriptors/DescriptorToDocumentableTranslator.kt b/core/src/main/kotlin/transformers/descriptors/DescriptorToDocumentableTranslator.kt
index d72eeafd..ca66b90a 100644
--- a/core/src/main/kotlin/transformers/descriptors/DescriptorToDocumentableTranslator.kt
+++ b/core/src/main/kotlin/transformers/descriptors/DescriptorToDocumentableTranslator.kt
@@ -1,6 +1,6 @@
 package org.jetbrains.dokka.transformers.descriptors
 
-import org.jetbrains.dokka.model.Module
+import org.jetbrains.dokka.model.DModule
 import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
 
@@ -9,5 +9,5 @@ interface DescriptorToDocumentableTranslator {
         moduleName: String,
         packageFragments: Iterable<PackageFragmentDescriptor>,
         platformData: PlatformData
-    ): Module
+    ): DModule
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/transformers/documentation/DocumentableMerger.kt b/core/src/main/kotlin/transformers/documentation/DocumentableMerger.kt
index 5a17bc24..c8ae9c02 100644
--- a/core/src/main/kotlin/transformers/documentation/DocumentableMerger.kt
+++ b/core/src/main/kotlin/transformers/documentation/DocumentableMerger.kt
@@ -1,8 +1,8 @@
 package org.jetbrains.dokka.transformers.documentation
 
-import org.jetbrains.dokka.model.Module
+import org.jetbrains.dokka.model.DModule
 import org.jetbrains.dokka.plugability.DokkaContext
 
 interface DocumentableMerger {
-    operator fun invoke(modules: Collection<Module>, context: DokkaContext): Module
+    operator fun invoke(modules: Collection<DModule>, context: DokkaContext): DModule
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/transformers/documentation/DocumentableToPageTranslator.kt b/core/src/main/kotlin/transformers/documentation/DocumentableToPageTranslator.kt
index e41e0c84..83456f01 100644
--- a/core/src/main/kotlin/transformers/documentation/DocumentableToPageTranslator.kt
+++ b/core/src/main/kotlin/transformers/documentation/DocumentableToPageTranslator.kt
@@ -1,8 +1,8 @@
 package org.jetbrains.dokka.transformers.documentation
 
-import org.jetbrains.dokka.model.Module
+import org.jetbrains.dokka.model.DModule
 import org.jetbrains.dokka.pages.ModulePageNode
 
 interface DocumentableToPageTranslator {
-    operator fun invoke(module: Module): ModulePageNode
+    operator fun invoke(module: DModule): ModulePageNode
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/transformers/documentation/DocumentableTransformer.kt b/core/src/main/kotlin/transformers/documentation/DocumentableTransformer.kt
index 88a1514d..3eb4704e 100644
--- a/core/src/main/kotlin/transformers/documentation/DocumentableTransformer.kt
+++ b/core/src/main/kotlin/transformers/documentation/DocumentableTransformer.kt
@@ -1,8 +1,8 @@
 package org.jetbrains.dokka.transformers.documentation
 
-import org.jetbrains.dokka.model.Module
+import org.jetbrains.dokka.model.DModule
 import org.jetbrains.dokka.plugability.DokkaContext
 
 interface DocumentableTransformer {
-    operator fun invoke(original: Module, context: DokkaContext): Module
+    operator fun invoke(original: DModule, context: DokkaContext): DModule
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/transformers/psi/PsiToDocumentableTranslator.kt b/core/src/main/kotlin/transformers/psi/PsiToDocumentableTranslator.kt
index 1ea07ff3..6f5025bd 100644
--- a/core/src/main/kotlin/transformers/psi/PsiToDocumentableTranslator.kt
+++ b/core/src/main/kotlin/transformers/psi/PsiToDocumentableTranslator.kt
@@ -1,7 +1,7 @@
 package org.jetbrains.dokka.transformers.psi
 
 import com.intellij.psi.PsiJavaFile
-import org.jetbrains.dokka.model.Module
+import org.jetbrains.dokka.model.DModule
 import org.jetbrains.dokka.pages.PlatformData
 import org.jetbrains.dokka.plugability.DokkaContext
 
@@ -11,5 +11,5 @@ interface PsiToDocumentableTranslator {
         psiFiles: List<PsiJavaFile>,
         platformData: PlatformData,
         context: DokkaContext
-    ): Module
+    ): DModule
 }