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

Rename IFile->IDocument and FileManager->DocumentManager

Browse Source 
And adapt the other API respectively.

Change-Id: I1e04e555409be09242db6890f9e013396f83aeed
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Eike Ziller
2012-02-14 16:43:51 +01:00
parent 266da3568d
commit d66acb51d0
216 changed files with 1201 additions and 1207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/projectexplorer/session.cpp
View File

@@ -41,7 +41,7 @@
#include <coreplugin/icore.h>
#include <coreplugin/imode.h>
#include <coreplugin/filemanager.h>
#include <coreplugin/documentmanager.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/coreconstants.h>
@@ -172,7 +172,7 @@ bool SessionManager::recursiveDependencyCheck(const QString &newDep, const QStri
QList<Project *> SessionManager::dependencies(const Project *project) const
{
const QString &proName = project->file()->fileName();
const QString &proName = project->document()->fileName();
const QStringList &proDeps = m_depMap.value(proName);
QList<Project *> projects;
@@ -186,8 +186,8 @@ QList<Project *> SessionManager::dependencies(const Project *project) const
bool SessionManager::hasDependency(const Project *project, const Project *depProject) const
{
const QString &proName = project->file()->fileName();
const QString &depName = depProject->file()->fileName();
const QString &proName = project->document()->fileName();
const QString &depName = depProject->document()->fileName();
const QStringList &proDeps = m_depMap.value(proName);
return proDeps.contains(depName);
@@ -195,16 +195,16 @@ bool SessionManager::hasDependency(const Project *project, const Project *depPro
bool SessionManager::canAddDependency(const Project *project, const Project *depProject) const
{
const QString &newDep = project->file()->fileName();
const QString &checkDep = depProject->file()->fileName();
const QString &newDep = project->document()->fileName();
const QString &checkDep = depProject->document()->fileName();
return recursiveDependencyCheck(newDep, checkDep);
}
bool SessionManager::addDependency(Project *project, Project *depProject)
{
const QString &proName = project->file()->fileName();
const QString &depName = depProject->file()->fileName();
const QString &proName = project->document()->fileName();
const QString &depName = depProject->document()->fileName();
// check if this dependency is valid
if (!recursiveDependencyCheck(proName, depName))
@@ -222,8 +222,8 @@ bool SessionManager::addDependency(Project *project, Project *depProject)
void SessionManager::removeDependency(Project *project, Project *depProject)
{
const QString &proName = project->file()->fileName();
const QString &depName = depProject->file()->fileName();
const QString &proName = project->document()->fileName();
const QString &depName = depProject->document()->fileName();
QStringList proDeps = m_depMap.value(proName);
proDeps.removeAll(depName);
@@ -313,12 +313,12 @@ bool SessionManager::save()
// save the startup project
if (m_startupProject) {
writer.saveValue(QLatin1String("StartupProject"), m_startupProject->file()->fileName());
writer.saveValue(QLatin1String("StartupProject"), m_startupProject->document()->fileName());
}
QStringList projectFiles;
foreach (Project *pro, m_projects)
projectFiles << pro->file()->fileName();
projectFiles << pro->document()->fileName();
// Restore infromation on projects that failed to load:
projectFiles.append(m_failedProjects);
@@ -405,7 +405,7 @@ QStringList SessionManager::dependenciesOrder() const
// copy the map to a temporary list
foreach (Project *pro, projects()) {
const QString &proName = pro->file()->fileName();
const QString &proName = pro->document()->fileName();
unordered << QPair<QString, QStringList>
(proName, m_depMap.value(proName));
}
@@ -438,14 +438,14 @@ QList<Project *> SessionManager::projectOrder(Project *project) const
QStringList pros;
if (project) {
pros = dependencies(project->file()->fileName());
pros = dependencies(project->document()->fileName());
} else {
pros = dependenciesOrder();
}
foreach (const QString &proFile, pros) {
foreach (Project *pro, projects()) {
if (pro->file()->fileName() == proFile) {
if (pro->document()->fileName() == proFile) {
result << pro;
break;
}
@@ -566,7 +566,7 @@ void SessionManager::removeProjects(QList<Project *> remove)
QSet<QString> projectFiles;
foreach (Project *pro, projects()) {
if (!remove.contains(pro))
projectFiles.insert(pro->file()->fileName());
projectFiles.insert(pro->document()->fileName());
}
QSet<QString>::const_iterator i = projectFiles.begin();
@@ -758,7 +758,7 @@ void SessionManager::restoreStartupProject(const Utils::PersistentSettingsReader
if (!startupProject.isEmpty()) {
const QString startupProjectPath = startupProject;
foreach (Project *pro, m_projects) {
if (QDir::cleanPath(pro->file()->fileName()) == startupProjectPath) {
if (QDir::cleanPath(pro->document()->fileName()) == startupProjectPath) {
setStartupProject(m_startupProject);
break;
}
@@ -795,7 +795,7 @@ void SessionManager::restoreProjects(const QStringList &fileList)
if (!errors.isEmpty())
QMessageBox::critical(Core::ICore::mainWindow(), tr("Failed to open project"), errors);
foreach (Project *p, projects)
m_failedProjects.removeAll(p->file()->fileName());
m_failedProjects.removeAll(p->document()->fileName());
}
}