Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
ca142997
Commit
ca142997
authored
Apr 28, 2010
by
con
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename IPlugin::shutdown --> IPlugin::aboutToShutdown
Discussed-with: hjk
parent
00dac575
Changes
32
Hide whitespace changes
Inline
Side-by-side
Showing
32 changed files
with
40 additions
and
40 deletions
+40
-40
src/libs/extensionsystem/iplugin.cpp
src/libs/extensionsystem/iplugin.cpp
+1
-1
src/libs/extensionsystem/iplugin.h
src/libs/extensionsystem/iplugin.h
+1
-1
src/libs/extensionsystem/pluginspec.cpp
src/libs/extensionsystem/pluginspec.cpp
+2
-2
src/plugins/coreplugin/coreplugin.cpp
src/plugins/coreplugin/coreplugin.cpp
+2
-2
src/plugins/coreplugin/coreplugin.h
src/plugins/coreplugin/coreplugin.h
+1
-1
src/plugins/coreplugin/icore.cpp
src/plugins/coreplugin/icore.cpp
+1
-1
src/plugins/coreplugin/mainwindow.cpp
src/plugins/coreplugin/mainwindow.cpp
+1
-1
src/plugins/coreplugin/mainwindow.h
src/plugins/coreplugin/mainwindow.h
+1
-1
src/plugins/cpaster/cpasterplugin.cpp
src/plugins/cpaster/cpasterplugin.cpp
+1
-1
src/plugins/cpaster/cpasterplugin.h
src/plugins/cpaster/cpasterplugin.h
+1
-1
src/plugins/cppeditor/cppplugin.cpp
src/plugins/cppeditor/cppplugin.cpp
+1
-1
src/plugins/cppeditor/cppplugin.h
src/plugins/cppeditor/cppplugin.h
+1
-1
src/plugins/cpptools/cpptoolsplugin.cpp
src/plugins/cpptools/cpptoolsplugin.cpp
+1
-1
src/plugins/cpptools/cpptoolsplugin.h
src/plugins/cpptools/cpptoolsplugin.h
+1
-1
src/plugins/debugger/debuggermanager.cpp
src/plugins/debugger/debuggermanager.cpp
+1
-1
src/plugins/debugger/debuggermanager.h
src/plugins/debugger/debuggermanager.h
+1
-1
src/plugins/debugger/debuggerplugin.cpp
src/plugins/debugger/debuggerplugin.cpp
+3
-3
src/plugins/debugger/debuggerplugin.h
src/plugins/debugger/debuggerplugin.h
+1
-1
src/plugins/debugger/debuggeruiswitcher.cpp
src/plugins/debugger/debuggeruiswitcher.cpp
+1
-1
src/plugins/debugger/debuggeruiswitcher.h
src/plugins/debugger/debuggeruiswitcher.h
+1
-1
src/plugins/fakevim/fakevimplugin.cpp
src/plugins/fakevim/fakevimplugin.cpp
+4
-4
src/plugins/fakevim/fakevimplugin.h
src/plugins/fakevim/fakevimplugin.h
+1
-1
src/plugins/find/findplugin.cpp
src/plugins/find/findplugin.cpp
+1
-1
src/plugins/find/findplugin.h
src/plugins/find/findplugin.h
+1
-1
src/plugins/help/helpplugin.cpp
src/plugins/help/helpplugin.cpp
+1
-1
src/plugins/help/helpplugin.h
src/plugins/help/helpplugin.h
+1
-1
src/plugins/projectexplorer/projectexplorer.cpp
src/plugins/projectexplorer/projectexplorer.cpp
+2
-2
src/plugins/projectexplorer/projectexplorer.h
src/plugins/projectexplorer/projectexplorer.h
+1
-1
src/plugins/projectexplorer/projectwindow.cpp
src/plugins/projectexplorer/projectwindow.cpp
+1
-1
src/plugins/projectexplorer/projectwindow.h
src/plugins/projectexplorer/projectwindow.h
+1
-1
src/plugins/qmlinspector/qmlinspectorplugin.cpp
src/plugins/qmlinspector/qmlinspectorplugin.cpp
+1
-1
src/plugins/qmlinspector/qmlinspectorplugin.h
src/plugins/qmlinspector/qmlinspectorplugin.h
+1
-1
No files found.
src/libs/extensionsystem/iplugin.cpp
View file @
ca142997
...
...
@@ -240,7 +240,7 @@
*/
/*!
\fn void IPlugin::
s
hutdown()
\fn void IPlugin::
aboutToS
hutdown()
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
...
...
src/libs/extensionsystem/iplugin.h
View file @
ca142997
...
...
@@ -54,7 +54,7 @@ public:
virtual
bool
initialize
(
const
QStringList
&
arguments
,
QString
*
errorString
)
=
0
;
virtual
void
extensionsInitialized
()
=
0
;
virtual
void
s
hutdown
()
{
}
virtual
void
aboutToS
hutdown
()
{
}
virtual
void
remoteCommand
(
const
QStringList
&
/* options */
,
const
QStringList
&
/* arguments */
)
{
}
PluginSpec
*
pluginSpec
()
const
;
...
...
src/libs/extensionsystem/pluginspec.cpp
View file @
ca142997
...
...
@@ -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::
s
hutdown() method has been called.
The plugin has been shut down, i.e. the plugin's IPlugin::
aboutToS
hutdown() method has been called.
\value Deleted
The plugin instance has been deleted.
*/
...
...
@@ -959,7 +959,7 @@ void PluginSpecPrivate::stop()
{
if
(
!
plugin
)
return
;
plugin
->
s
hutdown
();
plugin
->
aboutToS
hutdown
();
state
=
PluginSpec
::
Stopped
;
}
...
...
src/plugins/coreplugin/coreplugin.cpp
View file @
ca142997
...
...
@@ -110,9 +110,9 @@ void CorePlugin::fileOpenRequest(const QString &f)
remoteCommand
(
QStringList
(),
QStringList
(
f
));
}
void
CorePlugin
::
s
hutdown
()
void
CorePlugin
::
aboutToS
hutdown
()
{
m_mainWindow
->
s
hutdown
();
m_mainWindow
->
aboutToS
hutdown
();
Ne7SshObject
::
removeInstance
();
}
...
...
src/plugins/coreplugin/coreplugin.h
View file @
ca142997
...
...
@@ -49,7 +49,7 @@ public:
virtual
bool
initialize
(
const
QStringList
&
arguments
,
QString
*
errorMessage
=
0
);
virtual
void
extensionsInitialized
();
virtual
void
s
hutdown
();
virtual
void
aboutToS
hutdown
();
virtual
void
remoteCommand
(
const
QStringList
&
/* options */
,
const
QStringList
&
args
);
public
slots
:
...
...
src/plugins/coreplugin/icore.cpp
View file @
ca142997
...
...
@@ -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::
s
hutdown(), just for convenience.
IPlugin::
aboutToS
hutdown(), just for convenience.
*/
/*!
...
...
src/plugins/coreplugin/mainwindow.cpp
View file @
ca142997
...
...
@@ -1111,7 +1111,7 @@ void MainWindow::resetContext()
updateContextObject
(
0
);
}
void
MainWindow
::
s
hutdown
()
void
MainWindow
::
aboutToS
hutdown
()
{
disconnect
(
QApplication
::
instance
(),
SIGNAL
(
focusChanged
(
QWidget
*
,
QWidget
*
)),
this
,
SLOT
(
updateFocusWidget
(
QWidget
*
,
QWidget
*
)));
...
...
src/plugins/coreplugin/mainwindow.h
View file @
ca142997
...
...
@@ -88,7 +88,7 @@ public:
bool
init
(
QString
*
errorMessage
);
void
extensionsInitialized
();
void
s
hutdown
();
void
aboutToS
hutdown
();
IContext
*
contextObject
(
QWidget
*
widget
);
void
addContextObject
(
IContext
*
contex
);
...
...
src/plugins/cpaster/cpasterplugin.cpp
View file @
ca142997
...
...
@@ -146,7 +146,7 @@ void CodepasterPlugin::extensionsInitialized()
{
}
void
CodepasterPlugin
::
s
hutdown
()
void
CodepasterPlugin
::
aboutToS
hutdown
()
{
// Delete temporary, fetched files
foreach
(
const
QString
&
fetchedSnippet
,
m_fetchedSnippets
)
{
...
...
src/plugins/cpaster/cpasterplugin.h
View file @
ca142997
...
...
@@ -55,7 +55,7 @@ public:
virtual
bool
initialize
(
const
QStringList
&
arguments
,
QString
*
error_message
);
virtual
void
extensionsInitialized
();
virtual
void
s
hutdown
();
virtual
void
aboutToS
hutdown
();
public
slots
:
void
postEditor
();
...
...
src/plugins/cppeditor/cppplugin.cpp
View file @
ca142997
...
...
@@ -318,7 +318,7 @@ void CppPlugin::extensionsInitialized()
{
}
void
CppPlugin
::
s
hutdown
()
void
CppPlugin
::
aboutToS
hutdown
()
{
writeSettings
();
}
...
...
src/plugins/cppeditor/cppplugin.h
View file @
ca142997
...
...
@@ -60,7 +60,7 @@ public:
bool
initialize
(
const
QStringList
&
arguments
,
QString
*
error_message
=
0
);
void
extensionsInitialized
();
void
s
hutdown
();
void
aboutToS
hutdown
();
// Connect editor to settings changed signals.
void
initializeEditor
(
CPPEditor
*
editor
);
...
...
src/plugins/cpptools/cpptoolsplugin.cpp
View file @
ca142997
...
...
@@ -168,7 +168,7 @@ void CppToolsPlugin::extensionsInitialized()
m_modelManager
->
setHeaderSuffixes
(
mimeType
.
suffixes
());
}
void
CppToolsPlugin
::
s
hutdown
()
void
CppToolsPlugin
::
aboutToS
hutdown
()
{
// Save settings
QSettings
*
settings
=
Core
::
ICore
::
instance
()
->
settings
();
...
...
src/plugins/cpptools/cpptoolsplugin.h
View file @
ca142997
...
...
@@ -66,7 +66,7 @@ public:
bool
initialize
(
const
QStringList
&
arguments
,
QString
*
error_message
);
void
extensionsInitialized
();
void
s
hutdown
();
void
aboutToS
hutdown
();
CppModelManager
*
cppModelManager
()
{
return
m_modelManager
;
}
QString
correspondingHeaderOrSource
(
const
QString
&
fileName
)
const
;
...
...
src/plugins/debugger/debuggermanager.cpp
View file @
ca142997
...
...
@@ -854,7 +854,7 @@ void DebuggerManager::showApplicationOutput(const QString &str, bool onStdErr)
emit
applicationOutputAvailable
(
str
,
onStdErr
);
}
void
DebuggerManager
::
s
hutdown
()
void
DebuggerManager
::
aboutToS
hutdown
()
{
STATE_DEBUG
(
d
->
m_engine
);
if
(
d
->
m_engine
)
...
...
src/plugins/debugger/debuggermanager.h
View file @
ca142997
...
...
@@ -344,7 +344,7 @@ private:
void
runTest
(
const
QString
&
fileName
);
Q_SLOT
void
createNewDock
(
QWidget
*
widget
);
void
s
hutdown
();
void
aboutToS
hutdown
();
void
toggleBreakpoint
(
const
QString
&
fileName
,
int
lineNumber
);
Internal
::
BreakpointData
*
findBreakpoint
(
const
QString
&
fileName
,
int
lineNumber
);
...
...
src/plugins/debugger/debuggerplugin.cpp
View file @
ca142997
...
...
@@ -565,16 +565,16 @@ DebuggerPlugin::~DebuggerPlugin()
m_uiSwitcher
=
0
;
}
void
DebuggerPlugin
::
s
hutdown
()
void
DebuggerPlugin
::
aboutToS
hutdown
()
{
QTC_ASSERT
(
m_manager
,
/**/
);
if
(
m_manager
)
m_manager
->
s
hutdown
();
m_manager
->
aboutToS
hutdown
();
writeSettings
();
if
(
m_uiSwitcher
)
m_uiSwitcher
->
s
hutdown
();
m_uiSwitcher
->
aboutToS
hutdown
();
}
static
QString
msgParameterMissing
(
const
QString
&
a
)
...
...
src/plugins/debugger/debuggerplugin.h
View file @
ca142997
...
...
@@ -83,7 +83,7 @@ public:
private:
virtual
bool
initialize
(
const
QStringList
&
arguments
,
QString
*
error_message
);
virtual
void
s
hutdown
();
virtual
void
aboutToS
hutdown
();
virtual
void
extensionsInitialized
();
virtual
void
remoteCommand
(
const
QStringList
&
options
,
const
QStringList
&
arguments
);
...
...
src/plugins/debugger/debuggeruiswitcher.cpp
View file @
ca142997
...
...
@@ -421,7 +421,7 @@ QWidget *DebuggerUISwitcher::createContents(Core::BaseMode *mode)
return
splitter
;
}
void
DebuggerUISwitcher
::
s
hutdown
()
void
DebuggerUISwitcher
::
aboutToS
hutdown
()
{
writeSettings
();
}
...
...
src/plugins/debugger/debuggeruiswitcher.h
View file @
ca142997
...
...
@@ -85,7 +85,7 @@ public:
// called when all dependent plugins have loaded
void
initialize
();
void
s
hutdown
();
void
aboutToS
hutdown
();
// dockwidgets are registered to the main window
QDockWidget
*
createDockWidget
(
const
QString
&
langName
,
QWidget
*
widget
,
...
...
src/plugins/fakevim/fakevimplugin.cpp
View file @
ca142997
...
...
@@ -480,7 +480,7 @@ public:
friend
class
FakeVimPlugin
;
bool
initialize
();
void
s
hutdown
();
void
aboutToS
hutdown
();
private
slots
:
void
editorOpened
(
Core
::
IEditor
*
);
...
...
@@ -560,7 +560,7 @@ FakeVimPluginPrivate::~FakeVimPluginPrivate()
{
}
void
FakeVimPluginPrivate
::
s
hutdown
()
void
FakeVimPluginPrivate
::
aboutToS
hutdown
()
{
q
->
removeObject
(
m_fakeVimOptionsPage
);
delete
m_fakeVimOptionsPage
;
...
...
@@ -1151,9 +1151,9 @@ bool FakeVimPlugin::initialize(const QStringList &arguments, QString *errorMessa
return
d
->
initialize
();
}
void
FakeVimPlugin
::
s
hutdown
()
void
FakeVimPlugin
::
aboutToS
hutdown
()
{
d
->
s
hutdown
();
d
->
aboutToS
hutdown
();
}
void
FakeVimPlugin
::
extensionsInitialized
()
...
...
src/plugins/fakevim/fakevimplugin.h
View file @
ca142997
...
...
@@ -50,7 +50,7 @@ public:
private:
// implementation of ExtensionSystem::IPlugin
bool
initialize
(
const
QStringList
&
arguments
,
QString
*
error_message
);
void
s
hutdown
();
void
aboutToS
hutdown
();
void
extensionsInitialized
();
private:
...
...
src/plugins/find/findplugin.cpp
View file @
ca142997
...
...
@@ -142,7 +142,7 @@ void FindPlugin::extensionsInitialized()
readSettings
();
}
void
FindPlugin
::
s
hutdown
()
void
FindPlugin
::
aboutToS
hutdown
()
{
d
->
m_findToolBar
->
setVisible
(
false
);
d
->
m_findToolBar
->
setParent
(
0
);
...
...
src/plugins/find/findplugin.h
View file @
ca142997
...
...
@@ -67,7 +67,7 @@ public:
// IPlugin
bool
initialize
(
const
QStringList
&
arguments
,
QString
*
error_message
);
void
extensionsInitialized
();
void
s
hutdown
();
void
aboutToS
hutdown
();
QTextDocument
::
FindFlags
findFlags
()
const
;
void
updateFindCompletion
(
const
QString
&
text
);
...
...
src/plugins/help/helpplugin.cpp
View file @
ca142997
...
...
@@ -358,7 +358,7 @@ void HelpPlugin::extensionsInitialized()
connect
(
engine
,
SIGNAL
(
setupFinished
()),
this
,
SLOT
(
updateFilterComboBox
()));
}
void
HelpPlugin
::
s
hutdown
()
void
HelpPlugin
::
aboutToS
hutdown
()
{
if
(
m_sideBar
)
m_sideBar
->
saveSettings
(
m_core
->
settings
(),
QLatin1String
(
"HelpSideBar"
));
...
...
src/plugins/help/helpplugin.h
View file @
ca142997
...
...
@@ -71,7 +71,7 @@ public:
bool
initialize
(
const
QStringList
&
arguments
,
QString
*
error_message
);
void
extensionsInitialized
();
void
s
hutdown
();
void
aboutToS
hutdown
();
private
slots
:
void
modeChanged
(
Core
::
IMode
*
mode
);
...
...
src/plugins/projectexplorer/projectexplorer.cpp
View file @
ca142997
...
...
@@ -899,9 +899,9 @@ void ProjectExplorerPlugin::extensionsInitialized()
addAutoReleasedObject
(
cpw
);
}
void
ProjectExplorerPlugin
::
s
hutdown
()
void
ProjectExplorerPlugin
::
aboutToS
hutdown
()
{
d
->
m_proWindow
->
s
hutdown
();
// disconnect from session
d
->
m_proWindow
->
aboutToS
hutdown
();
// disconnect from session
d
->
m_session
->
clear
();
d
->
m_projectsMode
=
0
;
// d->m_proWindow->saveConfigChanges();
...
...
src/plugins/projectexplorer/projectexplorer.h
View file @
ca142997
...
...
@@ -100,7 +100,7 @@ public:
//PluginInterface
bool
initialize
(
const
QStringList
&
arguments
,
QString
*
error_message
);
void
extensionsInitialized
();
void
s
hutdown
();
void
aboutToS
hutdown
();
void
setProjectExplorerSettings
(
const
Internal
::
ProjectExplorerSettings
&
pes
);
Internal
::
ProjectExplorerSettings
projectExplorerSettings
()
const
;
...
...
src/plugins/projectexplorer/projectwindow.cpp
View file @
ca142997
...
...
@@ -269,7 +269,7 @@ ProjectWindow::~ProjectWindow()
{
}
void
ProjectWindow
::
s
hutdown
()
void
ProjectWindow
::
aboutToS
hutdown
()
{
showProperties
(
-
1
,
-
1
);
// TODO that's a bit stupid, but otherwise stuff is still
// connected to the session
...
...
src/plugins/projectexplorer/projectwindow.h
View file @
ca142997
...
...
@@ -85,7 +85,7 @@ public:
explicit
ProjectWindow
(
QWidget
*
parent
=
0
);
~
ProjectWindow
();
void
s
hutdown
();
void
aboutToS
hutdown
();
private
slots
:
void
showProperties
(
int
index
,
int
subIndex
);
void
restoreStatus
();
...
...
src/plugins/qmlinspector/qmlinspectorplugin.cpp
View file @
ca142997
...
...
@@ -84,7 +84,7 @@ QmlInspectorPlugin::~QmlInspectorPlugin()
m_inspector
=
0
;
}
void
QmlInspectorPlugin
::
s
hutdown
()
void
QmlInspectorPlugin
::
aboutToS
hutdown
()
{
}
...
...
src/plugins/qmlinspector/qmlinspectorplugin.h
View file @
ca142997
...
...
@@ -58,7 +58,7 @@ public:
virtual
bool
initialize
(
const
QStringList
&
arguments
,
QString
*
errorString
);
virtual
void
extensionsInitialized
();
virtual
void
s
hutdown
();
virtual
void
aboutToS
hutdown
();
public
slots
:
void
activateDebuggerForProject
(
ProjectExplorer
::
Project
*
project
,
const
QString
&
runMode
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment