1 files changed, 22 insertions, 21 deletions

diff --git a/src/plugins/qbsprojectmanager/qbsnodes.cpp b/src/plugins/qbsprojectmanager/qbsnodes.cpp
index a5400f05ae..6732b72548 100644
--- a/src/plugins/qbsprojectmanager/qbsnodes.cpp
+++ b/src/plugins/qbsprojectmanager/qbsnodes.cpp
@@ -90,7 +90,7 @@ QIcon QbsProductNode::m_productIcon;
 static QbsProjectNode *parentQbsProjectNode(ProjectExplorer::Node *node)
 {
     for (ProjectExplorer::FolderNode *pn = node->projectNode(); pn; pn = pn->parentFolderNode()) {
-        QbsProjectNode *prjNode = qobject_cast<QbsProjectNode *>(pn);
+        QbsProjectNode *prjNode = dynamic_cast<QbsProjectNode *>(pn);
         if (prjNode)
             return prjNode;
     }
@@ -100,7 +100,7 @@ static QbsProjectNode *parentQbsProjectNode(ProjectExplorer::Node *node)
 static QbsProductNode *parentQbsProductNode(ProjectExplorer::Node *node)
 {
     for (; node; node = node->parentFolderNode()) {
-        QbsProductNode *prdNode = qobject_cast<QbsProductNode *>(node);
+        QbsProductNode *prdNode = dynamic_cast<QbsProductNode *>(node);
         if (prdNode)
             return prdNode;
     }
@@ -353,7 +353,7 @@ QbsGroupNode::QbsGroupNode(const qbs::GroupData &grp, const QString &productPath
 
     setIcon(m_groupIcon);
 
-    QbsFileNode *idx = new QbsFileNode(grp.location().fileName(),
+    QbsFileNode *idx = new QbsFileNode(grp.location().filePath(),
                                        ProjectExplorer::ProjectFileType, false,
                                        grp.location().line());
     addFileNodes(QList<ProjectExplorer::FileNode *>() << idx);
@@ -447,17 +447,17 @@ void QbsGroupNode::updateQbsGroupData(const qbs::GroupData &grp, const QString &
     m_productPath = productPath;
     m_qbsGroupData = grp;
 
-    setPath(grp.location().fileName());
+    setPath(grp.location().filePath());
     setDisplayName(grp.name());
 
     QbsFileNode *idx = 0;
     foreach (ProjectExplorer::FileNode *fn, fileNodes()) {
-        idx = qobject_cast<QbsFileNode *>(fn);
+        idx = dynamic_cast<QbsFileNode *>(fn);
         if (idx)
             break;
     }
     QTC_ASSERT(idx, return);
-    idx->setPathAndLine(grp.location().fileName(), grp.location().line());
+    idx->setPathAndLine(grp.location().filePath(), grp.location().line());
 
     setupFiles(this, grp.allFilePaths(), productPath, updateExisting);
 
@@ -498,7 +498,7 @@ void QbsGroupNode::setupFolder(ProjectExplorer::FolderNode *root,
 
     QList<ProjectExplorer::FileNode *> filesToRemove;
     foreach (ProjectExplorer::FileNode *fn, root->fileNodes()) {
-        if (!qobject_cast<QbsFileNode *>(fn))
+        if (!dynamic_cast<QbsFileNode *>(fn))
             filesToRemove << fn;
     }
     QList<ProjectExplorer::FileNode *> filesToAdd;
@@ -565,14 +565,14 @@ void QbsGroupNode::setupFolder(ProjectExplorer::FolderNode *root,
 // --------------------------------------------------------------------
 
 QbsProductNode::QbsProductNode(const qbs::Project &project, const qbs::ProductData &prd) :
-    QbsBaseProjectNode(prd.location().fileName())
+    QbsBaseProjectNode(prd.location().filePath())
 {
     if (m_productIcon.isNull())
         m_productIcon = generateIcon(QString::fromLatin1(Constants::QBS_PRODUCT_OVERLAY_ICON));
 
     setIcon(m_productIcon);
 
-    ProjectExplorer::FileNode *idx = new QbsFileNode(prd.location().fileName(),
+    ProjectExplorer::FileNode *idx = new QbsFileNode(prd.location().filePath(),
                                                      ProjectExplorer::ProjectFileType, false,
                                                      prd.location().line());
     addFileNodes(QList<ProjectExplorer::FileNode *>() << idx);
@@ -658,18 +658,18 @@ void QbsProductNode::setQbsProductData(const qbs::Project &project, const qbs::P
     bool updateExisting = productWasEnabled != productIsEnabled;
 
     setDisplayName(QbsProject::productDisplayName(project, prd));
-    setPath(prd.location().fileName());
-    const QString &productPath = QFileInfo(prd.location().fileName()).absolutePath();
+    setPath(prd.location().filePath());
+    const QString &productPath = QFileInfo(prd.location().filePath()).absolutePath();
 
     // Find the QbsFileNode we added earlier:
     QbsFileNode *idx = 0;
     foreach (ProjectExplorer::FileNode *fn, fileNodes()) {
-        idx = qobject_cast<QbsFileNode *>(fn);
+        idx = dynamic_cast<QbsFileNode *>(fn);
         if (idx)
             break;
     }
     QTC_ASSERT(idx, return);
-    idx->setPathAndLine(prd.location().fileName(), prd.location().line());
+    idx->setPathAndLine(prd.location().filePath(), prd.location().line());
 
     QList<ProjectExplorer::ProjectNode *> toAdd;
     QList<ProjectExplorer::ProjectNode *> toRemove = subProjectNodes();
@@ -701,7 +701,7 @@ void QbsProductNode::setQbsProductData(const qbs::Project &project, const qbs::P
 QList<ProjectExplorer::RunConfiguration *> QbsProductNode::runConfigurations() const
 {
     QList<ProjectExplorer::RunConfiguration *> result;
-    QbsProjectNode *pn = qobject_cast<QbsProjectNode *>(projectNode());
+    QbsProjectNode *pn = dynamic_cast<QbsProjectNode *>(projectNode());
     if (!isEnabled() || !pn || !pn->qbsProject().isValid()
             || pn->qbsProject().targetExecutable(m_qbsProductData, qbs::InstallOptions()).isEmpty()) {
         return result;
@@ -751,7 +751,7 @@ void QbsProjectNode::update(const qbs::Project &qbsProject, const qbs::ProjectDa
     foreach (const qbs::ProjectData &subData, prjData.subProjects()) {
         QbsProjectNode *qn = findProjectNode(subData.name());
         if (!qn) {
-            QbsProjectNode *subProject = new QbsProjectNode(subData.location().fileName());
+            QbsProjectNode *subProject = new QbsProjectNode(subData.location().filePath());
             subProject->update(qbsProject, subData);
             toAdd << subProject;
         } else {
@@ -808,7 +808,7 @@ void QbsProjectNode::ctor()
 QbsProductNode *QbsProjectNode::findProductNode(const QString &uniqueName)
 {
     foreach (ProjectExplorer::ProjectNode *n, subProjectNodes()) {
-        QbsProductNode *qn = qobject_cast<QbsProductNode *>(n);
+        QbsProductNode *qn = dynamic_cast<QbsProductNode *>(n);
         if (qn && QbsProject::uniqueProductName(qn->qbsProductData()) == uniqueName)
             return qn;
     }
@@ -818,7 +818,7 @@ QbsProductNode *QbsProjectNode::findProductNode(const QString &uniqueName)
 QbsProjectNode *QbsProjectNode::findProjectNode(const QString &name)
 {
     foreach (ProjectExplorer::ProjectNode *n, subProjectNodes()) {
-        QbsProjectNode *qn = qobject_cast<QbsProjectNode *>(n);
+        QbsProjectNode *qn = dynamic_cast<QbsProjectNode *>(n);
         if (qn && qn->qbsProjectData().name() == name)
             return qn;
     }
@@ -833,7 +833,8 @@ QbsRootProjectNode::QbsRootProjectNode(QbsProject *project) :
     QbsProjectNode(project->projectFilePath().toString()),
     m_project(project),
     m_buildSystemFiles(new ProjectExplorer::FolderNode(project->projectDirectory().toString(),
-                                                       ProjectExplorer::FolderNodeType, tr("Qbs files")))
+                                                       ProjectExplorer::FolderNodeType,
+                                                       QCoreApplication::translate("QbsRootProjectNode", "Qbs files")))
 {
     addFolderNodes(QList<FolderNode *>() << m_buildSystemFiles);
 }
@@ -856,13 +857,13 @@ void QbsRootProjectNode::update()
 static QSet<QString> referencedBuildSystemFiles(const qbs::ProjectData &data)
 {
     QSet<QString> result;
-    result.insert(data.location().fileName());
+    result.insert(data.location().filePath());
     foreach (const qbs::ProjectData &subProject, data.subProjects())
         result.unite(referencedBuildSystemFiles(subProject));
     foreach (const qbs::ProductData &product, data.products()) {
-        result.insert(product.location().fileName());
+        result.insert(product.location().filePath());
         foreach (const qbs::GroupData &group, product.groups())
-            result.insert(group.location().fileName());
+            result.insert(group.location().filePath());
     }
 
     return result;