feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.8'

Browse Source 
Conflicts:
	src/libs/extensionsystem/pluginmanager.cpp
	src/libs/extensionsystem/pluginspec.cpp
	src/plugins/coreplugin/basefilewizard.cpp
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/coreplugin/editormanager/ieditor.cpp
	src/plugins/coreplugin/externaltool.cpp
	src/plugins/coreplugin/icore.cpp
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/find/ifindfilter.cpp
	src/plugins/projectexplorer/buildstep.cpp
	src/plugins/projectexplorer/devicesupport/idevice.cpp
	src/plugins/projectexplorer/runconfiguration.cpp
	src/plugins/vcsbase/vcsbaseeditor.cpp
	tests/system/suite_debugger/tst_simple_analyze/test.py

Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
This commit is contained in:
Eike Ziller
2013-09-27 10:44:32 +02:00
parent 19c735a491 a12a9f491c
commit 63ff745213
133 changed files with 1386 additions and 1326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/libs/extensionsystem/pluginmanager.cpp
View File

@@ -88,19 +88,20 @@ enum { debugLeaks = 0 };
\endlist
\section1 Plugins
Plugins consist of an xml descriptor file, and of a library that contains a Qt plugin
Plugins consist of an XML descriptor file, and of a library that contains a Qt plugin
(declared via Q_EXPORT_PLUGIN) that must derive from the IPlugin class.
The plugin manager is used to set a list of file system directories to search for
plugins, retrieve information about the state of these plugins, and to load them.
Usually the application creates a PluginManager instance and initiates the loading.
Usually, the application creates a PluginManager instance and initiates the
loading.
\code
// 'plugins' and subdirs will be searched for plugins
ExtensionSystem::PluginManager::setPluginPaths(QStringList() << "plugins");
ExtensionSystem::PluginManager::loadPlugins(); // try to load all the plugins
\endcode
Additionally it is possible to directly access to the plugin specifications
(the information in the descriptor file), and the plugin instances (via PluginSpec),
Additionally, it is possible to directly access the plugin specifications
(the information in the descriptor file), the plugin instances (via PluginSpec),
and their state.
\section1 Object Pool
@@ -199,17 +200,17 @@ enum { debugLeaks = 0 };
/*!
\fn void PluginManager::objectAdded(QObject *obj)
Signal that \a obj has been added to the object pool.
Signals that \a obj has been added to the object pool.
*/
/*!
\fn void PluginManager::aboutToRemoveObject(QObject *obj)
Signal that \a obj will be removed from the object pool.
Signals that \a obj will be removed from the object pool.
*/
/*!
\fn void PluginManager::pluginsChanged()
Signal that the list of available plugins has changed.
Signals that the list of available plugins has changed.
\sa plugins()
*/
@@ -217,9 +218,10 @@ enum { debugLeaks = 0 };
/*!
\fn T *PluginManager::getObject()
Retrieve the object of a given type from the object pool.
This method is aware of Aggregation::Aggregate, i.e. it uses
the Aggregation::query methods instead of qobject_cast to
Retrieves the object of a given type from the object pool.
This method is aware of Aggregation::Aggregate. That is, it uses
the \c Aggregation::query methods instead of \c qobject_cast to
determine the type of an object.
If there are more than one object of the given type in
the object pool, this method will choose an arbitrary one of them.
@@ -229,9 +231,11 @@ enum { debugLeaks = 0 };
/*!
\fn QList<T *> PluginManager::getObjects()
Retrieve all objects of a given type from the object pool.
This method is aware of Aggregation::Aggregate, i.e. it uses
the Aggregation::query methods instead of qobject_cast to
Retrieves all objects of a given type from the object pool.
This method is aware of Aggregation::Aggregate. That is, it uses
the \c Aggregation::query methods instead of \c qobject_cast to
determine the type of an object.
\sa addObject()
@@ -249,7 +253,7 @@ static bool lessThanByPluginName(const PluginSpec *one, const PluginSpec *two)
}
/*!
Get the unique plugin manager instance.
Gets the unique plugin manager instance.
*/
PluginManager *PluginManager::instance()
{
@@ -257,7 +261,7 @@ PluginManager *PluginManager::instance()
}
/*!
Create a plugin manager. Should be done only once per application.
Creates a plugin manager. Should be done only once per application.
*/
PluginManager::PluginManager()
{
@@ -275,7 +279,9 @@ PluginManager::~PluginManager()
}
/*!
Add the given object \a obj to the object pool, so it can be retrieved again from the pool by type.
Adds the object \a obj to the object pool, so it can be retrieved
again from the pool by type.
The plugin manager does not do any memory management - added objects
must be removed from the pool and deleted manually by whoever is responsible for the object.
@@ -300,8 +306,10 @@ void PluginManager::removeObject(QObject *obj)
}
/*!
Retrieve the list of all objects in the pool, unfiltered.
Usually clients do not need to call this.
Retrieves the list of all objects in the pool, unfiltered.
Usually, clients do not need to call this function.
\sa PluginManager::getObject()
\sa PluginManager::getObjects()
*/
@@ -396,7 +404,8 @@ void PluginManager::setFileExtension(const QString &extension)
}
/*!
Define the user specific settings to use for information about enabled/disabled plugins.
Defines the user specific settings to use for information about enabled and
disabled plugins.
Needs to be set before the plugin search path is set with setPluginPaths().
*/
void PluginManager::setSettings(QSettings *settings)
@@ -405,7 +414,8 @@ void PluginManager::setSettings(QSettings *settings)
}
/*!
Define the global (user-independent) settings to use for information about default disabled plugins.
Defines the global (user-independent) settings to use for information about
default disabled plugins.
Needs to be set before the plugin search path is set with setPluginPaths().
*/
void PluginManager::setGlobalSettings(QSettings *settings)
@@ -414,7 +424,8 @@ void PluginManager::setGlobalSettings(QSettings *settings)
}
/*!
Returns the user specific settings used for information about enabled/disabled plugins.
Returns the user specific settings used for information about enabled and
disabled plugins.
*/
QSettings *PluginManager::settings()
{
@@ -435,7 +446,7 @@ void PluginManager::writeSettings()
}
/*!
The arguments left over after parsing (Neither startup nor plugin
The arguments left over after parsing (that were neither startup nor plugin
arguments). Typically, this will be the list of files to open.
*/
QStringList PluginManager::arguments()
@@ -465,7 +476,7 @@ QHash<QString, PluginCollection *> PluginManager::pluginCollections()
static const char argumentKeywordC[] = ":arguments";
/*!
Serialize plugin options and arguments for sending in a single string
Serializes plugin options and arguments for sending in a single string
via QtSingleApplication:
":myplugin|-option1|-option2|:arguments|argument1|argument2",
as a list of lists started by a keyword with a colon. Arguments are last.
@@ -599,7 +610,7 @@ static inline void formatOption(QTextStream &str,
}
/*!
Format the startup options of the plugin manager for command line help.
Formats the startup options of the plugin manager for command line help.
*/
void PluginManager::formatOptions(QTextStream &str, int optionIndentation, int descriptionIndentation)
@@ -625,7 +636,7 @@ void PluginManager::formatOptions(QTextStream &str, int optionIndentation, int d
}
/*!
Format the plugin options of the plugin specs for command line help.
Formats the plugin options of the plugin specs for command line help.
*/
void PluginManager::formatPluginOptions(QTextStream &str, int optionIndentation, int descriptionIndentation)
@@ -645,7 +656,7 @@ void PluginManager::formatPluginOptions(QTextStream &str, int optionIndentation,
}
/*!
Format the version of the plugin specs for command line help.
Formats the version of the plugin specs for command line help.
*/
void PluginManager::formatPluginVersions(QTextStream &str)
{
@@ -762,7 +773,8 @@ QString PluginManager::testDataDirectory()
}
/*!
Create a profiling entry showing the elapsed time if profiling is activated.
Creates a profiling entry showing the elapsed time if profiling is
activated.
*/
void PluginManager::profilingReport(const char *what, const PluginSpec *spec)
@@ -1403,7 +1415,7 @@ QString PluginManager::platformName()
}
/*!
\brief Retrieves one object with a given name from the object pool.
Retrieves one object with \a name from the object pool.
\sa addObject()
*/
@@ -1419,7 +1431,8 @@ QObject *PluginManager::getObjectByName(const QString &name)
}
/*!
Retrieves one object inheriting a class with a given name from the object pool.
Retrieves one object inheriting a class with \a className from the object
pool.
\sa addObject()
*/