Commit 3d78ae33 authored by Rafael Roquetto's avatar Rafael Roquetto
Browse files

Qnx: Use reference instead of pointer for singleton



BlackBerrySettingsManager returns a reference for a good reason.

Change-Id: Ib358beef12f1df0fc089e54f309f3b0ded640a83
Reviewed-by: Nicolas Arnaud-Cormos's avatarNicolas Arnaud-Cormos <nicolas@kdab.com>
parent fd93aa43
...@@ -56,7 +56,7 @@ static QIcon invalidConfigIcon(QLatin1String(":/projectexplorer/images/compile_e ...@@ -56,7 +56,7 @@ static QIcon invalidConfigIcon(QLatin1String(":/projectexplorer/images/compile_e
BlackBerryNDKSettingsWidget::BlackBerryNDKSettingsWidget(QWidget *parent) : BlackBerryNDKSettingsWidget::BlackBerryNDKSettingsWidget(QWidget *parent) :
QWidget(parent), QWidget(parent),
m_ui(new Ui_BlackBerryNDKSettingsWidget), m_ui(new Ui_BlackBerryNDKSettingsWidget),
m_bbConfigManager(&BlackBerryConfigurationManager::instance()), m_bbConfigManager(BlackBerryConfigurationManager::instance()),
m_autoDetectedNdks(0), m_autoDetectedNdks(0),
m_manualNdks(0) m_manualNdks(0)
{ {
...@@ -64,7 +64,7 @@ BlackBerryNDKSettingsWidget::BlackBerryNDKSettingsWidget(QWidget *parent) : ...@@ -64,7 +64,7 @@ BlackBerryNDKSettingsWidget::BlackBerryNDKSettingsWidget(QWidget *parent) :
updateInfoTable(0); updateInfoTable(0);
m_activatedTargets << m_bbConfigManager->activeConfigurations(); m_activatedTargets << m_bbConfigManager.activeConfigurations();
m_ui->ndksTreeWidget->header()->setResizeMode(QHeaderView::Stretch); m_ui->ndksTreeWidget->header()->setResizeMode(QHeaderView::Stretch);
m_ui->ndksTreeWidget->header()->setStretchLastSection(false); m_ui->ndksTreeWidget->header()->setStretchLastSection(false);
...@@ -103,7 +103,7 @@ void BlackBerryNDKSettingsWidget::setWizardMessageVisible(bool visible) ...@@ -103,7 +103,7 @@ void BlackBerryNDKSettingsWidget::setWizardMessageVisible(bool visible)
bool BlackBerryNDKSettingsWidget::hasActiveNdk() const bool BlackBerryNDKSettingsWidget::hasActiveNdk() const
{ {
return !m_bbConfigManager->configurations().isEmpty(); return !m_bbConfigManager.configurations().isEmpty();
} }
QList<BlackBerryConfiguration *> BlackBerryNDKSettingsWidget::activatedTargets() QList<BlackBerryConfiguration *> BlackBerryNDKSettingsWidget::activatedTargets()
...@@ -142,7 +142,7 @@ void BlackBerryNDKSettingsWidget::launchBlackBerrySetupWizard() const ...@@ -142,7 +142,7 @@ void BlackBerryNDKSettingsWidget::launchBlackBerrySetupWizard() const
void BlackBerryNDKSettingsWidget::updateInfoTable(QTreeWidgetItem* currentItem) void BlackBerryNDKSettingsWidget::updateInfoTable(QTreeWidgetItem* currentItem)
{ {
BlackBerryConfiguration *config = m_bbConfigManager->configurationFromEnvFile( BlackBerryConfiguration *config = m_bbConfigManager.configurationFromEnvFile(
Utils::FileName::fromString(currentItem ? currentItem->text(1) : QString())); Utils::FileName::fromString(currentItem ? currentItem->text(1) : QString()));
updateUi(currentItem, config); updateUi(currentItem, config);
...@@ -161,7 +161,7 @@ void BlackBerryNDKSettingsWidget::updateNdkList() ...@@ -161,7 +161,7 @@ void BlackBerryNDKSettingsWidget::updateNdkList()
qDeleteAll(m_manualNdks->takeChildren()); qDeleteAll(m_manualNdks->takeChildren());
bool enableCleanUp = false; bool enableCleanUp = false;
foreach (BlackBerryConfiguration *config, m_bbConfigManager->configurations()) { foreach (BlackBerryConfiguration *config, m_bbConfigManager.configurations()) {
QTreeWidgetItem *parent = config->isAutoDetected() ? m_autoDetectedNdks : m_manualNdks; QTreeWidgetItem *parent = config->isAutoDetected() ? m_autoDetectedNdks : m_manualNdks;
QTreeWidgetItem *item = new QTreeWidgetItem(parent); QTreeWidgetItem *item = new QTreeWidgetItem(parent);
item->setText(0, config->displayName()); item->setText(0, config->displayName());
...@@ -216,7 +216,7 @@ void BlackBerryNDKSettingsWidget::removeNdkTarget() ...@@ -216,7 +216,7 @@ void BlackBerryNDKSettingsWidget::removeNdkTarget()
QString ndk = m_ui->ndksTreeWidget->currentItem()->text(0); QString ndk = m_ui->ndksTreeWidget->currentItem()->text(0);
QString envFilePath = m_ui->ndksTreeWidget->currentItem()->text(1); QString envFilePath = m_ui->ndksTreeWidget->currentItem()->text(1);
BlackBerryConfiguration *config = m_bbConfigManager->configurationFromEnvFile(Utils::FileName::fromString(envFilePath)); BlackBerryConfiguration *config = m_bbConfigManager.configurationFromEnvFile(Utils::FileName::fromString(envFilePath));
if (!config) if (!config)
return; return;
...@@ -235,7 +235,7 @@ void BlackBerryNDKSettingsWidget::removeNdkTarget() ...@@ -235,7 +235,7 @@ void BlackBerryNDKSettingsWidget::removeNdkTarget()
if (button == QMessageBox::Yes) { if (button == QMessageBox::Yes) {
m_activatedTargets.removeOne(config); m_activatedTargets.removeOne(config);
m_deactivatedTargets.removeOne(config); m_deactivatedTargets.removeOne(config);
m_bbConfigManager->removeConfiguration(config); m_bbConfigManager.removeConfiguration(config);
m_manualNdks->removeChild(m_ui->ndksTreeWidget->currentItem()); m_manualNdks->removeChild(m_ui->ndksTreeWidget->currentItem());
emit targetsUpdated(); emit targetsUpdated();
} }
...@@ -248,7 +248,7 @@ void BlackBerryNDKSettingsWidget::activateNdkTarget() ...@@ -248,7 +248,7 @@ void BlackBerryNDKSettingsWidget::activateNdkTarget()
QString envFilePath = m_ui->ndksTreeWidget->currentItem()->text(1); QString envFilePath = m_ui->ndksTreeWidget->currentItem()->text(1);
BlackBerryConfiguration *config = m_bbConfigManager->configurationFromEnvFile(Utils::FileName::fromString(envFilePath)); BlackBerryConfiguration *config = m_bbConfigManager.configurationFromEnvFile(Utils::FileName::fromString(envFilePath));
if (config && !m_activatedTargets.contains(config)) { if (config && !m_activatedTargets.contains(config)) {
m_activatedTargets << config; m_activatedTargets << config;
if (m_deactivatedTargets.contains(config)) if (m_deactivatedTargets.contains(config))
...@@ -266,7 +266,7 @@ void BlackBerryNDKSettingsWidget::deactivateNdkTarget() ...@@ -266,7 +266,7 @@ void BlackBerryNDKSettingsWidget::deactivateNdkTarget()
QString envFilePath = m_ui->ndksTreeWidget->currentItem()->text(1); QString envFilePath = m_ui->ndksTreeWidget->currentItem()->text(1);
BlackBerryConfiguration *config = m_bbConfigManager->configurationFromEnvFile(Utils::FileName::fromString(envFilePath)); BlackBerryConfiguration *config = m_bbConfigManager.configurationFromEnvFile(Utils::FileName::fromString(envFilePath));
if (config && m_activatedTargets.contains(config)) { if (config && m_activatedTargets.contains(config)) {
m_deactivatedTargets << config; m_deactivatedTargets << config;
m_activatedTargets.removeAt(m_activatedTargets.indexOf(config)); m_activatedTargets.removeAt(m_activatedTargets.indexOf(config));
...@@ -310,11 +310,11 @@ void BlackBerryNDKSettingsWidget::uninstallNdkTarget() ...@@ -310,11 +310,11 @@ void BlackBerryNDKSettingsWidget::uninstallNdkTarget()
void BlackBerryNDKSettingsWidget::cleanUp() void BlackBerryNDKSettingsWidget::cleanUp()
{ {
foreach (BlackBerryConfiguration *config, m_bbConfigManager->configurations()) { foreach (BlackBerryConfiguration *config, m_bbConfigManager.configurations()) {
if (!config->isValid()) { if (!config->isValid()) {
m_activatedTargets.removeOne(config); m_activatedTargets.removeOne(config);
m_deactivatedTargets.removeOne(config); m_deactivatedTargets.removeOne(config);
m_bbConfigManager->removeConfiguration(config); m_bbConfigManager.removeConfiguration(config);
} }
} }
...@@ -323,7 +323,7 @@ void BlackBerryNDKSettingsWidget::cleanUp() ...@@ -323,7 +323,7 @@ void BlackBerryNDKSettingsWidget::cleanUp()
void BlackBerryNDKSettingsWidget::handleInstallationFinished() void BlackBerryNDKSettingsWidget::handleInstallationFinished()
{ {
m_bbConfigManager->loadAutoDetectedConfigurations(); m_bbConfigManager.loadAutoDetectedConfigurations();
updateNdkList(); updateNdkList();
} }
...@@ -340,13 +340,13 @@ void BlackBerryNDKSettingsWidget::handleUninstallationFinished() ...@@ -340,13 +340,13 @@ void BlackBerryNDKSettingsWidget::handleUninstallationFinished()
return; return;
} }
BlackBerryConfiguration *config = m_bbConfigManager->configurationFromEnvFile(Utils::FileName::fromString(envFilePath)); BlackBerryConfiguration *config = m_bbConfigManager.configurationFromEnvFile(Utils::FileName::fromString(envFilePath));
if (m_activatedTargets.contains(config)) if (m_activatedTargets.contains(config))
m_activatedTargets.removeAt(m_activatedTargets.indexOf(config)); m_activatedTargets.removeAt(m_activatedTargets.indexOf(config));
else if (m_deactivatedTargets.contains(config)) else if (m_deactivatedTargets.contains(config))
m_deactivatedTargets.removeAt(m_deactivatedTargets.indexOf(config)); m_deactivatedTargets.removeAt(m_deactivatedTargets.indexOf(config));
m_bbConfigManager->removeConfiguration(config); m_bbConfigManager.removeConfiguration(config);
updateNdkList(); updateNdkList();
} }
...@@ -356,7 +356,7 @@ void BlackBerryNDKSettingsWidget::populateDefaultConfigurationCombo() ...@@ -356,7 +356,7 @@ void BlackBerryNDKSettingsWidget::populateDefaultConfigurationCombo()
// prevent QComboBox::currentIndexChanged() from being emitted // prevent QComboBox::currentIndexChanged() from being emitted
m_ui->apiLevelCombo->clear(); m_ui->apiLevelCombo->clear();
QList<BlackBerryConfiguration*> configurations = m_bbConfigManager->configurations(); QList<BlackBerryConfiguration*> configurations = m_bbConfigManager.configurations();
m_ui->apiLevelCombo->addItem(tr("Newest version"), m_ui->apiLevelCombo->addItem(tr("Newest version"),
QVariant::fromValue(static_cast<void*>(0))); QVariant::fromValue(static_cast<void*>(0)));
...@@ -366,7 +366,7 @@ void BlackBerryNDKSettingsWidget::populateDefaultConfigurationCombo() ...@@ -366,7 +366,7 @@ void BlackBerryNDKSettingsWidget::populateDefaultConfigurationCombo()
int configIndex = 0; int configIndex = 0;
BlackBerryConfiguration *defaultConfig = m_bbConfigManager->defaultConfiguration(); BlackBerryConfiguration *defaultConfig = m_bbConfigManager.defaultConfiguration();
foreach (BlackBerryConfiguration *config, configurations) { foreach (BlackBerryConfiguration *config, configurations) {
m_ui->apiLevelCombo->addItem(config->displayName(), m_ui->apiLevelCombo->addItem(config->displayName(),
...@@ -376,7 +376,7 @@ void BlackBerryNDKSettingsWidget::populateDefaultConfigurationCombo() ...@@ -376,7 +376,7 @@ void BlackBerryNDKSettingsWidget::populateDefaultConfigurationCombo()
configIndex = m_ui->apiLevelCombo->count() - 1; configIndex = m_ui->apiLevelCombo->count() - 1;
} }
const int currentIndex = (m_bbConfigManager->newestConfigurationEnabled()) ? 0 : configIndex; const int currentIndex = (m_bbConfigManager.newestConfigurationEnabled()) ? 0 : configIndex;
m_ui->apiLevelCombo->setCurrentIndex(currentIndex); m_ui->apiLevelCombo->setCurrentIndex(currentIndex);
} }
......
...@@ -86,7 +86,7 @@ private: ...@@ -86,7 +86,7 @@ private:
const QString& tagetVersion = QString()); const QString& tagetVersion = QString());
Ui_BlackBerryNDKSettingsWidget *m_ui; Ui_BlackBerryNDKSettingsWidget *m_ui;
BlackBerryConfigurationManager *m_bbConfigManager; BlackBerryConfigurationManager &m_bbConfigManager;
QTreeWidgetItem *m_autoDetectedNdks; QTreeWidgetItem *m_autoDetectedNdks;
QTreeWidgetItem *m_manualNdks; QTreeWidgetItem *m_manualNdks;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment