More "qml[standalone]app" -> "qtquickapp" renaming

2 files changed, 12 insertions, 12 deletions

diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
index a8bb6666704..ee634a3eb2b 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
@@ -125,7 +125,7 @@ bool QtQuickApp::setExternalModules(const QStringList &uris,
     foreach (const QFileInfo &importPath, importPaths) {
         if (!importPath.exists()) {
             m_error = QCoreApplication::translate(
-                        "Qt4ProjectManager::Internal::QmlStandaloneApp",
+                        "Qt4ProjectManager::Internal::QtQuickApp",
                         "The QML import path '%1' cannot be found.")
                       .arg(QDir::toNativeSeparators(importPath.filePath()));
             return false;
@@ -149,7 +149,7 @@ bool QtQuickApp::setExternalModules(const QStringList &uris,
         }
         if (modulesCount == m_modules.count()) { // no module was added
             m_error = QCoreApplication::translate(
-                      "Qt4ProjectManager::Internal::QmlStandaloneApp",
+                      "Qt4ProjectManager::Internal::QtQuickApp",
                       "The QML module '%1' cannot be found.").arg(uri);
             return false;
         }
@@ -185,14 +185,14 @@ QString QtQuickApp::pathExtended(int fileType) const
         case QmlDirProFileRelative:         return useExistingMainQml() ? appProFilePath.relativeFilePath(m_mainQmlFile.canonicalPath())
                                                 : QString(qmlSubDir).remove(qmlSubDir.length() - 1, 1);
         case ModulesDir:                    return QLatin1String("modules");
-        default:                            qFatal("QmlStandaloneApp::pathExtended() needs more work");
+        default:                            qFatal("QtQuickApp::pathExtended() needs more work");
     }
     return QString();
 }
 
 QString QtQuickApp::originsRoot() const
 {
-    return templatesRoot() + QLatin1String("qmlapp/");
+    return templatesRoot() + QLatin1String("qtquickapp/");
 }
 
 QString QtQuickApp::mainWindowClassName() const
@@ -281,7 +281,7 @@ bool QtQuickApp::addCppPlugin(const QString &qmldirLine, QmlModule *module)
             qmldirLine.split(QLatin1Char(' '), QString::SkipEmptyParts);
     if (qmldirLineElements.count() < 2) {
         m_error = QCoreApplication::translate(
-                      "Qt4ProjectManager::Internal::QmlStandaloneApp",
+                      "Qt4ProjectManager::Internal::QtQuickApp",
                       "Invalid '%1' entry in '%2' of module '%3'.")
                   .arg(qmldir_plugin).arg(qmldir).arg(module->uri);
         return false;
@@ -310,7 +310,7 @@ bool QtQuickApp::addCppPlugin(const QString &qmldirLine, QmlModule *module)
         foundProFile = proFile_guess4.canonicalFilePath();
     } else {
         m_error = QCoreApplication::translate(
-                    "Qt4ProjectManager::Internal::QmlStandaloneApp",
+                    "Qt4ProjectManager::Internal::QtQuickApp",
                     "No .pro file for plugin '%1' cannot be found.").arg(name);
         return false;
     }
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
index 1499d39176a..52c146fd142 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
@@ -51,19 +51,19 @@
 namespace Qt4ProjectManager {
 namespace Internal {
 
-class QmlStandaloneAppWizardDialog : public AbstractMobileAppWizardDialog
+class QtQuickAppWizardDialog : public AbstractMobileAppWizardDialog
 {
     Q_OBJECT
 
 public:
-    explicit QmlStandaloneAppWizardDialog(QWidget *parent = 0);
+    explicit QtQuickAppWizardDialog(QWidget *parent = 0);
 
 private:
     class QtQuickAppWizardSourcesPage *m_qmlSourcesPage;
     friend class QtQuickAppWizard;
 };
 
-QmlStandaloneAppWizardDialog::QmlStandaloneAppWizardDialog(QWidget *parent)
+QtQuickAppWizardDialog::QtQuickAppWizardDialog(QWidget *parent)
     : AbstractMobileAppWizardDialog(parent)
     , m_qmlSourcesPage(0)
 {
@@ -78,7 +78,7 @@ QmlStandaloneAppWizardDialog::QmlStandaloneAppWizardDialog(QWidget *parent)
 class QtQuickAppWizardPrivate
 {
     class QtQuickApp *app;
-    class QmlStandaloneAppWizardDialog *wizardDialog;
+    class QtQuickAppWizardDialog *wizardDialog;
     friend class QtQuickAppWizard;
 };
 
@@ -116,7 +116,7 @@ Core::BaseFileWizardParameters QtQuickAppWizard::parameters()
 
 AbstractMobileAppWizardDialog *QtQuickAppWizard::createWizardDialogInternal(QWidget *parent) const
 {
-    m_d->wizardDialog = new QmlStandaloneAppWizardDialog(parent);
+    m_d->wizardDialog = new QtQuickAppWizardDialog(parent);
     return m_d->wizardDialog;
 }
 
@@ -143,7 +143,7 @@ void QtQuickAppWizard::prepareGenerateFiles(const QWizard *w,
     QString *errorMessage) const
 {
     Q_UNUSED(errorMessage)
-    const QmlStandaloneAppWizardDialog *wizard = qobject_cast<const QmlStandaloneAppWizardDialog*>(w);
+    const QtQuickAppWizardDialog *wizard = qobject_cast<const QtQuickAppWizardDialog*>(w);
     const QString mainQmlFile = wizard->m_qmlSourcesPage->mainQmlFile();
     m_d->app->setMainQmlFile(mainQmlFile);
 }