diff options
Diffstat (limited to 'src/plugins/autotoolsprojectmanager')
7 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsmanager.cpp b/src/plugins/autotoolsprojectmanager/autotoolsmanager.cpp index 29149be2e9..e185fc3a60 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsmanager.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsmanager.cpp @@ -37,7 +37,7 @@ #include "autotoolsprojectconstants.h" #include <coreplugin/icore.h> -#include <coreplugin/ifile.h> +#include <coreplugin/idocument.h> #include <coreplugin/messagemanager.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorer.h> @@ -62,7 +62,7 @@ Project *AutotoolsManager::openProject(const QString &fileName, QString *errorSt // Check whether the project is already open or not. ProjectExplorerPlugin *projectExplorer = ProjectExplorerPlugin::instance(); foreach (Project *pi, projectExplorer->session()->projects()) { - if (canonicalFilePath == pi->file()->fileName()) { + if (canonicalFilePath == pi->document()->fileName()) { *errorString = tr("Failed opening project '%1': Project already open") .arg(QDir::toNativeSeparators(canonicalFilePath)); return 0; diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp index e6fd4e7d3d..aede667f7a 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp @@ -133,7 +133,7 @@ QString AutotoolsProject::id() const return QLatin1String(Constants::AUTOTOOLS_PROJECT_ID); } -Core::IFile *AutotoolsProject::file() const +Core::IDocument *AutotoolsProject::document() const { return m_file; } diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.h b/src/plugins/autotoolsprojectmanager/autotoolsproject.h index 0ec30b4d91..418f00a255 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsproject.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.h @@ -78,7 +78,7 @@ public: QString displayName() const; QString id() const; - Core::IFile *file() const; + Core::IDocument *document() const; ProjectExplorer::IProjectManager *projectManager() const; AutotoolsTarget *activeTarget() const; QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets(); diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp index f528f7438f..80cf6767be 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp @@ -40,7 +40,7 @@ using namespace AutotoolsProjectManager; using namespace AutotoolsProjectManager::Internal; AutotoolsProjectFile::AutotoolsProjectFile(AutotoolsProject *project, const QString &fileName) : - Core::IFile(project), + Core::IDocument(project), m_project(project), m_fileName(fileName) { diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h index 9f7750a11c..5ed740d5eb 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.h @@ -35,7 +35,7 @@ #ifndef AUTOTOOLSPROJECTFILE_H #define AUTOTOOLSPROJECTFILE_H -#include <coreplugin/ifile.h> +#include <coreplugin/idocument.h> namespace AutotoolsProjectManager { namespace Internal { @@ -43,7 +43,7 @@ namespace Internal { class AutotoolsProject; /** - * @brief Implementation of the Core::IFile interface. + * @brief Implementation of the Core::IDocument interface. * * Is used in AutotoolsProject and describes the root * of a project. In the context of autotools the implementation @@ -52,7 +52,7 @@ class AutotoolsProject; * * @see AutotoolsProject */ -class AutotoolsProjectFile : public Core::IFile +class AutotoolsProjectFile : public Core::IDocument { Q_OBJECT diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp index e926c991f0..3234afbad4 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp @@ -39,7 +39,7 @@ using namespace AutotoolsProjectManager; using namespace AutotoolsProjectManager::Internal; using namespace ProjectExplorer; -AutotoolsProjectNode::AutotoolsProjectNode(AutotoolsProject *project, Core::IFile *projectFile) : +AutotoolsProjectNode::AutotoolsProjectNode(AutotoolsProject *project, Core::IDocument *projectFile) : ProjectNode(projectFile->fileName()), m_project(project), m_projectFile(projectFile) diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h index e0963f77a8..433e662eac 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h @@ -36,7 +36,7 @@ #define AUTOTOOLSPROJECTNODE_H #include <projectexplorer/projectnodes.h> -#include <coreplugin/ifile.h> +#include <coreplugin/idocument.h> namespace AutotoolsProjectManager { namespace Internal { @@ -57,7 +57,7 @@ class AutotoolsProjectNode : public ProjectExplorer::ProjectNode Q_OBJECT public: - AutotoolsProjectNode(AutotoolsProject *project, Core::IFile *projectFile); + AutotoolsProjectNode(AutotoolsProject *project, Core::IDocument *projectFile); bool hasBuildTargets() const; QList<ProjectExplorer::ProjectNode::ProjectAction> supportedActions(Node *node) const; @@ -79,7 +79,7 @@ public: private: AutotoolsProject *m_project; - Core::IFile *m_projectFile; + Core::IDocument *m_projectFile; // TODO: AutotoolsProject calls the protected method addFileNodes() from AutotoolsProjectNode. // Instead of this friend declaration, a public interface might be preferable. |