Get rid of the PersistentObject class

Our serialization requirements are fully served by the template
mechanism; there is no need to put an inheritance-based approach on top
of it.
Now there is no more virtual inheritance, which allowed us to get rid of
one more dynamic_cast. According to our benchmarker, build graph loading
has become about 3% faster.

Change-Id: If2f5080f74a0ef972a575ac2798f9d94a7f3b519
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

1 files changed, 4 insertions, 6 deletions

diff --git a/src/lib/corelib/language/resolvedfilecontext.h b/src/lib/corelib/language/resolvedfilecontext.h
index e090eb42a..6e6601c97 100644
--- a/src/lib/corelib/language/resolvedfilecontext.h
+++ b/src/lib/corelib/language/resolvedfilecontext.h
@@ -43,12 +43,10 @@
 #include "forward_decls.h"
 #include "filecontextbase.h"
 
-#include <tools/persistentobject.h>
-
 namespace qbs {
 namespace Internal {
 
-class ResolvedFileContext : public FileContextBase, public PersistentObject
+class ResolvedFileContext : public FileContextBase
 {
 public:
     static ResolvedFileContextPtr create()
@@ -61,12 +59,12 @@ public:
         return ResolvedFileContextPtr(new ResolvedFileContext(baseContext));
     }
 
+    void load(PersistentPool &pool);
+    void store(PersistentPool &pool) const;
+
 private:
     ResolvedFileContext() {}
     ResolvedFileContext(const FileContextBase &ctx);
-
-    void load(PersistentPool &pool);
-    void store(PersistentPool &pool) const;
 };
 
 bool operator==(const ResolvedFileContext &a, const ResolvedFileContext &b);