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
Tobias Hunger
qt-creator
Commits
e3c354d8
Commit
e3c354d8
authored
Jun 18, 2012
by
Eike Ziller
Committed by
hjk
Jun 19, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make PluginManager mostly static.
Change-Id: Ib938aa4999c7c418a82304c5cca2e8748ef9d228 Reviewed-by:
hjk
<
qthjk@ovi.com
>
parent
9daa3400
Changes
88
Hide whitespace changes
Inline
Side-by-side
Showing
88 changed files
with
287 additions
and
395 deletions
+287
-395
src/app/main.cpp
src/app/main.cpp
+26
-25
src/libs/extensionsystem/extensionsystem.pro
src/libs/extensionsystem/extensionsystem.pro
+0
-1
src/libs/extensionsystem/iplugin.cpp
src/libs/extensionsystem/iplugin.cpp
+4
-5
src/libs/extensionsystem/pluginerroroverview.cpp
src/libs/extensionsystem/pluginerroroverview.cpp
+6
-8
src/libs/extensionsystem/pluginerroroverview.h
src/libs/extensionsystem/pluginerroroverview.h
+1
-1
src/libs/extensionsystem/pluginmanager.cpp
src/libs/extensionsystem/pluginmanager.cpp
+44
-44
src/libs/extensionsystem/pluginmanager.h
src/libs/extensionsystem/pluginmanager.h
+31
-31
src/libs/extensionsystem/pluginview.cpp
src/libs/extensionsystem/pluginview.cpp
+4
-8
src/libs/extensionsystem/pluginview.h
src/libs/extensionsystem/pluginview.h
+1
-3
src/libs/extensionsystem/pluginview_p.h
src/libs/extensionsystem/pluginview_p.h
+0
-51
src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
+1
-1
src/plugins/cmakeprojectmanager/cmakeproject.cpp
src/plugins/cmakeprojectmanager/cmakeproject.cpp
+1
-1
src/plugins/coreplugin/basefilewizard.cpp
src/plugins/coreplugin/basefilewizard.cpp
+1
-1
src/plugins/coreplugin/designmode.cpp
src/plugins/coreplugin/designmode.cpp
+2
-2
src/plugins/coreplugin/dialogs/iwizard.cpp
src/plugins/coreplugin/dialogs/iwizard.cpp
+4
-4
src/plugins/coreplugin/dialogs/settingsdialog.cpp
src/plugins/coreplugin/dialogs/settingsdialog.cpp
+2
-2
src/plugins/coreplugin/editormanager/editormanager.cpp
src/plugins/coreplugin/editormanager/editormanager.cpp
+11
-17
src/plugins/coreplugin/findplaceholder.cpp
src/plugins/coreplugin/findplaceholder.cpp
+2
-2
src/plugins/coreplugin/mainwindow.cpp
src/plugins/coreplugin/mainwindow.cpp
+19
-21
src/plugins/coreplugin/messagemanager.cpp
src/plugins/coreplugin/messagemanager.cpp
+3
-4
src/plugins/coreplugin/outputpanemanager.cpp
src/plugins/coreplugin/outputpanemanager.cpp
+1
-2
src/plugins/coreplugin/plugindialog.cpp
src/plugins/coreplugin/plugindialog.cpp
+2
-2
src/plugins/coreplugin/vcsmanager.cpp
src/plugins/coreplugin/vcsmanager.cpp
+1
-1
src/plugins/cppeditor/cppquickfixassistant.cpp
src/plugins/cppeditor/cppquickfixassistant.cpp
+1
-2
src/plugins/cppeditor/cppquickfixes.cpp
src/plugins/cppeditor/cppquickfixes.cpp
+1
-1
src/plugins/cpptools/cppcodestylepreferencesfactory.cpp
src/plugins/cpptools/cppcodestylepreferencesfactory.cpp
+1
-1
src/plugins/cpptools/cppcodestylesettingspage.cpp
src/plugins/cpptools/cppcodestylesettingspage.cpp
+1
-1
src/plugins/cpptools/cppmodelmanager.cpp
src/plugins/cpptools/cppmodelmanager.cpp
+6
-6
src/plugins/cpptools/cpptoolssettings.cpp
src/plugins/cpptools/cpptoolssettings.cpp
+2
-2
src/plugins/debugger/debuggerplugin.cpp
src/plugins/debugger/debuggerplugin.cpp
+2
-6
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/debugger/gdb/gdbengine.cpp
+2
-2
src/plugins/debugger/memoryagent.cpp
src/plugins/debugger/memoryagent.cpp
+1
-1
src/plugins/debugger/qml/qmlengine.cpp
src/plugins/debugger/qml/qmlengine.cpp
+3
-8
src/plugins/find/findplugin.cpp
src/plugins/find/findplugin.cpp
+1
-1
src/plugins/find/findtoolbar.cpp
src/plugins/find/findtoolbar.cpp
+1
-2
src/plugins/genericprojectmanager/genericproject.cpp
src/plugins/genericprojectmanager/genericproject.cpp
+1
-1
src/plugins/locator/locatormanager.cpp
src/plugins/locator/locatormanager.cpp
+1
-1
src/plugins/locator/locatorplugin.cpp
src/plugins/locator/locatorplugin.cpp
+1
-1
src/plugins/projectexplorer/appoutputpane.cpp
src/plugins/projectexplorer/appoutputpane.cpp
+1
-1
src/plugins/projectexplorer/buildmanager.cpp
src/plugins/projectexplorer/buildmanager.cpp
+4
-7
src/plugins/projectexplorer/buildsteplist.cpp
src/plugins/projectexplorer/buildsteplist.cpp
+2
-2
src/plugins/projectexplorer/buildstepspage.cpp
src/plugins/projectexplorer/buildstepspage.cpp
+1
-1
src/plugins/projectexplorer/compileoutputwindow.cpp
src/plugins/projectexplorer/compileoutputwindow.cpp
+3
-4
src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.cpp
...ctexplorer/devicesupport/devicefactoryselectiondialog.cpp
+1
-1
src/plugins/projectexplorer/devicesupport/devicemanager.cpp
src/plugins/projectexplorer/devicesupport/devicemanager.cpp
+2
-3
src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp
...ns/projectexplorer/devicesupport/devicesettingswidget.cpp
+1
-1
src/plugins/projectexplorer/devicesupport/idevicefactory.cpp
src/plugins/projectexplorer/devicesupport/idevicefactory.cpp
+1
-1
src/plugins/projectexplorer/foldernavigationwidget.cpp
src/plugins/projectexplorer/foldernavigationwidget.cpp
+1
-1
src/plugins/projectexplorer/pluginfilefactory.cpp
src/plugins/projectexplorer/pluginfilefactory.cpp
+1
-1
src/plugins/projectexplorer/project.cpp
src/plugins/projectexplorer/project.cpp
+1
-1
src/plugins/projectexplorer/projectexplorer.cpp
src/plugins/projectexplorer/projectexplorer.cpp
+4
-6
src/plugins/projectexplorer/projectfilewizardextension.cpp
src/plugins/projectexplorer/projectfilewizardextension.cpp
+1
-1
src/plugins/projectexplorer/projectwindow.cpp
src/plugins/projectexplorer/projectwindow.cpp
+7
-7
src/plugins/projectexplorer/publishing/publishingwizardselectiondialog.cpp
...ctexplorer/publishing/publishingwizardselectiondialog.cpp
+1
-1
src/plugins/projectexplorer/runconfiguration.cpp
src/plugins/projectexplorer/runconfiguration.cpp
+2
-4
src/plugins/projectexplorer/runsettingspropertiespage.cpp
src/plugins/projectexplorer/runsettingspropertiespage.cpp
+2
-3
src/plugins/projectexplorer/target.cpp
src/plugins/projectexplorer/target.cpp
+1
-1
src/plugins/projectexplorer/targetsettingspanel.cpp
src/plugins/projectexplorer/targetsettingspanel.cpp
+4
-4
src/plugins/projectexplorer/taskwindow.cpp
src/plugins/projectexplorer/taskwindow.cpp
+2
-2
src/plugins/projectexplorer/toolchainmanager.cpp
src/plugins/projectexplorer/toolchainmanager.cpp
+3
-6
src/plugins/projectexplorer/toolchainoptionspage.cpp
src/plugins/projectexplorer/toolchainoptionspage.cpp
+1
-1
src/plugins/qmldesigner/designmodewidget.cpp
src/plugins/qmldesigner/designmodewidget.cpp
+2
-1
src/plugins/qmljseditor/qmljseditor.cpp
src/plugins/qmljseditor/qmljseditor.cpp
+1
-1
src/plugins/qmljseditor/qmljsquickfixassist.cpp
src/plugins/qmljseditor/qmljsquickfixassist.cpp
+1
-2
src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
+1
-1
src/plugins/qmljstools/qmljscodestylesettingspage.cpp
src/plugins/qmljstools/qmljscodestylesettingspage.cpp
+2
-2
src/plugins/qmlprofiler/remotelinuxqmlprofilerrunner.cpp
src/plugins/qmlprofiler/remotelinuxqmlprofilerrunner.cpp
+1
-1
src/plugins/qmlprojectmanager/qmlproject.cpp
src/plugins/qmlprojectmanager/qmlproject.cpp
+1
-1
src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
+2
-3
src/plugins/qt4projectmanager/qt4project.cpp
src/plugins/qt4projectmanager/qt4project.cpp
+1
-1
src/plugins/qt4projectmanager/qt4target.cpp
src/plugins/qt4projectmanager/qt4target.cpp
+2
-2
src/plugins/qt4projectmanager/unconfiguredsettingsoptionpage.cpp
...gins/qt4projectmanager/unconfiguredsettingsoptionpage.cpp
+2
-2
src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
...ins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
+1
-1
src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
+1
-1
src/plugins/qt4projectmanager/wizards/qtwizard.cpp
src/plugins/qt4projectmanager/wizards/qtwizard.cpp
+1
-1
src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
+1
-1
src/plugins/qtsupport/qtversionfactory.cpp
src/plugins/qtsupport/qtversionfactory.cpp
+1
-1
src/plugins/qtsupport/qtversionmanager.cpp
src/plugins/qtsupport/qtversionmanager.cpp
+5
-9
src/plugins/remotelinux/startgdbserverdialog.cpp
src/plugins/remotelinux/startgdbserverdialog.cpp
+1
-2
src/plugins/tasklist/tasklistplugin.cpp
src/plugins/tasklist/tasklistplugin.cpp
+1
-2
src/plugins/texteditor/codeassist/codeassistant.cpp
src/plugins/texteditor/codeassist/codeassistant.cpp
+2
-2
src/plugins/texteditor/snippets/snippetscollection.cpp
src/plugins/texteditor/snippets/snippetscollection.cpp
+1
-1
src/plugins/texteditor/snippets/snippetssettingspage.cpp
src/plugins/texteditor/snippets/snippetssettingspage.cpp
+2
-2
src/plugins/texteditor/texteditorplugin.cpp
src/plugins/texteditor/texteditorplugin.cpp
+1
-3
src/plugins/texteditor/texteditorsettings.cpp
src/plugins/texteditor/texteditorsettings.cpp
+10
-13
src/plugins/valgrind/valgrindengine.cpp
src/plugins/valgrind/valgrindengine.cpp
+1
-2
src/plugins/vcsbase/vcsbaseeditor.cpp
src/plugins/vcsbase/vcsbaseeditor.cpp
+1
-2
src/plugins/welcome/welcomeplugin.cpp
src/plugins/welcome/welcomeplugin.cpp
+2
-2
No files found.
src/app/main.cpp
View file @
e3c354d8
...
...
@@ -61,6 +61,8 @@
#include <qtsystemexceptionhandler.h>
#endif
using
namespace
ExtensionSystem
;
enum
{
OptionIndent
=
4
,
DescriptionIndent
=
34
};
static
const
char
appNameC
[]
=
"Qt Creator"
;
...
...
@@ -89,7 +91,7 @@ static const char SETTINGS_OPTION[] = "-settingspath";
static
const
char
PID_OPTION
[]
=
"-pid"
;
#endif
typedef
QList
<
ExtensionSystem
::
PluginSpec
*>
PluginSpecSet
;
typedef
QList
<
PluginSpec
*>
PluginSpecSet
;
// Helpers for displaying messages. Note that there is no console on Windows.
#ifdef Q_OS_WIN
...
...
@@ -128,24 +130,23 @@ static void displayError(const QString &t)
#endif
static
void
printVersion
(
const
ExtensionSystem
::
PluginSpec
*
coreplugin
,
const
ExtensionSystem
::
PluginManager
&
pm
)
static
void
printVersion
(
const
PluginSpec
*
coreplugin
)
{
QString
version
;
QTextStream
str
(
&
version
);
str
<<
'\n'
<<
appNameC
<<
' '
<<
coreplugin
->
version
()
<<
" based on Qt "
<<
qVersion
()
<<
"
\n\n
"
;
pm
.
formatPluginVersions
(
str
);
PluginManager
::
formatPluginVersions
(
str
);
str
<<
'\n'
<<
coreplugin
->
copyright
()
<<
'\n'
;
displayHelpText
(
version
);
}
static
void
printHelp
(
const
QString
&
a0
,
const
ExtensionSystem
::
PluginManager
&
pm
)
static
void
printHelp
(
const
QString
&
a0
)
{
QString
help
;
QTextStream
str
(
&
help
);
str
<<
"Usage: "
<<
a0
<<
fixedOptionsC
;
ExtensionSystem
::
PluginManager
::
formatOptions
(
str
,
OptionIndent
,
DescriptionIndent
);
pm
.
formatPluginOptions
(
str
,
OptionIndent
,
DescriptionIndent
);
PluginManager
::
formatOptions
(
str
,
OptionIndent
,
DescriptionIndent
);
PluginManager
::
formatPluginOptions
(
str
,
OptionIndent
,
DescriptionIndent
);
displayHelpText
(
help
);
}
...
...
@@ -264,10 +265,10 @@ int main(int argc, char **argv)
QSettings
*
globalSettings
=
new
QSettings
(
QSettings
::
IniFormat
,
QSettings
::
SystemScope
,
QLatin1String
(
Core
::
Constants
::
IDE_SETTINGSVARIANT_STR
),
QLatin1String
(
"QtCreator"
));
ExtensionSystem
::
PluginManager
pluginManager
;
p
luginManager
.
setFileExtension
(
QLatin1String
(
"pluginspec"
));
p
luginManager
.
setGlobalSettings
(
globalSettings
);
p
luginManager
.
setSettings
(
settings
);
PluginManager
pluginManager
;
P
luginManager
::
setFileExtension
(
QLatin1String
(
"pluginspec"
));
P
luginManager
::
setGlobalSettings
(
globalSettings
);
P
luginManager
::
setSettings
(
settings
);
QTranslator
translator
;
QTranslator
qtTranslator
;
...
...
@@ -323,7 +324,7 @@ int main(int argc, char **argv)
#endif
// Load
const
QStringList
pluginPaths
=
getPluginPaths
();
p
luginManager
.
setPluginPaths
(
pluginPaths
);
P
luginManager
::
setPluginPaths
(
pluginPaths
);
QMap
<
QString
,
QString
>
foundAppOptions
;
if
(
arguments
.
size
()
>
1
)
{
...
...
@@ -338,16 +339,16 @@ int main(int argc, char **argv)
appOptions
.
insert
(
QLatin1String
(
PID_OPTION
),
true
);
#endif
QString
errorMessage
;
if
(
!
p
luginManager
.
parseOptions
(
arguments
,
appOptions
,
&
foundAppOptions
,
&
errorMessage
))
{
if
(
!
P
luginManager
::
parseOptions
(
arguments
,
appOptions
,
&
foundAppOptions
,
&
errorMessage
))
{
displayError
(
errorMessage
);
printHelp
(
QFileInfo
(
app
.
applicationFilePath
()).
baseName
()
,
pluginManager
);
printHelp
(
QFileInfo
(
app
.
applicationFilePath
()).
baseName
());
return
-
1
;
}
}
const
PluginSpecSet
plugins
=
p
luginManager
.
plugins
();
ExtensionSystem
::
PluginSpec
*
coreplugin
=
0
;
foreach
(
ExtensionSystem
::
PluginSpec
*
spec
,
plugins
)
{
const
PluginSpecSet
plugins
=
P
luginManager
::
plugins
();
PluginSpec
*
coreplugin
=
0
;
foreach
(
PluginSpec
*
spec
,
plugins
)
{
if
(
spec
->
name
()
==
QLatin1String
(
corePluginNameC
))
{
coreplugin
=
spec
;
break
;
...
...
@@ -364,14 +365,14 @@ int main(int argc, char **argv)
return
1
;
}
if
(
foundAppOptions
.
contains
(
QLatin1String
(
VERSION_OPTION
)))
{
printVersion
(
coreplugin
,
pluginManager
);
printVersion
(
coreplugin
);
return
0
;
}
if
(
foundAppOptions
.
contains
(
QLatin1String
(
HELP_OPTION1
))
||
foundAppOptions
.
contains
(
QLatin1String
(
HELP_OPTION2
))
||
foundAppOptions
.
contains
(
QLatin1String
(
HELP_OPTION3
))
||
foundAppOptions
.
contains
(
QLatin1String
(
HELP_OPTION4
)))
{
printHelp
(
QFileInfo
(
app
.
applicationFilePath
()).
baseName
()
,
pluginManager
);
printHelp
(
QFileInfo
(
app
.
applicationFilePath
()).
baseName
());
return
0
;
}
...
...
@@ -387,7 +388,7 @@ int main(int argc, char **argv)
#endif
if
(
app
.
isRunning
()
&&
(
pid
!=
-
1
||
foundAppOptions
.
contains
(
QLatin1String
(
CLIENT_OPTION
))))
{
if
(
app
.
sendMessage
(
p
luginManager
.
serializedArguments
(),
5000
/*timeout*/
,
pid
))
if
(
app
.
sendMessage
(
P
luginManager
::
serializedArguments
(),
5000
/*timeout*/
,
pid
))
return
0
;
// Message could not be send, maybe it was in the process of quitting
...
...
@@ -395,7 +396,7 @@ int main(int argc, char **argv)
// Nah app is still running, ask the user
int
button
=
askMsgSendFailed
();
while
(
button
==
QMessageBox
::
Retry
)
{
if
(
app
.
sendMessage
(
p
luginManager
.
serializedArguments
(),
5000
/*timeout*/
,
pid
))
if
(
app
.
sendMessage
(
P
luginManager
::
serializedArguments
(),
5000
/*timeout*/
,
pid
))
return
0
;
if
(
!
app
.
isRunning
(
pid
))
// App quit while we were trying so start a new creator
button
=
QMessageBox
::
Yes
;
...
...
@@ -407,13 +408,13 @@ int main(int argc, char **argv)
}
}
p
luginManager
.
loadPlugins
();
P
luginManager
::
loadPlugins
();
if
(
coreplugin
->
hasError
())
{
displayError
(
msgCoreLoadFailure
(
coreplugin
->
errorString
()));
return
1
;
}
if
(
p
luginManager
.
hasError
())
{
ExtensionSystem
::
PluginErrorOverview
errorOverview
(
&
pluginManager
)
;
if
(
P
luginManager
::
hasError
())
{
PluginErrorOverview
errorOverview
;
errorOverview
.
exec
();
}
...
...
@@ -430,7 +431,7 @@ int main(int argc, char **argv)
#ifdef WITH_TESTS
// Do this after the event loop has started
if
(
p
luginManager
.
runningTests
())
if
(
P
luginManager
::
runningTests
())
QTimer
::
singleShot
(
100
,
&
pluginManager
,
SLOT
(
startTests
()));
#endif
...
...
src/libs/extensionsystem/extensionsystem.pro
View file @
e3c354d8
...
...
@@ -23,7 +23,6 @@ HEADERS += pluginerrorview.h \
pluginspec
.
h
\
pluginspec_p
.
h
\
pluginview
.
h
\
pluginview_p
.
h
\
optionsparser
.
h
\
plugincollection
.
h
\
pluginerroroverview
.
h
...
...
src/libs/extensionsystem/iplugin.cpp
View file @
e3c354d8
...
...
@@ -185,9 +185,8 @@ IPlugin::IPlugin()
*/
IPlugin
::~
IPlugin
()
{
PluginManager
*
pm
=
PluginManager
::
instance
();
foreach
(
QObject
*
obj
,
d
->
addedObjectsInReverseOrder
)
pm
->
removeObject
(
obj
);
PluginManager
::
removeObject
(
obj
);
qDeleteAll
(
d
->
addedObjectsInReverseOrder
);
d
->
addedObjectsInReverseOrder
.
clear
();
delete
d
;
...
...
@@ -211,7 +210,7 @@ PluginSpec *IPlugin::pluginSpec() const
*/
void
IPlugin
::
addObject
(
QObject
*
obj
)
{
PluginManager
::
instance
()
->
addObject
(
obj
);
PluginManager
::
addObject
(
obj
);
}
/*!
...
...
@@ -227,7 +226,7 @@ void IPlugin::addObject(QObject *obj)
void
IPlugin
::
addAutoReleasedObject
(
QObject
*
obj
)
{
d
->
addedObjectsInReverseOrder
.
prepend
(
obj
);
PluginManager
::
instance
()
->
addObject
(
obj
);
PluginManager
::
addObject
(
obj
);
}
/*!
...
...
@@ -237,6 +236,6 @@ void IPlugin::addAutoReleasedObject(QObject *obj)
*/
void
IPlugin
::
removeObject
(
QObject
*
obj
)
{
PluginManager
::
instance
()
->
removeObject
(
obj
);
PluginManager
::
removeObject
(
obj
);
}
src/libs/extensionsystem/pluginerroroverview.cpp
View file @
e3c354d8
...
...
@@ -44,7 +44,7 @@ class PluginErrorOverviewPrivate : public QObject
{
Q_OBJECT
public:
PluginErrorOverviewPrivate
(
PluginManager
*
manager
,
QDialog
*
dialog
);
PluginErrorOverviewPrivate
(
QDialog
*
dialog
);
~
PluginErrorOverviewPrivate
();
private
slots
:
...
...
@@ -52,7 +52,6 @@ private slots:
private:
Ui
::
PluginErrorOverview
*
m_ui
;
PluginManager
*
m_manager
;
};
}
// Internal
...
...
@@ -61,9 +60,9 @@ private:
using
namespace
ExtensionSystem
;
using
namespace
ExtensionSystem
::
Internal
;
PluginErrorOverview
::
PluginErrorOverview
(
PluginManager
*
manager
,
QWidget
*
parent
)
:
PluginErrorOverview
::
PluginErrorOverview
(
QWidget
*
parent
)
:
QDialog
(
parent
),
d
(
new
PluginErrorOverviewPrivate
(
manager
,
this
))
d
(
new
PluginErrorOverviewPrivate
(
this
))
{
}
...
...
@@ -72,14 +71,13 @@ PluginErrorOverview::~PluginErrorOverview()
delete
d
;
}
PluginErrorOverviewPrivate
::
PluginErrorOverviewPrivate
(
PluginManager
*
manager
,
QDialog
*
dialog
)
:
m_ui
(
new
Ui
::
PluginErrorOverview
),
m_manager
(
manager
)
PluginErrorOverviewPrivate
::
PluginErrorOverviewPrivate
(
QDialog
*
dialog
)
:
m_ui
(
new
Ui
::
PluginErrorOverview
)
{
m_ui
->
setupUi
(
dialog
);
m_ui
->
buttonBox
->
addButton
(
tr
(
"Continue"
),
QDialogButtonBox
::
AcceptRole
);
foreach
(
PluginSpec
*
spec
,
m_m
anager
->
plugins
())
{
foreach
(
PluginSpec
*
spec
,
PluginM
anager
::
plugins
())
{
// only show errors on startup if plugin is enabled.
if
(
spec
->
hasError
()
&&
spec
->
isEnabled
()
&&
!
spec
->
isDisabledIndirectly
())
{
QListWidgetItem
*
item
=
new
QListWidgetItem
(
spec
->
name
());
...
...
src/libs/extensionsystem/pluginerroroverview.h
View file @
e3c354d8
...
...
@@ -50,7 +50,7 @@ class EXTENSIONSYSTEM_EXPORT PluginErrorOverview : public QDialog
Q_OBJECT
public:
explicit
PluginErrorOverview
(
PluginManager
*
manager
,
QWidget
*
parent
=
0
);
explicit
PluginErrorOverview
(
QWidget
*
parent
=
0
);
~
PluginErrorOverview
();
private:
...
...
src/libs/extensionsystem/pluginmanager.cpp
View file @
e3c354d8
...
...
@@ -290,7 +290,7 @@ PluginManager::~PluginManager()
*/
void
PluginManager
::
addObject
(
QObject
*
obj
)
{
d
->
addObject
(
obj
);
m_instance
->
d
->
addObject
(
obj
);
}
/*!
...
...
@@ -300,7 +300,7 @@ void PluginManager::addObject(QObject *obj)
*/
void
PluginManager
::
removeObject
(
QObject
*
obj
)
{
d
->
removeObject
(
obj
);
m_instance
->
d
->
removeObject
(
obj
);
}
/*!
...
...
@@ -310,9 +310,9 @@ void PluginManager::removeObject(QObject *obj)
\sa PluginManager::getObject()
\sa PluginManager::getObjects()
*/
QList
<
QObject
*>
PluginManager
::
allObjects
()
const
QList
<
QObject
*>
PluginManager
::
allObjects
()
{
return
d
->
allObjects
;
return
m_instance
->
d
->
allObjects
;
}
/*!
...
...
@@ -326,7 +326,7 @@ QList<QObject *> PluginManager::allObjects() const
*/
void
PluginManager
::
loadPlugins
()
{
return
d
->
loadPlugins
();
return
m_instance
->
d
->
loadPlugins
();
}
/*!
...
...
@@ -334,7 +334,7 @@ void PluginManager::loadPlugins()
Returns true if any plugin has errors even though it is enabled.
Most useful to call after loadPlugins().
*/
bool
PluginManager
::
hasError
()
const
bool
PluginManager
::
hasError
()
{
foreach
(
PluginSpec
*
spec
,
plugins
())
{
// only show errors on startup if plugin is enabled.
...
...
@@ -360,9 +360,9 @@ void PluginManager::shutdown()
\sa setPluginPaths()
*/
QStringList
PluginManager
::
pluginPaths
()
const
QStringList
PluginManager
::
pluginPaths
()
{
return
d
->
pluginPaths
;
return
m_instance
->
d
->
pluginPaths
;
}
/*!
...
...
@@ -376,7 +376,7 @@ QStringList PluginManager::pluginPaths() const
*/
void
PluginManager
::
setPluginPaths
(
const
QStringList
&
paths
)
{
d
->
setPluginPaths
(
paths
);
m_instance
->
d
->
setPluginPaths
(
paths
);
}
/*!
...
...
@@ -386,9 +386,9 @@ void PluginManager::setPluginPaths(const QStringList &paths)
\sa setFileExtension()
*/
QString
PluginManager
::
fileExtension
()
const
QString
PluginManager
::
fileExtension
()
{
return
d
->
extension
;
return
m_instance
->
d
->
extension
;
}
/*!
...
...
@@ -400,7 +400,7 @@ QString PluginManager::fileExtension() const
*/
void
PluginManager
::
setFileExtension
(
const
QString
&
extension
)
{
d
->
extension
=
extension
;
m_instance
->
d
->
extension
=
extension
;
}
/*!
...
...
@@ -409,7 +409,7 @@ void PluginManager::setFileExtension(const QString &extension)
*/
void
PluginManager
::
setSettings
(
QSettings
*
settings
)
{
d
->
setSettings
(
settings
);
m_instance
->
d
->
setSettings
(
settings
);
}
/*!
...
...
@@ -418,28 +418,28 @@ void PluginManager::setSettings(QSettings *settings)
*/
void
PluginManager
::
setGlobalSettings
(
QSettings
*
settings
)
{
d
->
setGlobalSettings
(
settings
);
m_instance
->
d
->
setGlobalSettings
(
settings
);
}
/*!
Returns the user specific settings used for information about enabled/disabled plugins.
*/
QSettings
*
PluginManager
::
settings
()
const
QSettings
*
PluginManager
::
settings
()
{
return
d
->
settings
;
return
m_instance
->
d
->
settings
;
}
/*!
Returns the global (user-independent) settings used for information about default disabled plugins.
*/
QSettings
*
PluginManager
::
globalSettings
()
const
QSettings
*
PluginManager
::
globalSettings
()
{
return
d
->
globalSettings
;
return
m_instance
->
d
->
globalSettings
;
}
void
PluginManager
::
writeSettings
()
{
d
->
writeSettings
();
m_instance
->
d
->
writeSettings
();
}
/*!
...
...
@@ -447,9 +447,9 @@ void PluginManager::writeSettings()
The arguments left over after parsing (Neither startup nor plugin
arguments). Typically, this will be the list of files to open.
*/
QStringList
PluginManager
::
arguments
()
const
QStringList
PluginManager
::
arguments
()
{
return
d
->
arguments
;
return
m_instance
->
d
->
arguments
;
}
/*!
...
...
@@ -462,14 +462,14 @@ QStringList PluginManager::arguments() const
\sa setPluginPaths()
*/
QList
<
PluginSpec
*>
PluginManager
::
plugins
()
const
QList
<
PluginSpec
*>
PluginManager
::
plugins
()
{
return
d
->
pluginSpecs
;
return
m_instance
->
d
->
pluginSpecs
;
}
QHash
<
QString
,
PluginCollection
*>
PluginManager
::
pluginCollections
()
const
QHash
<
QString
,
PluginCollection
*>
PluginManager
::
pluginCollections
()
{
return
d
->
pluginCategories
;
return
m_instance
->
d
->
pluginCategories
;
}
/*!
...
...
@@ -485,7 +485,7 @@ QHash<QString, PluginCollection *> PluginManager::pluginCollections() const
static
const
char
argumentKeywordC
[]
=
":arguments"
;
QString
PluginManager
::
serializedArguments
()
const
QString
PluginManager
::
serializedArguments
()
{
const
QChar
separator
=
QLatin1Char
(
'|'
);
QString
rc
;
...
...
@@ -499,13 +499,13 @@ QString PluginManager::serializedArguments() const
rc
+=
ps
->
arguments
().
join
(
QString
(
separator
));
}
}
if
(
!
d
->
arguments
.
isEmpty
())
{
if
(
!
m_instance
->
d
->
arguments
.
isEmpty
())
{
if
(
!
rc
.
isEmpty
())
rc
+=
separator
;
rc
+=
QLatin1String
(
argumentKeywordC
);
// If the argument appears to be a file, make it absolute
// when sending to another instance.
foreach
(
const
QString
&
argument
,
d
->
arguments
)
{
foreach
(
const
QString
&
argument
,
m_instance
->
d
->
arguments
)
{
rc
+=
separator
;
const
QFileInfo
fi
(
argument
);
if
(
fi
.
exists
()
&&
fi
.
isRelative
())
{
...
...
@@ -578,7 +578,7 @@ bool PluginManager::parseOptions(const QStringList &args,
QMap
<
QString
,
QString
>
*
foundAppOptions
,
QString
*
errorString
)
{
OptionsParser
options
(
args
,
appOptions
,
foundAppOptions
,
errorString
,
d
);
OptionsParser
options
(
args
,
appOptions
,
foundAppOptions
,
errorString
,
m_instance
->
d
);
return
options
.
parse
();
}
...
...
@@ -633,12 +633,12 @@ void PluginManager::formatOptions(QTextStream &str, int optionIndentation, int d
Format the plugin options of the plugin specs for command line help.
*/
void
PluginManager
::
formatPluginOptions
(
QTextStream
&
str
,
int
optionIndentation
,
int
descriptionIndentation
)
const
void
PluginManager
::
formatPluginOptions
(
QTextStream
&
str
,
int
optionIndentation
,
int
descriptionIndentation
)
{
typedef
PluginSpec
::
PluginArgumentDescriptions
PluginArgumentDescriptions
;
// Check plugins for options
const
PluginSpecSet
::
const_iterator
pcend
=
d
->
pluginSpecs
.
constEnd
();
for
(
PluginSpecSet
::
const_iterator
pit
=
d
->
pluginSpecs
.
constBegin
();
pit
!=
pcend
;
++
pit
)
{
const
PluginSpecSet
::
const_iterator
pcend
=
m_instance
->
d
->
pluginSpecs
.
constEnd
();
for
(
PluginSpecSet
::
const_iterator
pit
=
m_instance
->
d
->
pluginSpecs
.
constBegin
();
pit
!=
pcend
;
++
pit
)
{
const
PluginArgumentDescriptions
pargs
=
(
*
pit
)
->
argumentDescriptions
();
if
(
!
pargs
.
empty
())
{
str
<<
"
\n
Plugin: "
<<
(
*
pit
)
->
name
()
<<
'\n'
;
...
...
@@ -655,10 +655,10 @@ void PluginManager::formatPluginOptions(QTextStream &str, int optionIndentation,
Format the version of the plugin specs for command line help.
*/
void
PluginManager
::
formatPluginVersions
(
QTextStream
&
str
)
const
void
PluginManager
::
formatPluginVersions
(
QTextStream
&
str
)
{
const
PluginSpecSet
::
const_iterator
cend
=
d
->
pluginSpecs
.
constEnd
();
for
(
PluginSpecSet
::
const_iterator
it
=
d
->
pluginSpecs
.
constBegin
();
it
!=
cend
;
++
it
)
{
const
PluginSpecSet
::
const_iterator
cend
=
m_instance
->
d
->
pluginSpecs
.
constEnd
();
for
(
PluginSpecSet
::
const_iterator
it
=
m_instance
->
d
->
pluginSpecs
.
constBegin
();
it
!=
cend
;
++
it
)
{
const
PluginSpec
*
ps
=
*
it
;
str
<<
" "
<<
ps
->
name
()
<<
' '
<<
ps
->
version
()
<<
' '
<<
ps
->
description
()
<<
'\n'
;
}
...
...
@@ -699,16 +699,16 @@ void PluginManager::startTests()
* \fn bool PluginManager::runningTests() const
* \internal
*/
bool
PluginManager
::
runningTests
()
const
bool
PluginManager
::
runningTests
()
{
return
!
d
->
testSpecs
.
isEmpty
();
return
!
m_instance
->
d
->
testSpecs
.
isEmpty
();
}
/*!
* \fn QString PluginManager::testDataDirectory() const
* \internal
*/
QString
PluginManager
::
testDataDirectory
()
const
QString
PluginManager
::
testDataDirectory
()
{
QByteArray
ba
=
qgetenv
(
"QTCREATOR_TEST_DIR"
);
QString
s
=
QString
::
fromLocal8Bit
(
ba
.
constData
(),
ba
.
size
());
...
...
@@ -728,7 +728,7 @@ QString PluginManager::testDataDirectory() const
void
PluginManager
::
profilingReport
(
const
char
*
what
,
const
PluginSpec
*
spec
)
{
d
->
profilingReport
(
what
,
spec
);
m_instance
->
d
->
profilingReport
(
what
,
spec
);
}
...
...
@@ -739,7 +739,7 @@ void PluginManager::profilingReport(const char *what, const PluginSpec *spec)
*/
QList
<
PluginSpec
*>
PluginManager
::
loadQueue
()
{
return
d
->
loadQueue
();
return
m_instance
->
d
->
loadQueue
();
}
//============PluginManagerPrivate===========
...
...
@@ -1286,9 +1286,9 @@ void PluginManagerPrivate::profilingReport(const char *what, const PluginSpec *s
\sa addObject()
*/
QObject
*
PluginManager
::
getObjectByName
(
const
QString
&
name
)
const
QObject
*
PluginManager
::
getObjectByName
(
const
QString
&
name
)
{
QReadLocker
lock
(
&
m_lock
);
QReadLocker
lock
(
&
m_
instance
->
m_
lock
);
QList
<
QObject
*>
all
=
allObjects
();
foreach
(
QObject
*
obj
,
all
)
{
if
(
obj
->
objectName
()
==
name
)
...
...
@@ -1303,10 +1303,10 @@ QObject *PluginManager::getObjectByName(const QString &name) const
\sa addObject()
*/
QObject
*
PluginManager
::
getObjectByClassName
(
const
QString
&
className
)
const
QObject
*
PluginManager
::
getObjectByClassName
(
const
QString
&
className
)
{
const
QByteArray
ba
=
className
.
toUtf8
();
QReadLocker
lock
(
&
m_lock
);
QReadLocker
lock
(
&
m_
instance
->
m_
lock
);
QList
<
QObject
*>
all
=
allObjects
();
foreach
(
QObject
*
obj
,
all
)
{
if
(
obj
->
inherits
(
ba
.
constData
()))
...
...
src/libs/extensionsystem/pluginmanager.h
View file @
e3c354d8
...
...
@@ -66,12 +66,12 @@ public:
virtual
~
PluginManager
();
// Object pool operations
void
addObject
(
QObject
*
obj
);
void
removeObject
(
QObject
*
obj
);
QList
<
QObject
*>
allObjects
()
const
;
template
<
typename
T
>
QList
<
T
*>
getObjects
()
const
static
void
addObject
(
QObject
*
obj
);
static
void
removeObject
(
QObject
*
obj
);
static
QList
<
QObject
*>
allObjects
();
template
<
typename
T
>
static
QList
<
T
*>
getObjects
()
{
QReadLocker
lock
(
&
m_lock
);
QReadLocker
lock
(
&
m_
instance
->
m_
lock
);
QList
<
T
*>
results
;
QList
<
QObject
*>
all
=
allObjects
();
QList
<
T
*>
result
;
...
...
@@ -82,9 +82,9 @@ public:
}
return
results
;
}
template
<
typename
T
>
T
*
getObject
()
const
template
<
typename
T
>
static
T
*
getObject
()
{
QReadLocker
lock
(
&
m_lock
);
QReadLocker
lock
(
&
m_
instance
->
m_
lock
);
QList
<
QObject
*>
all
=
allObjects
();
T
*
result
=
0
;
foreach
(
QObject
*
obj
,
all
)
{
...
...
@@ -94,43 +94,43 @@ public:
return
result
;
}
QObject
*
getObjectByName
(
const
QString
&
name
)
const
;
QObject
*
getObjectByClassName
(
const
QString
&
className
)
const
;
static
QObject
*
getObjectByName
(
const
QString
&
name
);
static
QObject
*
getObjectByClassName
(
const
QString
&
className
);
// Plugin operations
QList
<
PluginSpec
*>
loadQueue
();
void
loadPlugins
();
QStringList
pluginPaths
()
const
;
void
setPluginPaths
(
const
QStringList
&
paths
);
QList
<
PluginSpec
*>
plugins
()
const
;