Use new static ICore interface.

Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
hjk
2012-01-24 15:36:40 +01:00
committed by hjk
parent c14a4756a9
commit 4a21f0c3c8
254 changed files with 848 additions and 1007 deletions

View File

@@ -74,8 +74,7 @@ bool GenericProjectPlugin::initialize(const QStringList &, QString *errorMessage
{
using namespace Core;
ICore *core = ICore::instance();
Core::MimeDatabase *mimeDB = core->mimeDatabase();
Core::MimeDatabase *mimeDB = ICore::mimeDatabase();
const QLatin1String mimetypesXml(":genericproject/GenericProject.mimetypes.xml");
@@ -96,7 +95,7 @@ bool GenericProjectPlugin::initialize(const QStringList &, QString *errorMessage
addAutoReleasedObject(new GenericTargetFactory);
const Core::Context projectContext(Constants::PROJECTCONTEXT);
Core::ActionManager *am = core->actionManager();
Core::ActionManager *am = Core::ICore::actionManager();
Core::ActionContainer *mproject =
am->actionContainer(ProjectExplorer::Constants::M_PROJECTCONTEXT);
m_editFilesAction = new QAction(tr("Edit Files..."), this);
@@ -124,9 +123,9 @@ void GenericProjectPlugin::editFiles()
{
GenericProject *genericProject = static_cast<GenericProject *>(m_contextMenuProject);
Core::MimeDatabase *mimeDatabase = Core::ICore::instance()->mimeDatabase();
Core::MimeDatabase *mimeDatabase = Core::ICore::mimeDatabase();
SelectableFilesDialog sfd(QFileInfo(genericProject->file()->fileName()).path(), genericProject->files(),
mimeDatabase->suffixes().toSet(), Core::ICore::instance()->mainWindow());
mimeDatabase->suffixes().toSet(), Core::ICore::mainWindow());
if (sfd.exec() == QDialog::Accepted) {
genericProject->setFiles(sfd.selectedFiles());
}