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

KitManager: Use static API as other singletons do

Browse Source 
Change-Id: Ia49c6552a5aae72870687ef9c64f2642fbe24155
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Tobias Hunger
2013-08-21 12:48:46 +02:00
parent 6ee2d554e1
commit 95859289b8
38 changed files with 160 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidconfigurations.cpp
View File

@@ -744,7 +744,7 @@ void AndroidConfigurations::updateAutomaticKitList()
QList<Kit *> existingKits;
foreach (ProjectExplorer::Kit *k, ProjectExplorer::KitManager::instance()->kits()) {
foreach (ProjectExplorer::Kit *k, ProjectExplorer::KitManager::kits()) {
if (ProjectExplorer::DeviceKitInformation::deviceId(k) != Core::Id(Constants::ANDROID_DEVICE_ID))
continue;
if (!k->isAutoDetected())
@@ -805,7 +805,7 @@ void AndroidConfigurations::updateAutomaticKitList()
}
foreach (Kit *k, existingKits)
KitManager::instance()->deregisterKit(k);
KitManager::deregisterKit(k);
foreach (Kit *kit, newKits) {
AndroidToolChain *tc = static_cast<AndroidToolChain *>(ToolChainKitInformation::toolChain(kit));
@@ -814,7 +814,7 @@ void AndroidConfigurations::updateAutomaticKitList()
.arg(qt->targetArch())
.arg(tc->ndkToolChainVersion())
.arg(qt->qtVersionString()));
KitManager::instance()->registerKit(kit);
KitManager::registerKit(kit);
}
}

2
src/plugins/android/androidplugin.cpp
View File

@@ -77,7 +77,7 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
addAutoReleasedObject(new Internal::AndroidToolChainFactory);
addAutoReleasedObject(new Internal::AndroidDeployConfigurationFactory);
addAutoReleasedObject(new Internal::AndroidDeviceFactory);
ProjectExplorer::KitManager::instance()->registerKitInformation(new Internal::AndroidGdbServerKitInformation);
ProjectExplorer::KitManager::registerKitInformation(new Internal::AndroidGdbServerKitInformation);
// AndroidManifest.xml editor
Core::MimeGlobPattern androidManifestGlobPattern(QLatin1String("AndroidManifest.xml"), Core::MimeGlobPattern::MaxWeight);

2
src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
View File

@@ -157,7 +157,7 @@ bool AutotoolsProject::fromMap(const QVariantMap &map)
// Load the project tree structure.
loadProjectTree();
Kit *defaultKit = KitManager::instance()->defaultKit();
Kit *defaultKit = KitManager::defaultKit();
if (!activeTarget() && defaultKit)
addTarget(createTarget(defaultKit));

8
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
View File

@@ -292,8 +292,7 @@ bool CMakeOpenProjectWizard::compatibleKitExist() const
bool hasNinjaGenerator = m_cmakeManager->hasCodeBlocksNinjaGenerator();
bool preferNinja = m_cmakeManager->preferNinja();
QList<ProjectExplorer::Kit *> kitList =
ProjectExplorer::KitManager::instance()->kits();
QList<ProjectExplorer::Kit *> kitList = ProjectExplorer::KitManager::kits();
foreach (ProjectExplorer::Kit *k, kitList) {
// OfferNinja and ForceNinja differ in what they return
@@ -665,8 +664,7 @@ void CMakeRunPage::initializePage()
QByteArray cachedGenerator = cachedGeneratorFromFile(m_buildDirectory + QLatin1String("/CMakeCache.txt"));
m_generatorComboBox->show();
QList<ProjectExplorer::Kit *> kitList =
ProjectExplorer::KitManager::instance()->kits();
QList<ProjectExplorer::Kit *> kitList = ProjectExplorer::KitManager::kits();
int defaultIndex = 0;
foreach (ProjectExplorer::Kit *k, kitList) {
@@ -675,7 +673,7 @@ void CMakeRunPage::initializePage()
preferNinja,
hasCodeBlocksGenerator);
if (k == ProjectExplorer::KitManager::instance()->defaultKit())
if (k == ProjectExplorer::KitManager::defaultKit())
defaultIndex = m_generatorComboBox->count();
foreach (const GeneratorInfo &info, infos)

2
src/plugins/debugger/debuggerdialogs.cpp
View File

@@ -184,7 +184,7 @@ QString StartApplicationParameters::displayName() const
name += QLatin1String("...");
}
if (Kit *kit = KitManager::instance()->find(kitId))
if (Kit *kit = KitManager::find(kitId))
name += QString::fromLatin1(" (%1)").arg(kit->displayName());
return name;

14
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -593,12 +593,12 @@ public:
#ifdef Q_OS_WIN
if (Utils::winIs64BitSystem()) {
CdbMatcher matcher64(64);
if (Kit *cdb64Kit = KitManager::instance()->find(&matcher64))
if (Kit *cdb64Kit = KitManager::find(&matcher64))
return cdb64Kit;
}
#endif
CdbMatcher matcher;
return KitManager::instance()->find(&matcher);
return KitManager::find(&matcher);
}
private:
@@ -625,14 +625,14 @@ bool fillParameters(DebuggerStartParameters *sp, const Kit *kit, QString *errorM
}
if (!abis.isEmpty()) {
AbiKitMatcher matcher(abis);
kit = KitManager::instance()->find(&matcher);
kit = KitManager::find(&matcher);
if (!kit) {
CompatibleAbiKitMatcher matcher(abis);
kit = KitManager::instance()->find(&matcher);
kit = KitManager::find(&matcher);
}
}
if (!kit)
kit = KitManager::instance()->defaultKit();
kit = KitManager::defaultKit();
}
// Verify that debugger and profile are valid
@@ -1427,7 +1427,7 @@ bool DebuggerPluginPrivate::parseArgument(QStringList::const_iterator &it,
sp.displayName = tr("Core file \"%1\"").arg(sp.coreFile);
sp.startMessage = tr("Attaching to core file %1.").arg(sp.coreFile);
} else if (key == QLatin1String("kit")) {
kit = KitManager::instance()->find(Id::fromString(val));
kit = KitManager::find(Id::fromString(val));
}
}
}
@@ -3436,7 +3436,7 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
mstart->addSeparator(globalcontext, Constants::G_GENERAL);
mstart->addSeparator(globalcontext, Constants::G_SPECIAL);
KitManager::instance()->registerKitInformation(new DebuggerKitInformation);
KitManager::registerKitInformation(new DebuggerKitInformation);
return theDebuggerCore->initialize(arguments, errorMessage);
}

2
src/plugins/debugger/debuggerrunner.cpp
View File

@@ -335,7 +335,7 @@ static DebuggerStartParameters localStartParameters(RunConfiguration *runConfigu
return sp;
Target *target = runConfiguration->target();
Kit *kit = target ? target->kit() : KitManager::instance()->defaultKit();
Kit *kit = target ? target->kit() : KitManager::defaultKit();
if (!fillParameters(&sp, kit, errorMessage))
return sp;
sp.environment = environment->environment();

4
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -248,7 +248,7 @@ void GenericProject::refresh(RefreshOptions options)
pinfo.clearProjectParts();
CppTools::ProjectPart::Ptr part(new CppTools::ProjectPart);
Kit *k = activeTarget() ? activeTarget()->kit() : KitManager::instance()->defaultKit();
Kit *k = activeTarget() ? activeTarget()->kit() : KitManager::defaultKit();
if (ToolChain *tc = ToolChainKitInformation::toolChain(k)) {
QStringList cxxflags; // FIXME: Can we do better?
part->evaluateToolchain(tc, cxxflags, cxxflags,
@@ -408,7 +408,7 @@ bool GenericProject::fromMap(const QVariantMap &map)
if (!Project::fromMap(map))
return false;
Kit *defaultKit = KitManager::instance()->defaultKit();
Kit *defaultKit = KitManager::defaultKit();
if (!activeTarget() && defaultKit)
addTarget(createTarget(defaultKit));

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

@@ -118,9 +118,8 @@ public:
Kit::Kit(Core::Id id) :
d(new Internal::KitPrivate(id))
{
KitManager *stm = KitManager::instance();
KitGuard g(this);
foreach (KitInformation *sti, stm->kitInformation())
foreach (KitInformation *sti, KitManager::kitInformation())
setValue(sti->dataId(), sti->defaultValue(this));
setDisplayName(QCoreApplication::translate("ProjectExplorer::Kit", "Unnamed"));
@@ -193,7 +192,7 @@ bool Kit::hasWarning() const
QList<Task> Kit::validate() const
{
QList<Task> result;
QList<KitInformation *> infoList = KitManager::instance()->kitInformation();
QList<KitInformation *> infoList = KitManager::kitInformation();
d->m_isValid = true;
d->m_hasWarning = false;
foreach (KitInformation *i, infoList) {
@@ -213,7 +212,7 @@ QList<Task> Kit::validate() const
void Kit::fix()
{
KitGuard g(this);
foreach (KitInformation *i, KitManager::instance()->kitInformation())
foreach (KitInformation *i, KitManager::kitInformation())
i->fix(this);
}
@@ -222,7 +221,7 @@ void Kit::setup()
KitGuard g(this);
// Process the KitInfos in reverse order: They may only be based on other information lower in
// the stack.
QList<KitInformation *> info = KitManager::instance()->kitInformation();
QList<KitInformation *> info = KitManager::kitInformation();
for (int i = info.count() - 1; i >= 0; --i)
info.at(i)->setup(this);
}
@@ -255,7 +254,7 @@ QStringList Kit::candidateNameList(const QString &base) const
{
QStringList result;
result << base;
foreach (KitInformation *ki, KitManager::instance()->kitInformation()) {
foreach (KitInformation *ki, KitManager::kitInformation()) {
const QString postfix = ki->displayNamePostfix(this);
if (!postfix.isEmpty())
result << candidateName(base, postfix);
@@ -266,7 +265,7 @@ QStringList Kit::candidateNameList(const QString &base) const
QString Kit::fileSystemFriendlyName() const
{
QString name = cleanName(displayName());
foreach (Kit *i, KitManager::instance()->kits()) {
foreach (Kit *i, KitManager::kits()) {
if (i == this)
continue;
if (name == cleanName(i->displayName())) {
@@ -393,7 +392,7 @@ QVariantMap Kit::toMap() const
void Kit::addToEnvironment(Utils::Environment &env) const
{
QList<KitInformation *> infoList = KitManager::instance()->kitInformation();
QList<KitInformation *> infoList = KitManager::kitInformation();
foreach (KitInformation *ki, infoList)
ki->addToEnvironment(this, env);
}
@@ -401,7 +400,7 @@ void Kit::addToEnvironment(Utils::Environment &env) const
IOutputParser *Kit::createOutputParser() const
{
IOutputParser *first = 0;
QList<KitInformation *> infoList = KitManager::instance()->kitInformation();
QList<KitInformation *> infoList = KitManager::kitInformation();
foreach (KitInformation *ki, infoList) {
IOutputParser *next = ki->createOutputParser(this);
if (!first)
@@ -441,7 +440,7 @@ QString Kit::toHtml() const
str << "</p>";
}
QList<KitInformation *> infoList = KitManager::instance()->kitInformation();
QList<KitInformation *> infoList = KitManager::kitInformation();
foreach (KitInformation *ki, infoList) {
KitInformation::ItemList list = ki->toUserOutput(this);
foreach (const KitInformation::Item &j, list)
@@ -489,7 +488,7 @@ void Kit::setSdkProvided(bool sdkProvided)
void Kit::makeSticky()
{
foreach (KitInformation *ki, KitManager::instance()->kitInformation()) {
foreach (KitInformation *ki, KitManager::kitInformation()) {
if (hasValue(ki->dataId()))
makeSticky(ki->dataId());
}
@@ -507,7 +506,7 @@ void Kit::kitUpdated()
return;
}
validate();
KitManager::instance()->notifyAboutUpdate(this);
KitManager::notifyAboutUpdate(this);
}
void Kit::kitDisplayNameChanged()
@@ -518,7 +517,7 @@ void Kit::kitDisplayNameChanged()
return;
}
validate();
KitManager::instance()->notifyAboutDisplayNameChange(this);
KitManager::notifyAboutDisplayNameChange(this);
}
} // namespace ProjectExplorer

4
src/plugins/projectexplorer/kitchooser.cpp
View File

@@ -71,7 +71,7 @@ QString KitChooser::kitToolTip(Kit *k) const
void KitChooser::populate()
{
clear();
foreach (Kit *kit, KitManager::instance()->kits()) {
foreach (Kit *kit, KitManager::kits()) {
if (kitMatches(kit)) {
addItem(kitText(kit), qVariantFromValue(kit->id()));
setItemData(count() - 1, kitToolTip(kit), Qt::ToolTipRole);
@@ -109,7 +109,7 @@ Core::Id KitChooser::currentKitId() const
Kit *KitChooser::kitAt(int index) const
{
Core::Id id = qvariant_cast<Core::Id>(itemData(index));
return KitManager::instance()->find(id);
return KitManager::find(id);
}
} // namespace ProjectExplorer

12
src/plugins/projectexplorer/kitinformation.cpp
View File

@@ -260,7 +260,7 @@ void ToolChainKitInformation::makeSticky(Kit *k)
void ToolChainKitInformation::kitsWereLoaded()
{
foreach (Kit *k, KitManager::instance()->kits())
foreach (Kit *k, KitManager::kits())
fix(k);
connect(ToolChainManager::instance(), SIGNAL(toolChainRemoved(ProjectExplorer::ToolChain*)),
@@ -272,14 +272,14 @@ void ToolChainKitInformation::kitsWereLoaded()
void ToolChainKitInformation::toolChainUpdated(ProjectExplorer::ToolChain *tc)
{
ToolChainMatcher m(tc);
foreach (Kit *k, KitManager::instance()->kits(&m))
foreach (Kit *k, KitManager::kits(&m))
notifyAboutUpdate(k);
}
void ToolChainKitInformation::toolChainRemoved(ProjectExplorer::ToolChain *tc)
{
Q_UNUSED(tc);
foreach (Kit *k, KitManager::instance()->kits())
foreach (Kit *k, KitManager::kits())
fix(k);
}
@@ -463,7 +463,7 @@ void DeviceKitInformation::makeSticky(Kit *k)
void DeviceKitInformation::kitsWereLoaded()
{
foreach (Kit *k, KitManager::instance()->kits())
foreach (Kit *k, KitManager::kits())
fix(k);
DeviceManager *dm = DeviceManager::instance();
@@ -480,7 +480,7 @@ void DeviceKitInformation::kitsWereLoaded()
void DeviceKitInformation::deviceUpdated(const Core::Id &id)
{
foreach (Kit *k, KitManager::instance()->kits()) {
foreach (Kit *k, KitManager::kits()) {
if (deviceId(k) == id)
notifyAboutUpdate(k);
}
@@ -493,7 +493,7 @@ void DeviceKitInformation::kitUpdated(Kit *k)
void DeviceKitInformation::devicesChanged()
{
foreach (Kit *k, KitManager::instance()->kits())
foreach (Kit *k, KitManager::kits())
setup(k); // Set default device if necessary
}

75
src/plugins/projectexplorer/kitmanager.cpp
View File

@@ -154,8 +154,8 @@ KitManager::KitManager(QObject *parent) :
bool KitManager::setKeepDisplayNameUnique(bool unique)
{
bool current = d->m_keepDisplayNameUnique;
d->m_keepDisplayNameUnique = unique;
bool current = m_instance->d->m_keepDisplayNameUnique;
m_instance->d->m_keepDisplayNameUnique = unique;
return current;
}
@@ -299,13 +299,15 @@ bool greaterPriority(KitInformation *a, KitInformation *b)
void KitManager::registerKitInformation(KitInformation *ki)
{
QTC_CHECK(!isLoaded());
QTC_CHECK(!m_instance->isLoaded());
QTC_ASSERT(!m_instance->d->m_informationList.contains(ki), return);
QList<KitInformation *>::iterator it
= qLowerBound(d->m_informationList.begin(), d->m_informationList.end(), ki, greaterPriority);
d->m_informationList.insert(it, ki);
= qLowerBound(m_instance->d->m_informationList.begin(),
m_instance->d->m_informationList.end(), ki, greaterPriority);
m_instance->d->m_informationList.insert(it, ki);
if (!d->m_initialized)
if (!m_instance->isLoaded())
return;
foreach (Kit *k, kits()) {
@@ -320,8 +322,8 @@ void KitManager::registerKitInformation(KitInformation *ki)
void KitManager::deregisterKitInformation(KitInformation *ki)
{
QTC_CHECK(d->m_informationList.contains(ki));
d->m_informationList.removeAll(ki);
QTC_CHECK(m_instance->d->m_informationList.contains(ki));
m_instance->d->m_informationList.removeOne(ki);
delete ki;
}
@@ -373,17 +375,17 @@ KitManager::KitList KitManager::restoreKits(const Utils::FileName &fileName)
return result;
}
QList<Kit *> KitManager::kits(const KitMatcher *m) const
QList<Kit *> KitManager::kits(const KitMatcher *m)
{
QList<Kit *> result;
foreach (Kit *k, d->m_kitList) {
foreach (Kit *k, m_instance->d->m_kitList) {
if (!m || m->matches(k))
result.append(k);
}
return result;
}
Kit *KitManager::find(const Core::Id &id) const
Kit *KitManager::find(const Core::Id &id)
{
if (!id.isValid())
return 0;
@@ -395,26 +397,26 @@ Kit *KitManager::find(const Core::Id &id) const
return 0;
}
Kit *KitManager::find(const KitMatcher *m) const
Kit *KitManager::find(const KitMatcher *m)
{
QList<Kit *> matched = kits(m);
return matched.isEmpty() ? 0 : matched.first();
}
Kit *KitManager::defaultKit() const
Kit *KitManager::defaultKit()
{
return d->m_defaultKit;
return m_instance->d->m_defaultKit;
}
QList<KitInformation *> KitManager::kitInformation() const
QList<KitInformation *> KitManager::kitInformation()
{
return d->m_informationList;
return m_instance->d->m_informationList;
}
Internal::KitManagerConfigWidget *KitManager::createConfigWidget(Kit *k) const
Internal::KitManagerConfigWidget *KitManager::createConfigWidget(Kit *k)
{
Internal::KitManagerConfigWidget *result = new Internal::KitManagerConfigWidget(k);
foreach (KitInformation *ki, d->m_informationList)
foreach (KitInformation *ki, kitInformation())
result->addConfigWidget(ki->createConfigWidget(result->workingCopy()));
result->updateVisibility();
@@ -463,28 +465,28 @@ void KitManager::notifyAboutDisplayNameChange(Kit *k)
{
if (!k)
return;
if (d->m_kitList.contains(k) && d->m_keepDisplayNameUnique)
if (m_instance->d->m_kitList.contains(k) && m_instance->d->m_keepDisplayNameUnique)
k->setDisplayName(uniqueKitName(k, k->displayName(), kits()));
int pos = d->m_kitList.indexOf(k);
if (pos >= 0 && d->m_initialized)
d->moveKit(pos);
int pos = m_instance->d->m_kitList.indexOf(k);
if (pos >= 0 && m_instance->d->m_initialized)
m_instance->d->moveKit(pos);
notifyAboutUpdate(k);
}
void KitManager::notifyAboutUpdate(ProjectExplorer::Kit *k)
{
if (!k || !d->m_initialized)
if (!k || !m_instance->isLoaded())
return;
if (d->m_kitList.contains(k))
emit kitUpdated(k);
if (m_instance->d->m_kitList.contains(k))
emit m_instance->kitUpdated(k);
else
emit unmanagedKitUpdated(k);
emit m_instance->unmanagedKitUpdated(k);
}
bool KitManager::registerKit(ProjectExplorer::Kit *k)
{
QTC_ASSERT(isLoaded(), return false);
QTC_ASSERT(m_instance->isLoaded(), return false);
if (!k)
return true;
foreach (Kit *current, kits()) {
@@ -495,9 +497,8 @@ bool KitManager::registerKit(ProjectExplorer::Kit *k)
k->setDisplayName(uniqueKitName(k, k->displayName(), kits()));
// make sure we have all the information in our kits:
addKit(k);
if (d->m_initialized)
emit kitAdded(k);
m_instance->addKit(k);
emit m_instance->kitAdded(k);
return true;
}
@@ -505,8 +506,8 @@ void KitManager::deregisterKit(Kit *k)
{
if (!k || !kits().contains(k))
return;
d->m_kitList.removeOne(k);
if (d->m_defaultKit == k) {
m_instance->d->m_kitList.removeOne(k);
if (defaultKit() == k) {
QList<Kit *> stList = kits();
Kit *newDefault = 0;
foreach (Kit *cur, stList) {
@@ -517,20 +518,18 @@ void KitManager::deregisterKit(Kit *k)
}
setDefaultKit(newDefault);
}
if (d->m_initialized)
emit kitRemoved(k);
emit m_instance->kitRemoved(k);
delete k;
}
void KitManager::setDefaultKit(Kit *k)
{
if (d->m_defaultKit == k)
if (defaultKit() == k)
return;
if (k && !kits().contains(k))
return;
d->m_defaultKit = k;
if (d->m_initialized)
emit defaultkitChanged();
m_instance->d->m_defaultKit = k;
emit m_instance->defaultkitChanged();
}
void KitManager::addKit(Kit *k)

35
src/plugins/projectexplorer/kitmanager.h
View File

@@ -113,31 +113,29 @@ public:
static KitManager *instance();
~KitManager();
QList<Kit *> kits(const KitMatcher *m = 0) const;
Kit *find(const Core::Id &id) const;
Kit *find(const KitMatcher *m) const;
Kit *defaultKit() const;
static QList<Kit *> kits(const KitMatcher *m = 0);
static Kit *find(const Core::Id &id);
static Kit *find(const KitMatcher *m);
static Kit *defaultKit();
QList<KitInformation *> kitInformation() const;
static QList<KitInformation *> kitInformation();
Internal::KitManagerConfigWidget *createConfigWidget(Kit *k) const;
static Internal::KitManagerConfigWidget *createConfigWidget(Kit *k);
static void deleteKit(Kit *k);
bool isLoaded() const;
static QString uniqueKitName(const Kit *k, const QString name, const QList<Kit *> &allKits);
static bool registerKit(ProjectExplorer::Kit *k);
static void deregisterKit(ProjectExplorer::Kit *k);
static void setDefaultKit(ProjectExplorer::Kit *k);
static void registerKitInformation(ProjectExplorer::KitInformation *ki);
static void deregisterKitInformation(ProjectExplorer::KitInformation *ki);
public slots:
bool registerKit(ProjectExplorer::Kit *k);
void deregisterKit(ProjectExplorer::Kit *k);
void setDefaultKit(ProjectExplorer::Kit *k);
void saveKits();
void registerKitInformation(ProjectExplorer::KitInformation *ki);
void deregisterKitInformation(ProjectExplorer::KitInformation *ki);
signals:
void kitAdded(ProjectExplorer::Kit *);
// Kit is still valid when this call happens!
@@ -155,7 +153,8 @@ signals:
private:
explicit KitManager(QObject *parent = 0);
bool setKeepDisplayNameUnique(bool unique);
bool isLoaded() const;
static bool setKeepDisplayNameUnique(bool unique);
// Make sure the this is only called after all
// KitInformation are registered!
@@ -170,8 +169,8 @@ private:
};
KitList restoreKits(const Utils::FileName &fileName);
void notifyAboutDisplayNameChange(ProjectExplorer::Kit *k);
void notifyAboutUpdate(ProjectExplorer::Kit *k);
static void notifyAboutDisplayNameChange(ProjectExplorer::Kit *k);
static void notifyAboutUpdate(ProjectExplorer::Kit *k);
void addKit(Kit *k);
Internal::KitManagerPrivate *const d;

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

@@ -101,7 +101,7 @@ KitManagerConfigWidget::~KitManagerConfigWidget()
KitManager::deleteKit(m_modifiedKit);
// Make sure our workingCopy did not get registered somehow:
foreach (const Kit *k, KitManager::instance()->kits())
foreach (const Kit *k, KitManager::kits())
QTC_CHECK(k->id() != Core::Id(WORKING_COPY_KIT_ID));
}
@@ -113,7 +113,6 @@ QString KitManagerConfigWidget::displayName() const
void KitManagerConfigWidget::apply()
{
bool mustSetDefault = m_isDefaultKit;
KitManager *km = KitManager::instance();
bool mustRegister = false;
if (!m_kit) {
mustRegister = true;
@@ -121,10 +120,10 @@ void KitManagerConfigWidget::apply()
}
m_kit->copyFrom(m_modifiedKit);//m_isDefaultKit is reset in discard() here.
if (mustRegister)
km->registerKit(m_kit);
KitManager::registerKit(m_kit);
if (mustSetDefault)
km->setDefaultKit(m_kit);
KitManager::setDefaultKit(m_kit);
m_isDefaultKit = mustSetDefault;
emit dirty();
@@ -134,7 +133,7 @@ void KitManagerConfigWidget::discard()
{
if (m_kit) {
m_modifiedKit->copyFrom(m_kit);
m_isDefaultKit = (m_kit == KitManager::instance()->defaultKit());
m_isDefaultKit = (m_kit == KitManager::defaultKit());
} else {
// This branch will only ever get reached once during setup of widget for a not-yet-existing
// kit.
@@ -149,7 +148,7 @@ bool KitManagerConfigWidget::isDirty() const
{
return !m_kit
|| !m_kit->isEqual(m_modifiedKit)
|| m_isDefaultKit != (KitManager::instance()->defaultKit() == m_kit);
|| m_isDefaultKit != (KitManager::defaultKit() == m_kit);
}
bool KitManagerConfigWidget::isValid() const
@@ -238,7 +237,7 @@ void KitManagerConfigWidget::removeKit()
{
if (!m_kit)
return;
KitManager::instance()->deregisterKit(m_kit);
KitManager::deregisterKit(m_kit);
}
void KitManagerConfigWidget::setIcon()

11
src/plugins/projectexplorer/kitmodel.cpp
View File

@@ -57,7 +57,7 @@ public:
if (kn)
kn->childNodes.append(this);
widget = KitManager::instance()->createConfigWidget(k);
widget = KitManager::createConfigWidget(k);
if (widget) {
if (k && k->isAutoDetected())
widget->makeStickySubWidgetsReadOnly();
@@ -104,7 +104,7 @@ KitModel::KitModel(QBoxLayout *parentLayout, QObject *parent) :
m_autoRoot = new KitNode(m_root);
m_manualRoot = new KitNode(m_root);
foreach (Kit *k, KitManager::instance()->kits())
foreach (Kit *k, KitManager::kits())
addKit(k);
changeDefaultKit();
@@ -285,8 +285,7 @@ void KitModel::apply()
}
// Update kits:
KitManager *km = KitManager::instance();
bool unique = km->setKeepDisplayNameUnique(false);
bool unique = KitManager::setKeepDisplayNameUnique(false);
nodes = m_autoRoot->childNodes; // These can be dirty due to being made default!
nodes.append(m_manualRoot->childNodes);
foreach (KitNode *n, nodes) {
@@ -297,7 +296,7 @@ void KitModel::apply()
emit dataChanged(index(n, 0), index(n, columnCount(QModelIndex())));
}
}
km->setKeepDisplayNameUnique(unique);
KitManager::setKeepDisplayNameUnique(unique);
}
void KitModel::markForRemoval(Kit *k)
@@ -475,7 +474,7 @@ void KitModel::updateKit(Kit *k)
void KitModel::changeDefaultKit()
{
Kit *defaultKit = KitManager::instance()->defaultKit();
Kit *defaultKit = KitManager::defaultKit();
QList<KitNode *> nodes = m_autoRoot->childNodes;
nodes << m_manualRoot->childNodes;
foreach (KitNode *n, nodes) {

2
src/plugins/projectexplorer/project.cpp
View File

@@ -270,7 +270,7 @@ Target *Project::restoreTarget(const QVariantMap &data)
return 0;
}
Kit *k = KitManager::instance()->find(id);
Kit *k = KitManager::find(id);
if (!k) {
qWarning("Warning: No kit '%s' found. Continuing.", qPrintable(id.toString()));
return 0;

8
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -337,10 +337,10 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
d->m_toolChainManager = new ToolChainManager;
// Register KitInformation:
KitManager::instance()->registerKitInformation(new DeviceTypeKitInformation);
KitManager::instance()->registerKitInformation(new DeviceKitInformation);
KitManager::instance()->registerKitInformation(new ToolChainKitInformation);
KitManager::instance()->registerKitInformation(new SysRootKitInformation);
KitManager::registerKitInformation(new DeviceTypeKitInformation);
KitManager::registerKitInformation(new DeviceKitInformation);
KitManager::registerKitInformation(new ToolChainKitInformation);
KitManager::registerKitInformation(new SysRootKitInformation);
addAutoReleasedObject(new Internal::ToolChainOptionsPage);
addAutoReleasedObject(new KitOptionsPage);

10
src/plugins/projectexplorer/settingsaccessor.cpp
View File

@@ -2297,10 +2297,9 @@ Version11Handler::Version11Handler()
Version11Handler::~Version11Handler()
{
KitManager *km = KitManager::instance();
if (!km) // Can happen during teardown!
if (!KitManager::instance()) // Can happen during teardown!
return;
QList<Kit *> knownKits = km->kits();
QList<Kit *> knownKits = KitManager::kits();
foreach (Kit *k, m_targets.keys()) {
if (!knownKits.contains(k))
KitManager::deleteKit(k);
@@ -2320,8 +2319,7 @@ QVariantMap Version11Handler::update(Project *project, const QVariantMap &map)
parseToolChainFile();
QVariantMap result;
KitManager *km = KitManager::instance();
foreach (Kit *k, km->kits())
foreach (Kit *k, KitManager::kits())
m_targets.insert(k, QVariantMap());
QMapIterator<QString, QVariant> globalIt(map);
@@ -2526,7 +2524,7 @@ QVariantMap Version11Handler::update(Project *project, const QVariantMap &map)
if (data.isEmpty())
continue;
km->registerKit(k);
KitManager::registerKit(k);
data.insert(QLatin1String("ProjectExplorer.ProjectConfiguration.Id"), k->id().name());
data.insert(QLatin1String("ProjectExplorer.Target.Profile"), k->id().name());

2
src/plugins/projectexplorer/target.cpp
View File

@@ -770,7 +770,7 @@ bool Target::fromMap(const QVariantMap &map)
if (!ProjectConfiguration::fromMap(map))
return false;
d->m_kit = KitManager::instance()->find(id());
d->m_kit = KitManager::find(id());
if (!d->m_kit)
return false;

8
src/plugins/projectexplorer/targetsettingspanel.cpp
View File

@@ -270,7 +270,7 @@ void TargetSettingsPanelWidget::menuShown(int targetIndex)
void TargetSettingsPanelWidget::changeActionTriggered(QAction *action)
{
Kit *k = KitManager::instance()->find(action->data().value<Core::Id>());
Kit *k = KitManager::find(action->data().value<Core::Id>());
Target *sourceTarget = m_targets.at(m_menuTargetIndex);
Target *newTarget = cloneTarget(sourceTarget, k);
@@ -283,7 +283,7 @@ void TargetSettingsPanelWidget::changeActionTriggered(QAction *action)
void TargetSettingsPanelWidget::duplicateActionTriggered(QAction *action)
{
Kit *k = KitManager::instance()->find(action->data().value<Core::Id>());
Kit *k = KitManager::find(action->data().value<Core::Id>());
Target *newTarget = cloneTarget(m_targets.at(m_menuTargetIndex), k);
if (newTarget) {
@@ -294,7 +294,7 @@ void TargetSettingsPanelWidget::duplicateActionTriggered(QAction *action)
void TargetSettingsPanelWidget::addActionTriggered(QAction *action)
{
Kit *k = KitManager::instance()->find(action->data().value<Core::Id>());
Kit *k = KitManager::find(action->data().value<Core::Id>());
QTC_ASSERT(!m_project->target(k), return);
Target *target = m_project->createTarget(k);
@@ -563,7 +563,7 @@ void TargetSettingsPanelWidget::updateTargetButtons()
this, SLOT(duplicateActionTriggered(QAction*)));
connect(removeAction, SIGNAL(triggered()), this, SLOT(removeTarget()));
QList<Kit *> kits = KitManager::instance()->kits();
QList<Kit *> kits = KitManager::kits();
qSort(kits.begin(), kits.end(), diplayNameSorter);
foreach (Kit *k, kits) {
if (m_project->target(k))

2
src/plugins/pythoneditor/wizard/pythonclasswizard.cpp
View File

@@ -117,7 +117,7 @@ Kit *ClassWizard::kitForWizard(const ClassWizardDialog *wizard) const
if (proj && proj->activeTarget())
return proj->activeTarget()->kit();
return KitManager::instance()->defaultKit();
return KitManager::defaultKit();
}
} // namespace PythonEditor

8
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -357,9 +357,9 @@ bool QbsProject::fromMap(const QVariantMap &map)
if (!Project::fromMap(map))
return false;
ProjectExplorer::KitManager *km = ProjectExplorer::KitManager::instance();
if (!activeTarget() && km->defaultKit()) {
ProjectExplorer::Target *t = new ProjectExplorer::Target(this, km->defaultKit());
ProjectExplorer::Kit *defaultKit = ProjectExplorer::KitManager::defaultKit();
if (!activeTarget() && defaultKit) {
ProjectExplorer::Target *t = new ProjectExplorer::Target(this, defaultKit);
t->updateDefaultBuildConfigurations();
t->updateDefaultDeployConfigurations();
t->updateDefaultRunConfigurations();
@@ -496,7 +496,7 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData &prj)
if (ProjectExplorer::Target *target = activeTarget())
k = target->kit();
else
k = ProjectExplorer::KitManager::instance()->defaultKit();
k = ProjectExplorer::KitManager::defaultKit();
qtVersion = QtSupport::QtKitInformation::qtVersion(k);
CppTools::CppModelManagerInterface *modelmanager =

2
src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
View File

@@ -203,7 +203,7 @@ void QbsManager::pushKitsToQbs()
removeCreatorProfiles();
// add definitions from our kits
foreach (const ProjectExplorer::Kit *k, ProjectExplorer::KitManager::instance()->kits())
foreach (const ProjectExplorer::Kit *k, ProjectExplorer::KitManager::kits())
addProfileFromKit(k);
}

4
src/plugins/qmljstools/qmljsmodelmanager.cpp
View File

@@ -95,7 +95,7 @@ ModelManagerInterface::ProjectInfo QmlJSTools::defaultProjectInfoForProject(
activeTarget = project->activeTarget();
}
ProjectExplorer::Kit *activeKit = activeTarget ? activeTarget->kit() :
ProjectExplorer::KitManager::instance()->defaultKit();
ProjectExplorer::KitManager::defaultKit();
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(activeKit);
bool preferDebugDump = false;
@@ -143,7 +143,7 @@ void QmlJSTools::setupProjectInfoQmlBundles(ModelManagerInterface::ProjectInfo &
activeTarget = projectInfo.project->activeTarget();
}
ProjectExplorer::Kit *activeKit = activeTarget
? activeTarget->kit() : ProjectExplorer::KitManager::instance()->defaultKit();
? activeTarget->kit() : ProjectExplorer::KitManager::defaultKit();
QHash<QString, QString> replacements;
replacements.insert(QLatin1String("$(QT_INSTALL_IMPORTS)"), projectInfo.qtImportsPath);
replacements.insert(QLatin1String("$(QT_INSTALL_QML)"), projectInfo.qtQmlPath);

7
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -381,13 +381,12 @@ bool QmlProject::fromMap(const QVariantMap &map)
if (!activeTarget()) {
// find a kit that matches prerequisites (prefer default one)
Internal::QmlProjectKitMatcher matcher(defaultImport());
ProjectExplorer::KitManager *kitManager = ProjectExplorer::KitManager::instance();
QList<ProjectExplorer::Kit*> kits = kitManager->kits(&matcher);
QList<ProjectExplorer::Kit*> kits = ProjectExplorer::KitManager::kits(&matcher);
if (!kits.isEmpty()) {
ProjectExplorer::Kit *kit = 0;
if (kits.contains(kitManager->defaultKit())) {
kit = kitManager->defaultKit();
if (kits.contains(ProjectExplorer::KitManager::defaultKit())) {
kit = ProjectExplorer::KitManager::defaultKit();
} else {
kit = kits.first();
}

12
src/plugins/qnx/blackberryconfiguration.cpp
View File

@@ -174,8 +174,8 @@ void BlackBerryConfiguration::setupConfigurationPerQtVersion(const Utils::FileNa
// register
QtSupport::QtVersionManager::instance()->addVersion(qtVersion);
ProjectExplorer::ToolChainManager::instance()->registerToolChain(tc);
ProjectExplorer::KitManager::instance()->registerKit(deviceKit);
ProjectExplorer::KitManager::instance()->registerKit(simulatorKit);
ProjectExplorer::KitManager::registerKit(deviceKit);
ProjectExplorer::KitManager::registerKit(simulatorKit);
}
}
@@ -232,7 +232,7 @@ ProjectExplorer::Kit *BlackBerryConfiguration::createKit(QnxArchitecture arch, Q
return 0;
// Check if an identical kit already exists
foreach (ProjectExplorer::Kit *kit, ProjectExplorer::KitManager::instance()->kits())
foreach (ProjectExplorer::Kit *kit, ProjectExplorer::KitManager::kits())
{
if (QtSupport::QtKitInformation::qtVersion(kit) == qtVersion && ProjectExplorer::ToolChainKitInformation::toolChain(kit) == tc
&& ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(kit) == Constants::QNX_BB_OS_TYPE
@@ -324,12 +324,12 @@ void BlackBerryConfiguration::deactivate()
QtSupport::BaseQtVersion *qt4Version = QtSupport::QtVersionManager::instance()->qtVersionForQMakeBinary(m_qmake4BinaryFile);
QtSupport::BaseQtVersion *qt5Version = QtSupport::QtVersionManager::instance()->qtVersionForQMakeBinary(m_qmake5BinaryFile);
if (qt4Version || qt5Version) {
foreach (ProjectExplorer::Kit *kit, ProjectExplorer::KitManager::instance()->kits()) {
foreach (ProjectExplorer::Kit *kit, ProjectExplorer::KitManager::kits()) {
if (qt4Version && qt4Version == QtSupport::QtKitInformation::qtVersion(kit))
ProjectExplorer::KitManager::instance()->deregisterKit(kit);
ProjectExplorer::KitManager::deregisterKit(kit);
else if (qt5Version && qt5Version == QtSupport::QtKitInformation::qtVersion(kit))
ProjectExplorer::KitManager::instance()->deregisterKit(kit);
ProjectExplorer::KitManager::deregisterKit(kit);
}
if (qt4Version)

4
src/plugins/qnx/blackberryconfigurationmanager.cpp
View File

@@ -169,7 +169,7 @@ void BlackBerryConfigurationManager::saveManualConfigurations()
void BlackBerryConfigurationManager::clearInvalidConfigurations()
{
QList<NdkInstallInformation> autoNdks = QnxUtils::installedNdks();
foreach (ProjectExplorer::Kit *kit, ProjectExplorer::KitManager::instance()->kits()) {
foreach (ProjectExplorer::Kit *kit, ProjectExplorer::KitManager::kits()) {
if (!kit->isAutoDetected())
continue;
@@ -187,7 +187,7 @@ void BlackBerryConfigurationManager::clearInvalidConfigurations()
QtSupport::QtVersionManager::instance()->removeVersion(QtSupport::QtKitInformation::qtVersion(kit));
ProjectExplorer::ToolChainManager::instance()->deregisterToolChain(
ProjectExplorer::ToolChainKitInformation::toolChain(kit));
ProjectExplorer::KitManager::instance()->deregisterKit(kit);
ProjectExplorer::KitManager::deregisterKit(kit);
}
}
}

2
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -577,7 +577,7 @@ void Qt4PriFileNode::update(ProFile *includeFileExact, QtSupport::ProFileReader
InternalNode contents;
ProjectExplorer::Target *t = m_project->activeTarget();
ProjectExplorer::Kit *k = t ? t->kit() : ProjectExplorer::KitManager::instance()->defaultKit();
ProjectExplorer::Kit *k = t ? t->kit() : ProjectExplorer::KitManager::defaultKit();
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k);
// Figure out DEPLOYMENT and INSTALL folders

6
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -512,7 +512,7 @@ void Qt4Project::updateCppCodeModel()
if (ProjectExplorer::Target *target = activeTarget())
k = target->kit();
else
k = KitManager::instance()->defaultKit();
k = KitManager::defaultKit();
qtVersion = QtSupport::QtKitInformation::qtVersion(k);
CppTools::CppModelManagerInterface *modelmanager =
@@ -992,7 +992,7 @@ QtSupport::ProFileReader *Qt4Project::createProFileReader(const Qt4ProFileNode *
else
qmakeArgs = bc->configCommandLineArguments();
} else {
k = KitManager::instance()->defaultKit();
k = KitManager::defaultKit();
}
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k);
@@ -1393,7 +1393,7 @@ bool Qt4Project::needsConfiguration() const
void Qt4Project::configureAsExampleProject(const QStringList &platforms)
{
QList<Kit *> kits = ProjectExplorer::KitManager::instance()->kits();
QList<Kit *> kits = ProjectExplorer::KitManager::kits();
foreach (Kit *k, kits) {
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(k);
if (!version)

2
src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
View File

@@ -121,7 +121,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
m_proFileEditorFactory = new ProFileEditorFactory(m_qt4ProjectManager, editorHandler);
ProjectExplorer::KitManager::instance()->registerKitInformation(new QmakeKitInformation);
ProjectExplorer::KitManager::registerKitInformation(new QmakeKitInformation);
addObject(m_proFileEditorFactory);

4
src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp
View File

@@ -144,13 +144,13 @@ TargetSetupPageWrapper::TargetSetupPageWrapper(ProjectExplorer::Project *project
void TargetSetupPageWrapper::kitUpdated(ProjectExplorer::Kit *k)
{
if (k == ProjectExplorer::KitManager::instance()->defaultKit())
if (k == ProjectExplorer::KitManager::defaultKit())
updateNoteText();
}
void TargetSetupPageWrapper::updateNoteText()
{
ProjectExplorer::Kit *k = ProjectExplorer::KitManager::instance()->defaultKit();
ProjectExplorer::Kit *k = ProjectExplorer::KitManager::defaultKit();
QString text;
bool showHint = false;

2
src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
View File

@@ -210,7 +210,7 @@ bool AbstractMobileAppWizardDialog::isQtPlatformSelected(const QString &platform
QtSupport::QtPlatformKitMatcher matcher(platform);
QList<ProjectExplorer::Kit *> kitsList
= ProjectExplorer::KitManager::instance()->kits(&matcher);
= ProjectExplorer::KitManager::kits(&matcher);
foreach (ProjectExplorer::Kit *k, kitsList) {
if (selectedKitsList.contains(k->id()))
return true;

2
src/plugins/qt4projectmanager/wizards/qtwizard.cpp
View File

@@ -324,7 +324,7 @@ bool BaseQt4ProjectWizardDialog::isQtPlatformSelected(const QString &platform) c
QtSupport::QtPlatformKitMatcher matcher(platform);
QList<ProjectExplorer::Kit *> kitList
= ProjectExplorer::KitManager::instance()->kits(&matcher);
= ProjectExplorer::KitManager::kits(&matcher);
foreach (ProjectExplorer::Kit *k, kitList) {
if (selectedKitList.contains(k->id()))
return true;

17
src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
View File

@@ -252,7 +252,7 @@ void TargetSetupPage::setImportSearch(bool b)
void TargetSetupPage::setupWidgets()
{
// Known profiles:
foreach (ProjectExplorer::Kit *k, ProjectExplorer::KitManager::instance()->kits(m_requiredMatcher))
foreach (ProjectExplorer::Kit *k, ProjectExplorer::KitManager::kits(m_requiredMatcher))
addWidget(k);
// Setup import widget:
@@ -296,7 +296,7 @@ ProjectExplorer::Kit *TargetSetupPage::createTemporaryKit(QtSupport::BaseQtVersi
k->setValue(QT_IS_TEMPORARY, version->uniqueId());
m_ignoreUpdates = true;
ProjectExplorer::KitManager::instance()->registerKit(k);
ProjectExplorer::KitManager::registerKit(k);
m_ignoreUpdates = false;
return k;
@@ -347,7 +347,7 @@ void TargetSetupPage::removeProject(ProjectExplorer::Kit *k, const QString &path
projects.removeOne(path);
m_ignoreUpdates = true;
if (projects.isEmpty())
ProjectExplorer::KitManager::instance()->deregisterKit(k);
ProjectExplorer::KitManager::deregisterKit(k);
else
k->setValue(TEMPORARY_OF_PROJECTS, projects);
m_ignoreUpdates = false;
@@ -398,7 +398,6 @@ void TargetSetupPage::import(const Utils::FileName &path, const bool silent)
bool temporaryVersion = false;
QtSupport::QtVersionManager *vm = QtSupport::QtVersionManager::instance();
ProjectExplorer::KitManager *km = ProjectExplorer::KitManager::instance();
bool found = false;
foreach (const QString &file, makefiles) {
@@ -452,7 +451,7 @@ void TargetSetupPage::import(const Utils::FileName &path, const bool silent)
// Find profiles (can be more than one, e.g. (Linux-)Desktop and embedded linux):
QList<ProjectExplorer::Kit *> kitList;
foreach (ProjectExplorer::Kit *k, km->kits()) {
foreach (ProjectExplorer::Kit *k, ProjectExplorer::KitManager::kits()) {
QtSupport::BaseQtVersion *profileVersion = QtSupport::QtKitInformation::qtVersion(k);
Utils::FileName profileSpec = QmakeKitInformation::mkspec(k);
ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(k);
@@ -502,7 +501,7 @@ void TargetSetupPage::handleQtUpdate(const QList<int> &add, const QList<int> &rm
{
Q_UNUSED(add);
// Update kit to no longer claim a Qt version is temporary once it is modified/removed.
foreach (ProjectExplorer::Kit *k, ProjectExplorer::KitManager::instance()->kits()) {
foreach (ProjectExplorer::Kit *k, ProjectExplorer::KitManager::kits()) {
if (!k->hasValue(QT_IS_TEMPORARY))
continue;
int qtVersion = k->value(QT_IS_TEMPORARY, -1).toInt();
@@ -521,7 +520,7 @@ void TargetSetupPage::setupImports()
QStringList toImport;
toImport << pfi.absolutePath();
QList<ProjectExplorer::Kit *> kitList = ProjectExplorer::KitManager::instance()->kits();
QList<ProjectExplorer::Kit *> kitList = ProjectExplorer::KitManager::kits();
foreach (ProjectExplorer::Kit *k, kitList) {
QFileInfo fi(Qt4Project::shadowBuildDirectory(m_proFilePath, k, QString()));
const QString baseDir = fi.absolutePath();
@@ -593,7 +592,7 @@ void TargetSetupPage::selectAtLeastOneKit()
if (!atLeastOneKitSelected) {
Qt4TargetSetupWidget *widget = m_firstWidget;
ProjectExplorer::Kit *defaultKit = ProjectExplorer::KitManager::instance()->defaultKit();
ProjectExplorer::Kit *defaultKit = ProjectExplorer::KitManager::defaultKit();
if (defaultKit)
widget = m_widgets.value(defaultKit->id(), m_firstWidget);
if (widget)
@@ -701,7 +700,7 @@ bool TargetSetupPage::setupProject(Qt4ProjectManager::Qt4Project *project)
int activeTargetPriority = 0;
foreach (ProjectExplorer::Target *t, targets) {
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(t->kit());
if (t->kit() == ProjectExplorer::KitManager::instance()->defaultKit()) {
if (t->kit() == ProjectExplorer::KitManager::defaultKit()) {
activeTarget = t;
activeTargetPriority = 3;
} else if (activeTargetPriority < 2 && version && version->type() == QLatin1String(QtSupport::Constants::SIMULATORQT)) {

4
src/plugins/qtsupport/exampleslistmodel.cpp
View File

@@ -117,7 +117,7 @@ public:
// prioritize default qt version
QtVersionManager *versionManager = QtVersionManager::instance();
QList <BaseQtVersion *> qtVersions = versionManager->validVersions();
ProjectExplorer::Kit *defaultKit = ProjectExplorer::KitManager::instance()->defaultKit();
ProjectExplorer::Kit *defaultKit = ProjectExplorer::KitManager::defaultKit();
BaseQtVersion *defaultVersion = QtKitInformation::qtVersion(defaultKit);
if (defaultVersion && qtVersions.contains(defaultVersion))
qtVersions.move(qtVersions.indexOf(defaultVersion), 0);
@@ -544,7 +544,7 @@ QStringList ExamplesListModel::exampleSources(QString *examplesInstallPath, QStr
// prioritize default qt version
QtVersionManager *versionManager = QtVersionManager::instance();
QList <BaseQtVersion *> qtVersions = versionManager->validVersions();
ProjectExplorer::Kit *defaultKit = ProjectExplorer::KitManager::instance()->defaultKit();
ProjectExplorer::Kit *defaultKit = ProjectExplorer::KitManager::defaultKit();
BaseQtVersion *defaultVersion = QtKitInformation::qtVersion(defaultKit);
if (defaultVersion && qtVersions.contains(defaultVersion))
qtVersions.move(qtVersions.indexOf(defaultVersion), 0);

4
src/plugins/qtsupport/qtkitinformation.cpp
View File

@@ -206,14 +206,14 @@ void QtKitInformation::qtVersionsChanged(const QList<int> &addedIds,
{
Q_UNUSED(addedIds);
Q_UNUSED(removedIds);
foreach (ProjectExplorer::Kit *k, ProjectExplorer::KitManager::instance()->kits())
foreach (ProjectExplorer::Kit *k, ProjectExplorer::KitManager::kits())
if (changedIds.contains(qtVersionId(k)))
notifyAboutUpdate(k);
}
void QtKitInformation::kitsWereLoaded()
{
foreach (ProjectExplorer::Kit *k, ProjectExplorer::KitManager::instance()->kits())
foreach (ProjectExplorer::Kit *k, ProjectExplorer::KitManager::kits())
fix(k);
connect(QtVersionManager::instance(), SIGNAL(qtVersionsChanged(QList<int>,QList<int>,QList<int>)),

2
src/plugins/qtsupport/qtsupportplugin.cpp
View File

@@ -87,7 +87,7 @@ bool QtSupportPlugin::initialize(const QStringList &arguments, QString *errorMes
addAutoReleasedObject(new CustomExecutableRunConfigurationFactory);
ProjectExplorer::KitManager::instance()->registerKitInformation(new QtKitInformation);
ProjectExplorer::KitManager::registerKitInformation(new QtKitInformation);
return true;
}

2
src/plugins/qtsupport/uicodemodelsupport.cpp
View File

@@ -254,7 +254,7 @@ QString UiCodeModelSupport::uicCommand() const
{
QtSupport::BaseQtVersion *version;
if (m_project->needsConfiguration()) {
version = QtSupport::QtKitInformation::qtVersion(ProjectExplorer::KitManager::instance()->defaultKit());
version = QtSupport::QtKitInformation::qtVersion(ProjectExplorer::KitManager::defaultKit());
} else {
ProjectExplorer::Target *target = m_project->activeTarget();
version = QtSupport::QtKitInformation::qtVersion(target->kit());