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

Kit: Allow creation of kits with a given id

Browse Source 
This is to avoid creating lots of Core::Ids due to temporary kits,
etc.

Change-Id: Id786e3412aadae7a594f6caf64d0dd364744d296
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2012-10-11 11:40:56 +02:00
parent 88f362aa75
commit 7a37897f79
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/projectexplorer/kit.cpp
View File

@@ -78,11 +78,14 @@ namespace Internal {
class KitPrivate class KitPrivate
{ {
public: public:
KitPrivate() : KitPrivate(Core::Id id) :
m_id(QUuid::createUuid().toString().toLatin1().constData()), m_id(id),
m_autodetected(false), m_autodetected(false),
m_isValid(true) m_isValid(true)
{ } {
if (!id.isValid())
m_id = Core::Id(QUuid::createUuid().toString().toLatin1().constData());
}
QString m_displayName; QString m_displayName;
Core::Id m_id; Core::Id m_id;
@@ -100,8 +103,8 @@ public:
// Kit: // Kit:
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
Kit::Kit() : Kit::Kit(Core::Id id) :
d(new Internal::KitPrivate) d(new Internal::KitPrivate(id))
{ {
KitManager *stm = KitManager::instance(); KitManager *stm = KitManager::instance();
foreach (KitInformation *sti, stm->kitInformation()) foreach (KitInformation *sti, stm->kitInformation())

2
src/plugins/projectexplorer/kit.h
View File

@@ -55,7 +55,7 @@ class KitPrivate;
class PROJECTEXPLORER_EXPORT Kit class PROJECTEXPLORER_EXPORT Kit
{ {
public: public:
Kit(); Kit(Core::Id id = Core::Id());
~Kit(); ~Kit();
bool isValid() const; bool isValid() const;