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

Project: Use Utils::FileName as return type for projectDirectory(...)

Browse Source 
Change-Id: I3ea10aa204b1ea41702edab09884b416cd6d9e06
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2014-05-02 12:53:36 +02:00
parent 0814cc112a
commit dc61b989ac
59 changed files with 94 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/valgrind/callgrindtool.cpp
View File

@@ -401,7 +401,7 @@ void CallgrindToolPrivate::handleFilterProjectCosts()
QTC_ASSERT(pro, return);
if (m_filterProjectCosts->isChecked()) {
const QString projectDir = pro->projectDirectory();
const QString projectDir = pro->projectDirectory().toString();
m_proxyModel->setFilterBaseDir(projectDir);
} else {
m_proxyModel->setFilterBaseDir(QString());

2
src/plugins/valgrind/memcheckerrorview.cpp
View File

@@ -188,7 +188,7 @@ static QString relativeToPath()
// The project for which we insert the snippet.
const ProjectExplorer::Project *project = ProjectExplorer::SessionManager::startupProject();
QString relativeTo(project ? project->projectDirectory() : QDir::homePath());
QString relativeTo(project ? project->projectDirectory().toString() : QDir::homePath());
if (!relativeTo.endsWith(QDir::separator()))
relativeTo.append(QDir::separator());

4
src/plugins/valgrind/memchecktool.cpp
View File

@@ -143,7 +143,7 @@ bool MemcheckErrorFilterProxyModel::filterAcceptsRow(int sourceRow, const QModel
// assume this error was created by an external library
QSet<QString> validFolders;
foreach (Project *project, SessionManager::projects()) {
validFolders << project->projectDirectory();
validFolders << project->projectDirectory().toString();
foreach (Target *target, project->targets()) {
foreach (const ProjectExplorer::DeployableFile &file,
target->deploymentData().allFiles()) {
@@ -463,7 +463,7 @@ void MemcheckTool::engineStarting(const AnalyzerRunControl *engine)
QString dir;
if (RunConfiguration *rc = engine->runConfiguration())
dir = rc->target()->project()->projectDirectory() + QDir::separator();
dir = rc->target()->project()->projectDirectory().toString() + QDir::separator();
const MemcheckRunControl *mEngine = dynamic_cast<const MemcheckRunControl *>(engine);
QTC_ASSERT(mEngine, return);

2
src/plugins/valgrind/suppressiondialog.cpp
View File

@@ -214,7 +214,7 @@ void SuppressionDialog::accept()
// Add file to project if there is a project containing this file on the file system.
if (!ProjectExplorer::SessionManager::projectForFile(path)) {
foreach (ProjectExplorer::Project *p, ProjectExplorer::SessionManager::projects()) {
if (path.startsWith(p->projectDirectory())) {
if (path.startsWith(p->projectDirectory().toString())) {
p->rootProjectNode()->addFiles(QStringList() << path);
break;
}