diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2014-12-21 21:54:30 +0200 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2015-01-12 10:23:37 +0100 |
commit | c6a983d27179ebd26e692918e58d44aa77fc7f8a (patch) | |
tree | 6ef23b30a2e6c4a29c14acbb824e38bae026acdb /src/plugins/cmakeprojectmanager | |
parent | 9c1b28fec265054ba4a9c13093ebcfc0f5b4c723 (diff) | |
download | qt-creator-c6a983d27179ebd26e692918e58d44aa77fc7f8a.tar.gz |
Core: Use FileName for file path in IDocument
Change-Id: I85f7398aee59d0d36f0e5c3bf88ff3c96002e394
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/cmakeprojectmanager')
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeeditor.cpp | 10 | ||||
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeproject.cpp | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp index fa19445743..3acf674867 100644 --- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp @@ -85,7 +85,7 @@ void CMakeEditor::finalizeInitialization() info.setCustomButtonInfo(tr("Build now"), [document]() { foreach (Project *p, SessionManager::projects()) { if (CMakeProject *cmakeProject = qobject_cast<CMakeProject *>(p)) { - if (cmakeProject->isProjectFile(document->filePath())) { + if (cmakeProject->isProjectFile(document->filePath().toString())) { ProjectExplorerPlugin::buildProject(cmakeProject); break; } @@ -212,7 +212,7 @@ CMakeEditorWidget::Link CMakeEditorWidget::findLinkAt(const QTextCursor &cursor, // TODO: Resolve variables - QDir dir(QFileInfo(textDocument()->filePath()).absolutePath()); + QDir dir(textDocument()->filePath().toFileInfo().absolutePath()); QString fileName = dir.filePath(buffer); QFileInfo fi(fileName); if (fi.exists()) { @@ -252,14 +252,12 @@ CMakeDocument::CMakeDocument() QString CMakeDocument::defaultPath() const { - QFileInfo fi(filePath()); - return fi.absolutePath(); + return filePath().toFileInfo().absolutePath(); } QString CMakeDocument::suggestedFileName() const { - QFileInfo fi(filePath()); - return fi.fileName(); + return filePath().toFileInfo().fileName(); } // diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 6a87c17da7..cd23330aa5 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -233,7 +233,7 @@ bool CMakeProject::parseCMakeLists() CMakeBuildConfiguration *activeBC = static_cast<CMakeBuildConfiguration *>(activeTarget()->activeBuildConfiguration()); foreach (Core::IDocument *document, Core::DocumentModel::openedDocuments()) - if (isProjectFile(document->filePath())) + if (isProjectFile(document->filePath().toString())) document->infoBar()->removeInfo("CMakeEditor.RunCMake"); // Find cbp file @@ -741,7 +741,7 @@ CMakeFile::CMakeFile(CMakeProject *parent, QString fileName) { setId("Cmake.ProjectFile"); setMimeType(QLatin1String(Constants::CMAKEPROJECTMIMETYPE)); - setFilePath(fileName); + setFilePath(Utils::FileName::fromString(fileName)); } bool CMakeFile::save(QString *errorString, const QString &fileName, bool autoSave) |