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

20
src/plugins/coreplugin/id.cpp
View File

@@ -54,7 +54,7 @@ namespace Core {
and associated with a plain 7-bit-clean ASCII name used
for display and persistency.
Each plugin that is distributed as part of Qt Creator has a
Each plugin that is distributed as part of \QC has a
private range of 10000 UIDs that are guaranteed to be unique.
Third party plugins are advised to construct ids from their
@@ -137,10 +137,10 @@ static int theId(const QByteArray &ba)
/*!
\fn Core::Id::Id(int uid)
\brief Constructs an id given a UID.
Constructs an id given \a UID.
The UID is an integer value that is unique within the running
Qt Creator process.
\QC process.
It is the callers responsibility to ensure the uniqueness of
the passed integer. The recommended approach is to use
@@ -152,9 +152,9 @@ static int theId(const QByteArray &ba)
*/
/*!
Constructs an id given its associated name. The internal
Constructs an id given its associated \a name. The internal
representation will be unspecified, but consistent within a
Qt Creator process.
\QC process.
*/
Id::Id(const char *name)
@@ -248,7 +248,7 @@ Id Id::fromSetting(const QVariant &variant)
This can be used to construct groups of ids logically
belonging together. The associated internal name
will be generated by appending \c{suffix}.
will be generated by appending \a suffix.
*/
Id Id::withSuffix(int suffix) const
@@ -284,7 +284,7 @@ Id Id::withSuffix(const QString &suffix) const
This can be used to construct groups of ids logically
belonging together. The associated internal name
will be generated by prepending \c{prefix}.
will be generated by prepending \a prefix.
*/
Id Id::withPrefix(const char *prefix) const
@@ -332,9 +332,9 @@ bool Id::alphabeticallyBefore(Id other) const
/*!
Convenience function to extract a part of the id string
representation. This can be used to split off the base
part used when generating an id with \c{withSuffix()}.
Extracts a part of the id string
representation. This function can be used to split off the base
part specified by \a baseId used when generating an id with \c{withSuffix()}.
\sa withSuffix()
*/