From e520c38f41fdd8be89f86369eb4aa3aa49033524 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Thu, 29 Aug 2013 17:35:08 +0200
Subject: [PATCH] Core: Remove deprecated accessors
Also adjust user code.
Change-Id: I60935942a7012e6a0d6091ffbc89d69289366e35
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/coreplugin/externaltool.cpp | 10 ++++----
src/plugins/coreplugin/icore.cpp | 25 -------------------
src/plugins/coreplugin/icore.h | 5 ----
src/plugins/cpaster/cpasterplugin.cpp | 4 +--
src/plugins/cpaster/fileshareprotocol.cpp | 4 +--
src/plugins/locator/executefilter.cpp | 12 ++++-----
.../customwizard/customwizard.cpp | 2 +-
.../miniprojecttargetselector.cpp | 2 +-
src/plugins/qmlprojectmanager/qmlproject.cpp | 2 +-
src/plugins/qt4projectmanager/qt4project.cpp | 2 +-
.../unconfiguredprojectpanel.cpp | 4 +--
src/plugins/qtsupport/profilereader.cpp | 2 +-
12 files changed, 22 insertions(+), 52 deletions(-)
diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp
index b6555ef5e29..67e5ef8e026 100644
--- a/src/plugins/coreplugin/externaltool.cpp
+++ b/src/plugins/coreplugin/externaltool.cpp
@@ -610,7 +610,7 @@ void ExternalToolRunner::run()
if (!m_resolvedWorkingDirectory.isEmpty())
m_process->setWorkingDirectory(m_resolvedWorkingDirectory);
m_process->setCommand(m_resolvedExecutable, m_resolvedArguments);
- ICore::messageManager()->printToOutputPane(
+ MessageManager::instance()->printToOutputPane(
tr("Starting external tool '%1' %2").arg(m_resolvedExecutable, m_resolvedArguments), MessageManager::Silent);
m_process->start();
}
@@ -632,7 +632,7 @@ void ExternalToolRunner::finished(int exitCode, QProcess::ExitStatus status)
if (m_tool->modifiesCurrentDocument())
DocumentManager::unexpectFileChange(m_expectedFileName);
}
- ICore::messageManager()->printToOutputPane(
+ MessageManager::instance()->printToOutputPane(
tr("'%1' finished").arg(m_resolvedExecutable), MessageManager::Silent);
deleteLater();
}
@@ -653,7 +653,7 @@ void ExternalToolRunner::readStandardOutput()
QByteArray data = m_process->readAllStandardOutput();
QString output = m_outputCodec->toUnicode(data.constData(), data.length(), &m_outputCodecState);
if (m_tool->outputHandling() == ExternalTool::ShowInPane)
- ICore::messageManager()->printToOutputPane(output, MessageManager::NoModeSwitch);
+ MessageManager::instance()->printToOutputPane(output, MessageManager::NoModeSwitch);
else if (m_tool->outputHandling() == ExternalTool::ReplaceSelection)
m_processOutput.append(output);
}
@@ -665,7 +665,7 @@ void ExternalToolRunner::readStandardError()
QByteArray data = m_process->readAllStandardError();
QString output = m_outputCodec->toUnicode(data.constData(), data.length(), &m_errorCodecState);
if (m_tool->errorHandling() == ExternalTool::ShowInPane)
- ICore::messageManager()->printToOutputPane(output, MessageManager::NoModeSwitch);
+ MessageManager::instance()->printToOutputPane(output, MessageManager::NoModeSwitch);
else if (m_tool->errorHandling() == ExternalTool::ReplaceSelection)
m_processOutput.append(output);
}
@@ -767,7 +767,7 @@ void ExternalToolManager::menuActivated()
QTC_ASSERT(tool, return);
ExternalToolRunner *runner = new ExternalToolRunner(tool);
if (runner->hasError())
- ICore::messageManager()->printToOutputPane(runner->errorString(), MessageManager::NoModeSwitch);
+ MessageManager::instance()->printToOutputPane(runner->errorString(), MessageManager::NoModeSwitch);
}
QMap<QString, QList<Internal::ExternalTool *> > ExternalToolManager::toolsByCategory() const
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index 68105dd0c79..3e8f4f3ed1c 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -407,41 +407,16 @@ bool ICore::showWarningWithOptions(const QString &title, const QString &text,
settingsId, parent);
}
-ActionManager *ICore::actionManager()
-{
- return m_mainwindow->actionManager();
-}
-
-DocumentManager *ICore::documentManager()
-{
- return DocumentManager::instance();
-}
-
-MessageManager *ICore::messageManager()
-{
- return m_mainwindow->messageManager();
-}
-
ProgressManager *ICore::progressManager()
{
return m_mainwindow->progressManager();
}
-VariableManager *ICore::variableManager()
-{
- return m_mainwindow->variableManager();
-}
-
VcsManager *ICore::vcsManager()
{
return m_mainwindow->vcsManager();
}
-ModeManager *ICore::modeManager()
-{
- return m_mainwindow->modeManager();
-}
-
MimeDatabase *ICore::mimeDatabase()
{
return m_mainwindow->mimeDatabase();
diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h
index b636bf26486..b7835b99a01 100644
--- a/src/plugins/coreplugin/icore.h
+++ b/src/plugins/coreplugin/icore.h
@@ -93,13 +93,8 @@ public:
Id settingsId = Id(),
QWidget *parent = 0);
- static QT_DEPRECATED ActionManager *actionManager(); // Use Actionmanager::... directly.
- static QT_DEPRECATED DocumentManager *documentManager(); // Use DocumentManager::... directly.
- static QT_DEPRECATED MessageManager *messageManager(); // Use MessageManager::... directly.
static ProgressManager *progressManager();
- static QT_DEPRECATED VariableManager *variableManager(); // Use VariableManager::... directly.
static VcsManager *vcsManager();
- static QT_DEPRECATED ModeManager *modeManager(); // Use ModeManager::... directly.
static MimeDatabase *mimeDatabase();
static HelpManager *helpManager();
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index 8b0cf24ea02..c756351aa9f 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -306,7 +306,7 @@ void CodepasterPlugin::finishPost(const QString &link)
{
if (m_settings->copyToClipboard)
QApplication::clipboard()->setText(link);
- ICore::messageManager()->printToOutputPane(link, m_settings->displayOutput ? Core::MessageManager::ModeSwitch : Core::MessageManager::Silent);
+ MessageManager::instance()->printToOutputPane(link, m_settings->displayOutput ? Core::MessageManager::ModeSwitch : Core::MessageManager::Silent);
}
// Extract the characters that can be used for a file name from a title
@@ -346,7 +346,7 @@ void CodepasterPlugin::finishFetch(const QString &titleDescription,
const QString &content,
bool error)
{
- Core::MessageManager *messageManager = ICore::messageManager();
+ Core::MessageManager *messageManager = MessageManager::instance();
// Failure?
if (error) {
messageManager->printToOutputPane(content, Core::MessageManager::NoModeSwitch);
diff --git a/src/plugins/cpaster/fileshareprotocol.cpp b/src/plugins/cpaster/fileshareprotocol.cpp
index ef3f4eb9f62..d7a75facb06 100644
--- a/src/plugins/cpaster/fileshareprotocol.cpp
+++ b/src/plugins/cpaster/fileshareprotocol.cpp
@@ -205,11 +205,11 @@ void FileShareProtocol::paste(const QString &text,
saver.setResult(&writer);
}
if (!saver.finalize()) {
- Core::ICore::messageManager()->printToOutputPane(saver.errorString(), Core::MessageManager::NoModeSwitch);
+ Core::MessageManager::instance()->printToOutputPane(saver.errorString(), Core::MessageManager::NoModeSwitch);
return;
}
const QString msg = tr("Pasted: %1").arg(saver.fileName());
- Core::ICore::messageManager()->printToOutputPane(msg, Core::MessageManager::NoModeSwitch);
+ Core::MessageManager::instance()->printToOutputPane(msg, Core::MessageManager::NoModeSwitch);
}
} // namespace CodePaster
diff --git a/src/plugins/locator/executefilter.cpp b/src/plugins/locator/executefilter.cpp
index d68cfc3d491..b619d658679 100644
--- a/src/plugins/locator/executefilter.cpp
+++ b/src/plugins/locator/executefilter.cpp
@@ -126,9 +126,9 @@ void ExecuteFilter::finished(int exitCode, QProcess::ExitStatus status)
{
QString log = QLatin1Char('\'') + headCommand() + QLatin1String("' ");
if (status == QProcess::NormalExit && exitCode == 0)
- ICore::messageManager()->printToOutputPane(log + tr("finished"), MessageManager::NoModeSwitch);
+ MessageManager::instance()->printToOutputPane(log + tr("finished"), MessageManager::NoModeSwitch);
else
- ICore::messageManager()->printToOutputPane(log + tr("failed"), MessageManager::NoModeSwitch);
+ MessageManager::instance()->printToOutputPane(log + tr("failed"), MessageManager::NoModeSwitch);
m_taskQueue.dequeue();
if (!m_taskQueue.isEmpty())
@@ -138,13 +138,13 @@ void ExecuteFilter::finished(int exitCode, QProcess::ExitStatus status)
void ExecuteFilter::readStandardOutput()
{
QByteArray data = m_process->readAllStandardOutput();
- ICore::messageManager()->printToOutputPane(QString::fromLocal8Bit(data), MessageManager::NoModeSwitch);
+ MessageManager::instance()->printToOutputPane(QString::fromLocal8Bit(data), MessageManager::NoModeSwitch);
}
void ExecuteFilter::readStandardError()
{
QByteArray data = m_process->readAllStandardError();
- ICore::messageManager()->printToOutputPane(QString::fromLocal8Bit(data), MessageManager::NoModeSwitch);
+ MessageManager::instance()->printToOutputPane(QString::fromLocal8Bit(data), MessageManager::NoModeSwitch);
}
void ExecuteFilter::runHeadCommand()
@@ -154,13 +154,13 @@ void ExecuteFilter::runHeadCommand()
const QString fullPath = Utils::Environment::systemEnvironment().searchInPath(d.executable);
if (fullPath.isEmpty()) {
const QString log = tr("Could not find executable for '%1'").arg(d.executable);
- ICore::messageManager()->printToOutputPane(log, MessageManager::NoModeSwitch);
+ MessageManager::instance()->printToOutputPane(log, MessageManager::NoModeSwitch);
m_taskQueue.dequeue();
runHeadCommand();
return;
}
QString log(tr("Starting command '%1'").arg(headCommand()));
- ICore::messageManager()->printToOutputPane(log, MessageManager::NoModeSwitch);
+ MessageManager::instance()->printToOutputPane(log, MessageManager::NoModeSwitch);
m_process->setWorkingDirectory(d.workingDirectory);
m_process->setCommand(fullPath, d.arguments);
m_process->start();
diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp
index 88c1805a3d4..8d4478d6263 100644
--- a/src/plugins/projectexplorer/customwizard/customwizard.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizard.cpp
@@ -495,7 +495,7 @@ QList<CustomWizard*> CustomWizard::createWizards()
if (CustomWizardPrivate::verbose) { // Print to output pane for Windows.
verboseLog += listWizards();
qWarning("%s", qPrintable(verboseLog));
- Core::ICore::messageManager()->printToOutputPane(verboseLog, Core::MessageManager::ModeSwitch);
+ Core::MessageManager::instance()->printToOutputPane(verboseLog, Core::MessageManager::ModeSwitch);
}
return rc;
}
diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
index 9b10f46e9bd..17339649e95 100644
--- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp
+++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
@@ -1495,6 +1495,6 @@ void MiniProjectTargetSelector::paintEvent(QPaintEvent *)
void MiniProjectTargetSelector::switchToProjectsMode()
{
- Core::ICore::instance()->modeManager()->activateMode(Constants::MODE_SESSION);
+ Core::ModeManager::instance()->activateMode(Constants::MODE_SESSION);
hide();
}
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index e21f25fd232..ed895cdc871 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -179,7 +179,7 @@ static QmlProject::QmlImport detectImport(const QString &qml) {
void QmlProject::parseProject(RefreshOptions options)
{
- Core::MessageManager *messageManager = Core::ICore::messageManager();
+ Core::MessageManager *messageManager = Core::MessageManager::instance();
if (options & Files) {
if (options & ProjectFile)
delete m_projectItem.data();
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index ebb4bbd5fd7..861b85f6777 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -969,7 +969,7 @@ QString Qt4Project::generatedUiHeader(const QString &formFile) const
void Qt4Project::proFileParseError(const QString &errorMessage)
{
- Core::ICore::messageManager()->printToOutputPane(errorMessage, Core::MessageManager::NoModeSwitch);
+ Core::MessageManager::instance()->printToOutputPane(errorMessage, Core::MessageManager::NoModeSwitch);
}
QtSupport::ProFileReader *Qt4Project::createProFileReader(const Qt4ProFileNode *qt4ProFileNode, Qt4BuildConfiguration *bc)
diff --git a/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp b/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp
index efafc418535..ee9221e9451 100644
--- a/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp
+++ b/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp
@@ -196,14 +196,14 @@ void TargetSetupPageWrapper::cancel()
{
ProjectExplorer::ProjectExplorerPlugin::instance()->unloadProject(m_project);
if (ProjectExplorer::ProjectExplorerPlugin::instance()->session()->projects().isEmpty())
- Core::ICore::instance()->modeManager()->activateMode(Core::Constants::MODE_WELCOME);
+ Core::ModeManager::instance()->activateMode(Core::Constants::MODE_WELCOME);
}
void TargetSetupPageWrapper::done()
{
m_targetSetupPage->setupProject(m_project);
ProjectExplorer::ProjectExplorerPlugin::instance()->requestProjectModeUpdate(m_project);
- Core::ICore::instance()->modeManager()->activateMode(Core::Constants::MODE_EDIT);
+ Core::ModeManager::instance()->activateMode(Core::Constants::MODE_EDIT);
}
void TargetSetupPageWrapper::completeChanged()
diff --git a/src/plugins/qtsupport/profilereader.cpp b/src/plugins/qtsupport/profilereader.cpp
index 747c4f14ff5..40e68974fb9 100644
--- a/src/plugins/qtsupport/profilereader.cpp
+++ b/src/plugins/qtsupport/profilereader.cpp
@@ -49,7 +49,7 @@ ProMessageHandler::ProMessageHandler(bool verbose)
: m_verbose(verbose)
{
QObject::connect(this, SIGNAL(errorFound(QString,Core::MessageManager::PrintToOutputPaneFlags)),
- Core::ICore::messageManager(), SLOT(printToOutputPane(QString,Core::MessageManager::PrintToOutputPaneFlags)),
+ Core::MessageManager::instance(), SLOT(printToOutputPane(QString,Core::MessageManager::PrintToOutputPaneFlags)),
Qt::QueuedConnection);
}
--
GitLab