From c424570a850413749a05b2f564c0998f288f57f7 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Mon, 16 Aug 2010 19:59:21 +0200
Subject: [PATCH] Rename QmlModule::Location -> QmlModule::Path

---
 .../qmlprojectmanager/wizards/qmlstandaloneapp.cpp        | 8 ++++----
 src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.h  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.cpp b/src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.cpp
index 5bb3b555abf..87f8e8f2d9d 100644
--- a/src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.cpp
+++ b/src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.cpp
@@ -53,14 +53,14 @@ QmlModule::QmlModule(const QString &name, const QFileInfo &rootDir, const QFileI
     , qmlStandaloneApp(qmlStandaloneApp)
 {}
 
-QString QmlModule::path(Location location) const
+QString QmlModule::path(Path path) const
 {
-    switch (location) {
+    switch (path) {
         case Root: {
             return rootDir.canonicalFilePath();
         }
         case ContentDir: {
-                const QDir proFile(qmlStandaloneApp->path(QmlStandaloneApp::AppProfilePath));
+            const QDir proFile(qmlStandaloneApp->path(QmlStandaloneApp::AppProfilePath));
             return proFile.relativeFilePath(qmldir.canonicalPath());
         }
         case ContentBase: {
@@ -72,7 +72,7 @@ QString QmlModule::path(Location location) const
         }
         case DeployedContentBase: {
             const QString modulesDir = qmlStandaloneApp->path(QmlStandaloneApp::ModulesDir);
-            return modulesDir + QLatin1Char('/') + path(ContentBase);
+            return modulesDir + QLatin1Char('/') + this->path(ContentBase);
         }
         default: qFatal("QmlModule::path() needs more work");
     }
diff --git a/src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.h b/src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.h
index dee07790038..6d35291cac4 100644
--- a/src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.h
+++ b/src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.h
@@ -45,7 +45,7 @@ class QmlStandaloneApp;
 
 struct QmlModule
 {
-    enum Location {
+    enum Path {
         // Example: Module "com.foo.bar" in "c:/modules/".
         // "qmldir" file is in "c:/modules/com/foo/bar/".
         // Application .pro file is "c:/app/app.pro".
@@ -57,7 +57,7 @@ struct QmlModule
 
     QmlModule(const QString &name, const QFileInfo &rootDir, const QFileInfo &qmldir,
               bool isExternal, QmlStandaloneApp *qmlStandaloneApp);
-    QString path(Location location) const;
+    QString path(Path path) const;
     const QString name;             // "com.foo.bar"
     const QFileInfo rootDir;        // Location of "com/"
     const QFileInfo qmldir;         // 'qmldir' file.