From e5bbd86ab9c5e9ba664037f169cb6d801fa6ba30 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 13 Feb 2015 14:35:34 +0100 Subject: [PATCH] Fix up for 88e7f935f4adbccaf0ffe7e03a3adec8143cf614 Project::generatedUiHeader was still taking QString instead of FileName Change-Id: I582ddccd679a35fb2533ff1eb3d3010342cd4edd Reviewed-by: Orgad Shaneh --- src/plugins/designer/codemodelhelpers.cpp | 2 +- src/plugins/projectexplorer/project.cpp | 2 +- src/plugins/projectexplorer/project.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/designer/codemodelhelpers.cpp b/src/plugins/designer/codemodelhelpers.cpp index b1aced1fbb5..9b0bec8dccd 100644 --- a/src/plugins/designer/codemodelhelpers.cpp +++ b/src/plugins/designer/codemodelhelpers.cpp @@ -53,7 +53,7 @@ static QString generatedHeaderOf(const QString &uiFileName) { if (const ProjectExplorer::Project *uiProject = ProjectExplorer::SessionManager::projectForFile(Utils::FileName::fromString(uiFileName))) { - return uiProject->generatedUiHeader(uiFileName); + return uiProject->generatedUiHeader(Utils::FileName::fromString(uiFileName)); } return QString(); } diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index 2482e059ebf..6d57ccd9bf1 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -407,7 +407,7 @@ EditorConfiguration *Project::editorConfiguration() const return &d->m_editorConfiguration; } -QString Project::generatedUiHeader(const QString & /* formFile */) const +QString Project::generatedUiHeader(const Utils::FileName & /* formFile */) const { return QString(); } diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h index fbbb96ad35e..6ebc8008538 100644 --- a/src/plugins/projectexplorer/project.h +++ b/src/plugins/projectexplorer/project.h @@ -112,7 +112,7 @@ public: enum FilesMode { AllFiles, ExcludeGeneratedFiles }; virtual QStringList files(FilesMode fileMode) const = 0; // TODO: generalize to find source(s) of generated files? - virtual QString generatedUiHeader(const QString &formFile) const; + virtual QString generatedUiHeader(const Utils::FileName &formFile) const; static QString makeUnique(const QString &preferredName, const QStringList &usedNames);