QmlJS: Cleanup Link.

* Don't use Qt macros for d-ptr.
* Move private functions to LinkPrivate.

Change-Id: Icb6f579e9168dd9bf5cccec1255fda1939e47c9a
Reviewed-on: http://codereview.qt-project.org/4767
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

1 files changed, 2 insertions, 31 deletions

diff --git a/src/libs/qmljs/qmljslink.h b/src/libs/qmljs/qmljslink.h
index f86cc5e1a9..c8964f750e 100644
--- a/src/libs/qmljs/qmljslink.h
+++ b/src/libs/qmljs/qmljslink.h
@@ -51,7 +51,6 @@ class LinkPrivate;
 class QMLJS_EXPORT Link
 {
     Q_DISABLE_COPY(Link)
-    Q_DECLARE_PRIVATE(Link)
     Q_DECLARE_TR_FUNCTIONS(QmlJS::Link)
 
 public:
@@ -67,36 +66,8 @@ public:
     ~Link();
 
 private:
-    static AST::UiQualifiedId *qualifiedTypeNameId(AST::Node *node);
-
-    Context::ImportsPerDocument linkImports();
-
-    void populateImportedTypes(Imports *imports, Document::Ptr doc);
-    Import importFileOrDirectory(
-        Document::Ptr doc,
-        const ImportInfo &importInfo);
-    Import importNonFile(
-        Document::Ptr doc,
-        const ImportInfo &importInfo);
-    void importObject(Bind *bind, const QString &name, ObjectValue *object, NameId *targetNamespace);
-
-    bool importLibrary(Document::Ptr doc,
-                       const QString &libraryPath,
-                       Import *import,
-                       const QString &importPath = QString());
-    void loadQmldirComponents(ObjectValue *import,
-                              LanguageUtils::ComponentVersion version,
-                              const LibraryInfo &libraryInfo,
-                              const QString &libraryPath);
-    void loadImplicitDirectoryImports(Imports *imports, Document::Ptr doc);
-    void loadImplicitDefaultImports(Imports *imports);
-
-    void error(const Document::Ptr &doc, const AST::SourceLocation &loc, const QString &message);
-    void warning(const Document::Ptr &doc, const AST::SourceLocation &loc, const QString &message);
-    void appendDiagnostic(const Document::Ptr &doc, const DiagnosticMessage &message);
-
-private:
-    QScopedPointer<LinkPrivate> d_ptr;
+    LinkPrivate *d;
+    friend class LinkPrivate;
 };
 
 } // namespace QmlJS