feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix up for 88e7f935f4

Browse Source 
Project::generatedUiHeader was still taking QString instead of FileName

Change-Id: I582ddccd679a35fb2533ff1eb3d3010342cd4edd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Eike Ziller
2015-02-13 14:35:34 +01:00
parent 88e7f935f4
commit e5bbd86ab9
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/designer/codemodelhelpers.cpp
View File

@@ -53,7 +53,7 @@ static QString generatedHeaderOf(const QString &uiFileName)
{ {
if (const ProjectExplorer::Project *uiProject = if (const ProjectExplorer::Project *uiProject =
ProjectExplorer::SessionManager::projectForFile(Utils::FileName::fromString(uiFileName))) { ProjectExplorer::SessionManager::projectForFile(Utils::FileName::fromString(uiFileName))) {
return uiProject->generatedUiHeader(uiFileName); return uiProject->generatedUiHeader(Utils::FileName::fromString(uiFileName));
} }
return QString(); return QString();
} }

2
src/plugins/projectexplorer/project.cpp
View File

@@ -407,7 +407,7 @@ EditorConfiguration *Project::editorConfiguration() const
return &d->m_editorConfiguration; return &d->m_editorConfiguration;
} }
QString Project::generatedUiHeader(const QString & /* formFile */) const QString Project::generatedUiHeader(const Utils::FileName & /* formFile */) const
{ {
return QString(); return QString();
} }

2
src/plugins/projectexplorer/project.h
View File

@@ -112,7 +112,7 @@ public:
enum FilesMode { AllFiles, ExcludeGeneratedFiles }; enum FilesMode { AllFiles, ExcludeGeneratedFiles };
virtual QStringList files(FilesMode fileMode) const = 0; virtual QStringList files(FilesMode fileMode) const = 0;
// TODO: generalize to find source(s) of generated files? // 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); static QString makeUnique(const QString &preferredName, const QStringList &usedNames);