rename class PrepareScript to ScriptFunction

Later, we want to use this class for script function properties that
have a name that's different from "prepare".

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

5 files changed, 21 insertions, 21 deletions

diff --git a/src/lib/language/forward_decls.h b/src/lib/language/forward_decls.h
index f05148902..646387dad 100644
--- a/src/lib/language/forward_decls.h
+++ b/src/lib/language/forward_decls.h
@@ -86,9 +86,9 @@ class SourceArtifact;
 typedef QSharedPointer<SourceArtifact> SourceArtifactPtr;
 typedef QSharedPointer<const SourceArtifact> SourceArtifactConstPtr;
 
-class PrepareScript;
-typedef QSharedPointer<PrepareScript> PrepareScriptPtr;
-typedef QSharedPointer<const PrepareScript> PrepareScriptConstPtr;
+class ScriptFunction;
+typedef QSharedPointer<ScriptFunction> ScriptFunctionPtr;
+typedef QSharedPointer<const ScriptFunction> ScriptFunctionConstPtr;
 
 class RuleArtifact;
 typedef QSharedPointer<RuleArtifact> RuleArtifactPtr;
diff --git a/src/lib/language/language.cpp b/src/lib/language/language.cpp
index ec2bf4876..b52ed9947 100644
--- a/src/lib/language/language.cpp
+++ b/src/lib/language/language.cpp
@@ -236,15 +236,15 @@ void RuleArtifact::store(PersistentPool &pool) const
    * This is mostly needed for diagnostics.
    */
 
-void PrepareScript::load(PersistentPool &pool)
+void ScriptFunction::load(PersistentPool &pool)
 {
-    pool.stream() >> script;
+    pool.stream() >> sourceCode;
     pool.stream() >> location;
 }
 
-void PrepareScript::store(PersistentPool &pool) const
+void ScriptFunction::store(PersistentPool &pool) const
 {
-    pool.stream() << script;
+    pool.stream() << sourceCode;
     pool.stream() << location;
 }
 
@@ -307,7 +307,7 @@ FileTags Rule::outputFileTags() const
 
 void Rule::load(PersistentPool &pool)
 {
-    script = pool.idLoadS<PrepareScript>();
+    script = pool.idLoadS<ScriptFunction>();
     module = pool.idLoadS<ResolvedModule>();
     pool.stream() >> jsImports
         >> jsExtensions
@@ -917,7 +917,7 @@ void ResolvedTransformer::load(PersistentPool &pool)
     module = pool.idLoadS<ResolvedModule>();
     pool.stream() >> inputs;
     pool.loadContainerS(outputs);
-    transform = pool.idLoadS<PrepareScript>();
+    transform = pool.idLoadS<ScriptFunction>();
     pool.stream() >> jsImports >> jsExtensions;
 }
 
@@ -956,7 +956,7 @@ template<typename T> bool listsAreEqual(const QList<T> &l1, const QList<T> &l2)
 }
 
 QString keyFromElem(const SourceArtifactPtr &sa) { return sa->absoluteFilePath; }
-QString keyFromElem(const ResolvedTransformer::Ptr &t) { return t->transform->script; }
+QString keyFromElem(const ResolvedTransformer::Ptr &t) { return t->transform->sourceCode; }
 
 bool operator==(const SourceArtifact &sa1, const SourceArtifact &sa2)
 {
@@ -977,7 +977,7 @@ bool operator==(const ResolvedTransformer &t1, const ResolvedTransformer &t2)
     return modulesAreEqual(t1.module, t2.module)
             && t1.inputs.toSet() == t2.inputs.toSet()
             && sourceArtifactListsAreEqual(t1.outputs, t2.outputs)
-            && t1.transform->script == t2.transform->script
+            && t1.transform->sourceCode == t2.transform->sourceCode
             && t1.jsImports == t2.jsImports
             && t1.jsExtensions.toSet() == t2.jsExtensions.toSet();
 }
diff --git a/src/lib/language/language.h b/src/lib/language/language.h
index 999b5225a..643e420af 100644
--- a/src/lib/language/language.h
+++ b/src/lib/language/language.h
@@ -193,17 +193,17 @@ private:
     void store(PersistentPool &pool) const;
 };
 
-class PrepareScript: public PersistentObject
+class ScriptFunction : public PersistentObject
 {
 public:
-    static PrepareScriptPtr create() { return PrepareScriptPtr(new PrepareScript); }
+    static ScriptFunctionPtr create() { return ScriptFunctionPtr(new ScriptFunction); }
 
-    QString script;
+    QString sourceCode;
     CodeLocation location;
     mutable QScriptValue scriptFunction;    // cache
 
 private:
-    PrepareScript() {}
+    ScriptFunction() {}
 
     void load(PersistentPool &);
     void store(PersistentPool &) const;
@@ -247,7 +247,7 @@ public:
     ResolvedModuleConstPtr module;
     JsImports jsImports;
     QStringList jsExtensions;
-    PrepareScriptConstPtr script;
+    ScriptFunctionConstPtr script;
     FileTags inputs;
     FileTags auxiliaryInputs;
     FileTags usings;
@@ -278,7 +278,7 @@ public:
     ResolvedModuleConstPtr module;
     QStringList inputs;
     QList<SourceArtifactPtr> outputs;
-    PrepareScriptConstPtr transform;
+    ScriptFunctionConstPtr transform;
     JsImports jsImports;
     QStringList jsExtensions;
 
diff --git a/src/lib/language/projectresolver.cpp b/src/lib/language/projectresolver.cpp
index 2aa02b770..3fe9c3a3a 100644
--- a/src/lib/language/projectresolver.cpp
+++ b/src/lib/language/projectresolver.cpp
@@ -476,12 +476,12 @@ static QString sourceCodeAsFunction(const JSSourceValueConstPtr &value)
     }
 }
 
-PrepareScriptPtr ProjectResolver::scriptFunctionValue(Item *item, const QString &name) const
+ScriptFunctionPtr ProjectResolver::scriptFunctionValue(Item *item, const QString &name) const
 {
-    PrepareScriptPtr script = PrepareScript::create();
+    ScriptFunctionPtr script = ScriptFunction::create();
     JSSourceValuePtr value = item->sourceProperty(name);
     if (value) {
-        script->script = sourceCodeAsFunction(value);
+        script->sourceCode = sourceCodeAsFunction(value);
         script->location = value->location();
     }
     return script;
diff --git a/src/lib/language/projectresolver.h b/src/lib/language/projectresolver.h
index 00e8b0678..c5213b80a 100644
--- a/src/lib/language/projectresolver.h
+++ b/src/lib/language/projectresolver.h
@@ -84,7 +84,7 @@ private:
     void checkCancelation() const;
     QString verbatimValue(const ValueConstPtr &value) const;
     QString verbatimValue(Item *item, const QString &name) const;
-    PrepareScriptPtr scriptFunctionValue(Item *item, const QString &name) const;
+    ScriptFunctionPtr scriptFunctionValue(Item *item, const QString &name) const;
     void ignoreItem(Item *item, ProjectContext *projectContext);
     void resolveTopLevelProject(Item *item, ProjectContext *projectContext);
     void resolveProject(Item *item, ProjectContext *projectContext);