diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-07-04 13:30:26 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-07-09 13:51:42 +0200 |
| commit | dd43d9908f3de19e455d5503b311bb3c1ae7b9c4 (patch) | |
| tree | df542f655c2380b2026d49a862c727cb0f1d86a0 /src/plugins/genericprojectmanager | |
| parent | cee160225378acbc7d29665bd69f6f793ef78fb9 (diff) | |
| download | qt-creator-dd43d9908f3de19e455d5503b311bb3c1ae7b9c4.tar.gz | |
Rename IDocument::fileName --> filePath
That is what it actually is, wrt how Qt API calls it.
Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/genericprojectmanager')
3 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 2f36899ba7..e231808957 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -457,7 +457,7 @@ GenericProjectFile::GenericProjectFile(GenericProject *parent, QString fileName, m_project(parent), m_options(options) { - setFileName(fileName); + setFilePath(fileName); } bool GenericProjectFile::save(QString *, const QString &, bool) diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.cpp b/src/plugins/genericprojectmanager/genericprojectnodes.cpp index 687658c326..7bd6773f53 100644 --- a/src/plugins/genericprojectmanager/genericprojectnodes.cpp +++ b/src/plugins/genericprojectmanager/genericprojectnodes.cpp @@ -42,9 +42,9 @@ namespace GenericProjectManager { namespace Internal { GenericProjectNode::GenericProjectNode(GenericProject *project, Core::IDocument *projectFile) - : ProjectNode(projectFile->fileName()), m_project(project), m_projectFile(projectFile) + : ProjectNode(projectFile->filePath()), m_project(project), m_projectFile(projectFile) { - setDisplayName(QFileInfo(projectFile->fileName()).completeBaseName()); + setDisplayName(QFileInfo(projectFile->filePath()).completeBaseName()); } Core::IDocument *GenericProjectNode::projectFile() const @@ -54,7 +54,7 @@ Core::IDocument *GenericProjectNode::projectFile() const QString GenericProjectNode::projectFilePath() const { - return m_projectFile->fileName(); + return m_projectFile->filePath(); } QHash<QString, QStringList> sortFilesIntoPaths(const QString &base, const QSet<QString> files) diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.cpp b/src/plugins/genericprojectmanager/genericprojectplugin.cpp index 837fffece3..2b8bb84e8e 100644 --- a/src/plugins/genericprojectmanager/genericprojectplugin.cpp +++ b/src/plugins/genericprojectmanager/genericprojectplugin.cpp @@ -117,7 +117,7 @@ void GenericProjectPlugin::updateContextMenu(ProjectExplorer::Project *project, void GenericProjectPlugin::editFiles() { GenericProject *genericProject = static_cast<GenericProject *>(m_contextMenuProject); - SelectableFilesDialog sfd(QFileInfo(genericProject->document()->fileName()).path(), genericProject->files(), + SelectableFilesDialog sfd(QFileInfo(genericProject->document()->filePath()).path(), genericProject->files(), Core::ICore::mainWindow()); if (sfd.exec() == QDialog::Accepted) genericProject->setFiles(sfd.selectedFiles()); |