Rename getQualifiedName() -> getFqName()

JetBrains · Feb 19, 2013 · ec33f90 · ec33f90
1 parent 029b2d9
commit ec33f90
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java
@@ -261,7 +261,7 @@ public void visitNamedFunction(JetNamedFunction function) {
         }
         else if (containingDeclaration instanceof NamespaceDescriptor) {
             String peek = peekFromStack(nameStack);
-            FqName qualifiedName = ((NamespaceDescriptor) containingDeclaration).getQualifiedName();
+            FqName qualifiedName = ((NamespaceDescriptor) containingDeclaration).getFqName();
             String packageClassName = PackageClassUtils.getPackageClassName(qualifiedName);
             if (peek.isEmpty()) {
                 peek = packageClassName;

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java
@@ -145,7 +145,7 @@ else if (nsKind == JavaNamespaceKind.CLASS_STATICS) {
             if (r.length() > 0) {
                 r.append("/");
             }
-            r.append(PackageClassUtils.getPackageClassName(namespace.getQualifiedName()));
+            r.append(PackageClassUtils.getPackageClassName(namespace.getFqName()));
         }
 
         if (r.length() == 0) {

diff --git a/...tend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaNamespaceDescriptor.java b/...tend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaNamespaceDescriptor.java
@@ -47,7 +47,7 @@ public JetScope getMemberScope() {
 
     @NotNull
     @Override
-    public FqName getQualifiedName() {
+    public FqName getFqName() {
         return qualifiedName;
     }
 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/FqNamed.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/FqNamed.java
@@ -22,5 +22,5 @@
 public interface FqNamed {
 
     @NotNull
-    FqName getQualifiedName();
+    FqName getFqName();
 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorImpl.java
@@ -57,7 +57,7 @@ public void addNamespace(@NotNull NamespaceDescriptor namespaceDescriptor) {
 
     @NotNull
     @Override
-    public FqName getQualifiedName() {
+    public FqName getFqName() {
         return DescriptorUtils.getFQName(this).toSafe();
     }
 

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java
@@ -87,7 +87,7 @@ public JetExpression getInitializer() {
     * @return
     */
     @Nullable
-    public FqName getQualifiedName() {
+    public FqName getFqName() {
         final PsiJetFunctionStub stub = getStub();
         if (stub != null) {
             return stub.getTopFQName();

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFunctionElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFunctionElementType.java
@@ -67,7 +67,7 @@ public PsiJetFunctionStub createStub(@NotNull JetNamedFunction psi, @NotNull Stu
         final boolean isTopLevel = psi.getParent() instanceof JetFile;
         final boolean isExtension = psi.getReceiverTypeRef() != null;
 
-        FqName qualifiedName = psi.getQualifiedName();
+        FqName qualifiedName = psi.getFqName();
 
         return new PsiJetFunctionStubImpl(JetStubElementTypes.FUNCTION, parentStub, psi.getName(), isTopLevel, qualifiedName, isExtension);
     }

diff --git a/...r/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageDescriptor.java b/...r/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageDescriptor.java
@@ -61,7 +61,7 @@ public JetScope getMemberScope() {
 
     @NotNull
     @Override
-    public FqName getQualifiedName() {
+    public FqName getFqName() {
         return DescriptorUtils.getFQName(this).toSafe();
     }
 

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
@@ -316,7 +316,7 @@ public NamespaceDescriptor getBuiltInsPackage() {
 
     @NotNull
     public FqName getBuiltInsPackageFqName() {
-        return getBuiltInsPackage().getQualifiedName();
+        return getBuiltInsPackage().getFqName();
     }
 
     @NotNull

diff --git a/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java b/js/js.translator/src/org/jetbrains/k2js/analyze/JsConfiguration.java
@@ -67,7 +67,7 @@ public void extendNamespaceScope(@NotNull BindingTrace trace, @NotNull Namespace
                 .extendNamespaceScope(trace, namespaceDescriptor, namespaceMemberScope);
 
         // Extend root namespace with standard classes
-        if (namespaceDescriptor.getQualifiedName().shortNameOrSpecial().equals(FqNameUnsafe.ROOT_NAME)) {
+        if (namespaceDescriptor.getFqName().shortNameOrSpecial().equals(FqNameUnsafe.ROOT_NAME)) {
             namespaceMemberScope.importScope(KotlinBuiltIns.getInstance().getBuiltInsScope());
         }