From 5cc6b60b2e62ba494f04c7634e41d3e50edbee26 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Fri, 20 Aug 2010 19:54:40 +0200
Subject: [PATCH] Renamed some occurrences of "Module name" to "uri". For
 consistency.

---
 .../wizards/qmlstandaloneapp.cpp              | 20 +++++++++----------
 .../wizards/qmlstandaloneapp.h                |  8 +++-----
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.cpp b/src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.cpp
index e56d7832b5e..cb9288148dc 100644
--- a/src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.cpp
+++ b/src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.cpp
@@ -44,9 +44,9 @@ namespace Internal {
 const QLatin1String qmldir("qmldir");
 const QLatin1String qmldir_plugin("plugin");
 
-QmlModule::QmlModule(const QString &name, const QFileInfo &rootDir, const QFileInfo &qmldir,
+QmlModule::QmlModule(const QString &uri, const QFileInfo &rootDir, const QFileInfo &qmldir,
                      bool isExternal, QmlStandaloneApp *qmlStandaloneApp)
-    : name(name)
+    : uri(uri)
     , rootDir(rootDir)
     , qmldir(qmldir)
     , isExternal(isExternal)
@@ -186,7 +186,7 @@ bool QmlStandaloneApp::networkEnabled() const
     return m_networkEnabled;
 }
 
-bool QmlStandaloneApp::setExternalModules(const QStringList &moduleNames,
+bool QmlStandaloneApp::setExternalModules(const QStringList &uris,
                                           const QStringList &importPaths)
 {
     clearModulesAndPlugins();
@@ -200,22 +200,22 @@ bool QmlStandaloneApp::setExternalModules(const QStringList &moduleNames,
             m_importPaths.append(importPath.canonicalFilePath());
         }
     }
-    foreach (const QString &moduleName, moduleNames) {
-        QString modulePath = moduleName;
-        modulePath.replace(QLatin1Char('.'), QLatin1Char('/'));
+    foreach (const QString &uri, uris) {
+        QString uriPath = uri;
+        uriPath.replace(QLatin1Char('.'), QLatin1Char('/'));
         const int modulesCount = m_modules.count();
         foreach (const QFileInfo &importPath, m_importPaths) {
             const QFileInfo qmlDirFile(
                     importPath.absoluteFilePath() + QLatin1Char('/')
-                    + modulePath + QLatin1Char('/') + qmldir);
+                    + uriPath + QLatin1Char('/') + qmldir);
             if (qmlDirFile.exists()) {
-                if (!addExternalModule(moduleName, importPath, qmlDirFile))
+                if (!addExternalModule(uri, importPath, qmlDirFile))
                     return false;
                 break;
             }
         }
         if (modulesCount == m_modules.count()) { // no module was added
-            m_error = tr("The Qml module '%1' cannot be found.").arg(moduleName);
+            m_error = tr("The Qml module '%1' cannot be found.").arg(uri);
             return false;
         }
     }
@@ -410,7 +410,7 @@ bool QmlStandaloneApp::addCppPlugin(const QString &qmldirLine, QmlModule *module
             qmldirLine.split(QLatin1Char(' '), QString::SkipEmptyParts);
     if (qmldirLineElements.count() < 2) {
         m_error = tr("Invalid '%1' entry in '%2' of module '%3'.")
-                  .arg(qmldir_plugin).arg(qmldir).arg(module->name);
+                  .arg(qmldir_plugin).arg(qmldir).arg(module->uri);
         return false;
     }
     const QString name = qmldirLineElements.at(1);
diff --git a/src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.h b/src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.h
index 6d35291cac4..85ff0f96650 100644
--- a/src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.h
+++ b/src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.h
@@ -58,7 +58,7 @@ struct QmlModule
     QmlModule(const QString &name, const QFileInfo &rootDir, const QFileInfo &qmldir,
               bool isExternal, QmlStandaloneApp *qmlStandaloneApp);
     QString path(Path path) const;
-    const QString name;             // "com.foo.bar"
+    const QString uri;              // "com.foo.bar"
     const QFileInfo rootDir;        // Location of "com/"
     const QFileInfo qmldir;         // 'qmldir' file.
     const bool isExternal;          // Either external or inside a source paths
@@ -130,9 +130,7 @@ public:
     bool loadDummyData() const;
     void setNetworkEnabled(bool enabled);
     bool networkEnabled() const;
-
-    bool setExternalModules(const QStringList &moduleNames,
-                            const QStringList &importPaths);
+    bool setExternalModules(const QStringList &uris, const QStringList &importPaths);
 
     static QString symbianUidForPath(const QString &path);
 #ifndef CREATORLESSTEST
@@ -149,7 +147,7 @@ private:
     QByteArray generateMainCpp(const QString *errorMessage) const;
     QByteArray generateProFile(const QString *errorMessage) const;
     static QString templatesRoot();
-    bool addExternalModule(const QString &name, const QFileInfo &dir,
+    bool addExternalModule(const QString &uri, const QFileInfo &dir,
                            const QFileInfo &contentDir);
     bool addCppPlugins(QmlModule *module);
     bool addCppPlugin(const QString &qmldirLine, QmlModule *module);