give FileContext and ResolvedFileContext a common base

Change-Id: I76f0e5e0b9f99a6f33c3381436ee6c4879e36a68
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

1 files changed, 7 insertions, 4 deletions

diff --git a/src/lib/corelib/language/resolvedfilecontext.h b/src/lib/corelib/language/resolvedfilecontext.h
index 66266181e..db5df5089 100644
--- a/src/lib/corelib/language/resolvedfilecontext.h
+++ b/src/lib/corelib/language/resolvedfilecontext.h
@@ -31,13 +31,14 @@
 #define QBS_RESOLVEDFILECONTEXT_H
 
 #include "forward_decls.h"
+#include "filecontextbase.h"
 #include "jsimports.h"
 #include <tools/persistentobject.h>
 
 namespace qbs {
 namespace Internal {
 
-class ResolvedFileContext : public PersistentObject
+class ResolvedFileContext : public FileContextBase, public PersistentObject
 {
 public:
     static ResolvedFileContextPtr create()
@@ -45,12 +46,14 @@ public:
         return ResolvedFileContextPtr(new ResolvedFileContext);
     }
 
-    QString filePath;
-    QStringList jsExtensions;
-    JsImports jsImports;
+    static ResolvedFileContextPtr create(const FileContextBase &baseContext)
+    {
+        return ResolvedFileContextPtr(new ResolvedFileContext(baseContext));
+    }
 
 private:
     ResolvedFileContext() {}
+    ResolvedFileContext(const FileContextBase &ctx);
 
     void load(PersistentPool &pool);
     void store(PersistentPool &pool) const;