From ca14299790646284fbb660b11bb30de503f76a79 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Wed, 28 Apr 2010 16:59:03 +0200
Subject: [PATCH] Rename IPlugin::shutdown --> IPlugin::aboutToShutdown
Discussed-with: hjk
---
src/libs/extensionsystem/iplugin.cpp | 2 +-
src/libs/extensionsystem/iplugin.h | 2 +-
src/libs/extensionsystem/pluginspec.cpp | 4 ++--
src/plugins/coreplugin/coreplugin.cpp | 4 ++--
src/plugins/coreplugin/coreplugin.h | 2 +-
src/plugins/coreplugin/icore.cpp | 2 +-
src/plugins/coreplugin/mainwindow.cpp | 2 +-
src/plugins/coreplugin/mainwindow.h | 2 +-
src/plugins/cpaster/cpasterplugin.cpp | 2 +-
src/plugins/cpaster/cpasterplugin.h | 2 +-
src/plugins/cppeditor/cppplugin.cpp | 2 +-
src/plugins/cppeditor/cppplugin.h | 2 +-
src/plugins/cpptools/cpptoolsplugin.cpp | 2 +-
src/plugins/cpptools/cpptoolsplugin.h | 2 +-
src/plugins/debugger/debuggermanager.cpp | 2 +-
src/plugins/debugger/debuggermanager.h | 2 +-
src/plugins/debugger/debuggerplugin.cpp | 6 +++---
src/plugins/debugger/debuggerplugin.h | 2 +-
src/plugins/debugger/debuggeruiswitcher.cpp | 2 +-
src/plugins/debugger/debuggeruiswitcher.h | 2 +-
src/plugins/fakevim/fakevimplugin.cpp | 8 ++++----
src/plugins/fakevim/fakevimplugin.h | 2 +-
src/plugins/find/findplugin.cpp | 2 +-
src/plugins/find/findplugin.h | 2 +-
src/plugins/help/helpplugin.cpp | 2 +-
src/plugins/help/helpplugin.h | 2 +-
src/plugins/projectexplorer/projectexplorer.cpp | 4 ++--
src/plugins/projectexplorer/projectexplorer.h | 2 +-
src/plugins/projectexplorer/projectwindow.cpp | 2 +-
src/plugins/projectexplorer/projectwindow.h | 2 +-
src/plugins/qmlinspector/qmlinspectorplugin.cpp | 2 +-
src/plugins/qmlinspector/qmlinspectorplugin.h | 2 +-
32 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/src/libs/extensionsystem/iplugin.cpp b/src/libs/extensionsystem/iplugin.cpp
index 50bb54d2d43..57fc9d9e86b 100644
--- a/src/libs/extensionsystem/iplugin.cpp
+++ b/src/libs/extensionsystem/iplugin.cpp
@@ -240,7 +240,7 @@
*/
/*!
- \fn void IPlugin::shutdown()
+ \fn void IPlugin::aboutToShutdown()
Called during a shutdown sequence in the same order as initialization
before the plugins get deleted in reverse order.
This method can be used to optimize the shutdown down, e.g. to
diff --git a/src/libs/extensionsystem/iplugin.h b/src/libs/extensionsystem/iplugin.h
index 6eb550f0545..889daecd736 100644
--- a/src/libs/extensionsystem/iplugin.h
+++ b/src/libs/extensionsystem/iplugin.h
@@ -54,7 +54,7 @@ public:
virtual bool initialize(const QStringList &arguments, QString *errorString) = 0;
virtual void extensionsInitialized() = 0;
- virtual void shutdown() { }
+ virtual void aboutToShutdown() { }
virtual void remoteCommand(const QStringList & /* options */, const QStringList & /* arguments */) { }
PluginSpec *pluginSpec() const;
diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp
index ce4f95b6dd1..e39c6df5c3d 100644
--- a/src/libs/extensionsystem/pluginspec.cpp
+++ b/src/libs/extensionsystem/pluginspec.cpp
@@ -119,7 +119,7 @@
extensionsInitialized has been called. The loading process is
complete.
\value Stopped
- The plugin has been shut down, i.e. the plugin's IPlugin::shutdown() method has been called.
+ The plugin has been shut down, i.e. the plugin's IPlugin::aboutToShutdown() method has been called.
\value Deleted
The plugin instance has been deleted.
*/
@@ -959,7 +959,7 @@ void PluginSpecPrivate::stop()
{
if (!plugin)
return;
- plugin->shutdown();
+ plugin->aboutToShutdown();
state = PluginSpec::Stopped;
}
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index c28888d8b89..8e0107ed406 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -110,9 +110,9 @@ void CorePlugin::fileOpenRequest(const QString &f)
remoteCommand(QStringList(), QStringList(f));
}
-void CorePlugin::shutdown()
+void CorePlugin::aboutToShutdown()
{
- m_mainWindow->shutdown();
+ m_mainWindow->aboutToShutdown();
Ne7SshObject::removeInstance();
}
diff --git a/src/plugins/coreplugin/coreplugin.h b/src/plugins/coreplugin/coreplugin.h
index 8f52966ef31..bd602550478 100644
--- a/src/plugins/coreplugin/coreplugin.h
+++ b/src/plugins/coreplugin/coreplugin.h
@@ -49,7 +49,7 @@ public:
virtual bool initialize(const QStringList &arguments, QString *errorMessage = 0);
virtual void extensionsInitialized();
- virtual void shutdown();
+ virtual void aboutToShutdown();
virtual void remoteCommand(const QStringList & /* options */, const QStringList &args);
public slots:
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index 11675779c2e..c1f85bc44cd 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -341,7 +341,7 @@
The application is guaranteed to shut down after this signal is emitted.
It's there as an addition to the usual plugin lifecycle methods, namely
- IPlugin::shutdown(), just for convenience.
+ IPlugin::aboutToShutdown(), just for convenience.
*/
/*!
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 72d1da273e3..05f189127f0 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -1111,7 +1111,7 @@ void MainWindow::resetContext()
updateContextObject(0);
}
-void MainWindow::shutdown()
+void MainWindow::aboutToShutdown()
{
disconnect(QApplication::instance(), SIGNAL(focusChanged(QWidget*,QWidget*)),
this, SLOT(updateFocusWidget(QWidget*,QWidget*)));
diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h
index b872baaeccd..1c9b53eba54 100644
--- a/src/plugins/coreplugin/mainwindow.h
+++ b/src/plugins/coreplugin/mainwindow.h
@@ -88,7 +88,7 @@ public:
bool init(QString *errorMessage);
void extensionsInitialized();
- void shutdown();
+ void aboutToShutdown();
IContext *contextObject(QWidget *widget);
void addContextObject(IContext *contex);
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index 71b3e6af482..47cbf0091bb 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -146,7 +146,7 @@ void CodepasterPlugin::extensionsInitialized()
{
}
-void CodepasterPlugin::shutdown()
+void CodepasterPlugin::aboutToShutdown()
{
// Delete temporary, fetched files
foreach(const QString &fetchedSnippet, m_fetchedSnippets) {
diff --git a/src/plugins/cpaster/cpasterplugin.h b/src/plugins/cpaster/cpasterplugin.h
index 6278cd1473e..b75158b0c9a 100644
--- a/src/plugins/cpaster/cpasterplugin.h
+++ b/src/plugins/cpaster/cpasterplugin.h
@@ -55,7 +55,7 @@ public:
virtual bool initialize(const QStringList &arguments, QString *error_message);
virtual void extensionsInitialized();
- virtual void shutdown();
+ virtual void aboutToShutdown();
public slots:
void postEditor();
diff --git a/src/plugins/cppeditor/cppplugin.cpp b/src/plugins/cppeditor/cppplugin.cpp
index 8cda27b2f31..da9c11ed30e 100644
--- a/src/plugins/cppeditor/cppplugin.cpp
+++ b/src/plugins/cppeditor/cppplugin.cpp
@@ -318,7 +318,7 @@ void CppPlugin::extensionsInitialized()
{
}
-void CppPlugin::shutdown()
+void CppPlugin::aboutToShutdown()
{
writeSettings();
}
diff --git a/src/plugins/cppeditor/cppplugin.h b/src/plugins/cppeditor/cppplugin.h
index 8d47b836607..9d7527d3ef4 100644
--- a/src/plugins/cppeditor/cppplugin.h
+++ b/src/plugins/cppeditor/cppplugin.h
@@ -60,7 +60,7 @@ public:
bool initialize(const QStringList &arguments, QString *error_message = 0);
void extensionsInitialized();
- void shutdown();
+ void aboutToShutdown();
// Connect editor to settings changed signals.
void initializeEditor(CPPEditor *editor);
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp
index fd6b4cd1d2d..19f986a8b98 100644
--- a/src/plugins/cpptools/cpptoolsplugin.cpp
+++ b/src/plugins/cpptools/cpptoolsplugin.cpp
@@ -168,7 +168,7 @@ void CppToolsPlugin::extensionsInitialized()
m_modelManager->setHeaderSuffixes(mimeType.suffixes());
}
-void CppToolsPlugin::shutdown()
+void CppToolsPlugin::aboutToShutdown()
{
// Save settings
QSettings *settings = Core::ICore::instance()->settings();
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h
index 8fffa19a2a9..c5b82982ca3 100644
--- a/src/plugins/cpptools/cpptoolsplugin.h
+++ b/src/plugins/cpptools/cpptoolsplugin.h
@@ -66,7 +66,7 @@ public:
bool initialize(const QStringList &arguments, QString *error_message);
void extensionsInitialized();
- void shutdown();
+ void aboutToShutdown();
CppModelManager *cppModelManager() { return m_modelManager; }
QString correspondingHeaderOrSource(const QString &fileName) const;
diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index 3e2830e679f..1a646f5a66b 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -854,7 +854,7 @@ void DebuggerManager::showApplicationOutput(const QString &str, bool onStdErr)
emit applicationOutputAvailable(str, onStdErr);
}
-void DebuggerManager::shutdown()
+void DebuggerManager::aboutToShutdown()
{
STATE_DEBUG(d->m_engine);
if (d->m_engine)
diff --git a/src/plugins/debugger/debuggermanager.h b/src/plugins/debugger/debuggermanager.h
index ae2dcb6f9a8..67480dd9214 100644
--- a/src/plugins/debugger/debuggermanager.h
+++ b/src/plugins/debugger/debuggermanager.h
@@ -344,7 +344,7 @@ private:
void runTest(const QString &fileName);
Q_SLOT void createNewDock(QWidget *widget);
- void shutdown();
+ void aboutToShutdown();
void toggleBreakpoint(const QString &fileName, int lineNumber);
Internal::BreakpointData *findBreakpoint(const QString &fileName, int lineNumber);
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 603349c76d6..530eca53e4e 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -565,16 +565,16 @@ DebuggerPlugin::~DebuggerPlugin()
m_uiSwitcher = 0;
}
-void DebuggerPlugin::shutdown()
+void DebuggerPlugin::aboutToShutdown()
{
QTC_ASSERT(m_manager, /**/);
if (m_manager)
- m_manager->shutdown();
+ m_manager->aboutToShutdown();
writeSettings();
if (m_uiSwitcher)
- m_uiSwitcher->shutdown();
+ m_uiSwitcher->aboutToShutdown();
}
static QString msgParameterMissing(const QString &a)
diff --git a/src/plugins/debugger/debuggerplugin.h b/src/plugins/debugger/debuggerplugin.h
index 56b8457b250..bb53708f63c 100644
--- a/src/plugins/debugger/debuggerplugin.h
+++ b/src/plugins/debugger/debuggerplugin.h
@@ -83,7 +83,7 @@ public:
private:
virtual bool initialize(const QStringList &arguments, QString *error_message);
- virtual void shutdown();
+ virtual void aboutToShutdown();
virtual void extensionsInitialized();
virtual void remoteCommand(const QStringList &options, const QStringList &arguments);
diff --git a/src/plugins/debugger/debuggeruiswitcher.cpp b/src/plugins/debugger/debuggeruiswitcher.cpp
index 695e3d30835..a7db1101a7a 100644
--- a/src/plugins/debugger/debuggeruiswitcher.cpp
+++ b/src/plugins/debugger/debuggeruiswitcher.cpp
@@ -421,7 +421,7 @@ QWidget *DebuggerUISwitcher::createContents(Core::BaseMode *mode)
return splitter;
}
-void DebuggerUISwitcher::shutdown()
+void DebuggerUISwitcher::aboutToShutdown()
{
writeSettings();
}
diff --git a/src/plugins/debugger/debuggeruiswitcher.h b/src/plugins/debugger/debuggeruiswitcher.h
index 75390ea425f..52a4e1cb3a5 100644
--- a/src/plugins/debugger/debuggeruiswitcher.h
+++ b/src/plugins/debugger/debuggeruiswitcher.h
@@ -85,7 +85,7 @@ public:
// called when all dependent plugins have loaded
void initialize();
- void shutdown();
+ void aboutToShutdown();
// dockwidgets are registered to the main window
QDockWidget *createDockWidget(const QString &langName, QWidget *widget,
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index e0d9fc43cbf..5439181bd3f 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -480,7 +480,7 @@ public:
friend class FakeVimPlugin;
bool initialize();
- void shutdown();
+ void aboutToShutdown();
private slots:
void editorOpened(Core::IEditor *);
@@ -560,7 +560,7 @@ FakeVimPluginPrivate::~FakeVimPluginPrivate()
{
}
-void FakeVimPluginPrivate::shutdown()
+void FakeVimPluginPrivate::aboutToShutdown()
{
q->removeObject(m_fakeVimOptionsPage);
delete m_fakeVimOptionsPage;
@@ -1151,9 +1151,9 @@ bool FakeVimPlugin::initialize(const QStringList &arguments, QString *errorMessa
return d->initialize();
}
-void FakeVimPlugin::shutdown()
+void FakeVimPlugin::aboutToShutdown()
{
- d->shutdown();
+ d->aboutToShutdown();
}
void FakeVimPlugin::extensionsInitialized()
diff --git a/src/plugins/fakevim/fakevimplugin.h b/src/plugins/fakevim/fakevimplugin.h
index 07367e7adc9..a40bb9a9f28 100644
--- a/src/plugins/fakevim/fakevimplugin.h
+++ b/src/plugins/fakevim/fakevimplugin.h
@@ -50,7 +50,7 @@ public:
private:
// implementation of ExtensionSystem::IPlugin
bool initialize(const QStringList &arguments, QString *error_message);
- void shutdown();
+ void aboutToShutdown();
void extensionsInitialized();
private:
diff --git a/src/plugins/find/findplugin.cpp b/src/plugins/find/findplugin.cpp
index 4b215a903f0..65aaebb2ea0 100644
--- a/src/plugins/find/findplugin.cpp
+++ b/src/plugins/find/findplugin.cpp
@@ -142,7 +142,7 @@ void FindPlugin::extensionsInitialized()
readSettings();
}
-void FindPlugin::shutdown()
+void FindPlugin::aboutToShutdown()
{
d->m_findToolBar->setVisible(false);
d->m_findToolBar->setParent(0);
diff --git a/src/plugins/find/findplugin.h b/src/plugins/find/findplugin.h
index 6d0bfe10f95..ef0e0d73561 100644
--- a/src/plugins/find/findplugin.h
+++ b/src/plugins/find/findplugin.h
@@ -67,7 +67,7 @@ public:
// IPlugin
bool initialize(const QStringList &arguments, QString *error_message);
void extensionsInitialized();
- void shutdown();
+ void aboutToShutdown();
QTextDocument::FindFlags findFlags() const;
void updateFindCompletion(const QString &text);
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 48cdbce6e94..b80f03ea360 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -358,7 +358,7 @@ void HelpPlugin::extensionsInitialized()
connect(engine, SIGNAL(setupFinished()), this, SLOT(updateFilterComboBox()));
}
-void HelpPlugin::shutdown()
+void HelpPlugin::aboutToShutdown()
{
if (m_sideBar)
m_sideBar->saveSettings(m_core->settings(), QLatin1String("HelpSideBar"));
diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h
index c5a56f40f00..1ac051cdfb1 100644
--- a/src/plugins/help/helpplugin.h
+++ b/src/plugins/help/helpplugin.h
@@ -71,7 +71,7 @@ public:
bool initialize(const QStringList &arguments, QString *error_message);
void extensionsInitialized();
- void shutdown();
+ void aboutToShutdown();
private slots:
void modeChanged(Core::IMode *mode);
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 4aa2dd0b858..7b3155b9404 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -899,9 +899,9 @@ void ProjectExplorerPlugin::extensionsInitialized()
addAutoReleasedObject(cpw);
}
-void ProjectExplorerPlugin::shutdown()
+void ProjectExplorerPlugin::aboutToShutdown()
{
- d->m_proWindow->shutdown(); // disconnect from session
+ d->m_proWindow->aboutToShutdown(); // disconnect from session
d->m_session->clear();
d->m_projectsMode = 0;
// d->m_proWindow->saveConfigChanges();
diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index e0cd62a03e7..8ed599bf966 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -100,7 +100,7 @@ public:
//PluginInterface
bool initialize(const QStringList &arguments, QString *error_message);
void extensionsInitialized();
- void shutdown();
+ void aboutToShutdown();
void setProjectExplorerSettings(const Internal::ProjectExplorerSettings &pes);
Internal::ProjectExplorerSettings projectExplorerSettings() const;
diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp
index be88e017f0e..ab7476226de 100644
--- a/src/plugins/projectexplorer/projectwindow.cpp
+++ b/src/plugins/projectexplorer/projectwindow.cpp
@@ -269,7 +269,7 @@ ProjectWindow::~ProjectWindow()
{
}
-void ProjectWindow::shutdown()
+void ProjectWindow::aboutToShutdown()
{
showProperties(-1, -1); // TODO that's a bit stupid, but otherwise stuff is still
// connected to the session
diff --git a/src/plugins/projectexplorer/projectwindow.h b/src/plugins/projectexplorer/projectwindow.h
index 571aeccbe74..b8f9e0e01a4 100644
--- a/src/plugins/projectexplorer/projectwindow.h
+++ b/src/plugins/projectexplorer/projectwindow.h
@@ -85,7 +85,7 @@ public:
explicit ProjectWindow(QWidget *parent = 0);
~ProjectWindow();
- void shutdown();
+ void aboutToShutdown();
private slots:
void showProperties(int index, int subIndex);
void restoreStatus();
diff --git a/src/plugins/qmlinspector/qmlinspectorplugin.cpp b/src/plugins/qmlinspector/qmlinspectorplugin.cpp
index 29b993fa164..ec9c8ed5829 100644
--- a/src/plugins/qmlinspector/qmlinspectorplugin.cpp
+++ b/src/plugins/qmlinspector/qmlinspectorplugin.cpp
@@ -84,7 +84,7 @@ QmlInspectorPlugin::~QmlInspectorPlugin()
m_inspector = 0;
}
-void QmlInspectorPlugin::shutdown()
+void QmlInspectorPlugin::aboutToShutdown()
{
}
diff --git a/src/plugins/qmlinspector/qmlinspectorplugin.h b/src/plugins/qmlinspector/qmlinspectorplugin.h
index c6eb118b2fd..e40d714007a 100644
--- a/src/plugins/qmlinspector/qmlinspectorplugin.h
+++ b/src/plugins/qmlinspector/qmlinspectorplugin.h
@@ -58,7 +58,7 @@ public:
virtual bool initialize(const QStringList &arguments, QString *errorString);
virtual void extensionsInitialized();
- virtual void shutdown();
+ virtual void aboutToShutdown();
public slots:
void activateDebuggerForProject(ProjectExplorer::Project *project, const QString &runMode);
--
GitLab