From f432e47921061d18123a8ffb2e9297d110d08058 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Tue, 16 Oct 2012 10:42:59 +0200
Subject: [PATCH] Remove Q_ASSERTs
Change-Id: I7344935fd488b4bd65517378ca198185023c2532
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
src/plugins/projectexplorer/kitinformation.cpp | 4 ----
src/plugins/projectexplorer/kitmanager.cpp | 4 ++--
src/plugins/projectexplorer/kitmanagerconfigwidget.cpp | 5 +++--
src/plugins/projectexplorer/kitmodel.cpp | 8 --------
src/plugins/projectexplorer/kitoptionspage.cpp | 1 -
5 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp
index 6d0b3a64067..81c068c43f6 100644
--- a/src/plugins/projectexplorer/kitinformation.cpp
+++ b/src/plugins/projectexplorer/kitinformation.cpp
@@ -89,7 +89,6 @@ QList<Task> SysRootKitInformation::validate(const Kit *k) const
KitConfigWidget *SysRootKitInformation::createConfigWidget(Kit *k) const
{
- Q_ASSERT(k);
return new Internal::SysRootInformationConfigWidget(k);
}
@@ -184,7 +183,6 @@ void ToolChainKitInformation::fix(Kit *k)
KitConfigWidget *ToolChainKitInformation::createConfigWidget(Kit *k) const
{
- Q_ASSERT(k);
return new Internal::ToolChainInformationConfigWidget(k);
}
@@ -280,7 +278,6 @@ QList<Task> DeviceTypeKitInformation::validate(const Kit *k) const
KitConfigWidget *DeviceTypeKitInformation::createConfigWidget(Kit *k) const
{
- Q_ASSERT(k);
return new Internal::DeviceTypeInformationConfigWidget(k);
}
@@ -373,7 +370,6 @@ void DeviceKitInformation::fix(Kit *k)
KitConfigWidget *DeviceKitInformation::createConfigWidget(Kit *k) const
{
- Q_ASSERT(k);
return new Internal::DeviceInformationConfigWidget(k);
}
diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index a9540c239c0..e5fc49583ed 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -115,7 +115,7 @@ KitManager::KitManager(QObject *parent) :
QObject(parent),
d(new Internal::KitManagerPrivate())
{
- Q_ASSERT(!m_instance);
+ QTC_CHECK(!m_instance);
m_instance = this;
connect(Core::ICore::instance(), SIGNAL(saveSettingsRequested()),
@@ -256,7 +256,7 @@ void KitManager::registerKitInformation(KitInformation *ki)
void KitManager::deregisterKitInformation(KitInformation *ki)
{
- Q_ASSERT(d->m_informationList.contains(ki));
+ QTC_CHECK(d->m_informationList.contains(ki));
d->m_informationList.removeAll(ki);
delete ki;
}
diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
index 86fc51e6431..3770f16000c 100644
--- a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
+++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
@@ -33,6 +33,7 @@
#include "kitmanager.h"
#include <utils/detailswidget.h>
+#include <utils/qtcassert.h>
#include <QHBoxLayout>
#include <QFileDialog>
@@ -159,8 +160,8 @@ QString KitManagerConfigWidget::validityMessage() const
void KitManagerConfigWidget::addConfigWidget(ProjectExplorer::KitConfigWidget *widget)
{
- Q_ASSERT(widget);
- Q_ASSERT(!m_widgets.contains(widget));
+ QTC_ASSERT(widget, return);
+ QTC_ASSERT(!m_widgets.contains(widget), return);
addToLayout(widget->displayName(), widget->toolTip(), widget, widget->buttonWidget());
m_widgets.append(widget);
diff --git a/src/plugins/projectexplorer/kitmodel.cpp b/src/plugins/projectexplorer/kitmodel.cpp
index 6f2f5bafe9d..04dc879556c 100644
--- a/src/plugins/projectexplorer/kitmodel.cpp
+++ b/src/plugins/projectexplorer/kitmodel.cpp
@@ -76,7 +76,6 @@ public:
// so operate on a temporary list
QList<KitNode *> tmp = childNodes;
qDeleteAll(tmp);
- Q_ASSERT(childNodes.isEmpty());
}
KitNode *parent;
@@ -93,8 +92,6 @@ KitModel::KitModel(QBoxLayout *parentLayout, QObject *parent) :
m_parentLayout(parentLayout),
m_defaultNode(0)
{
- Q_ASSERT(m_parentLayout);
-
connect(KitManager::instance(), SIGNAL(kitAdded(ProjectExplorer::Kit*)),
this, SLOT(addKit(ProjectExplorer::Kit*)));
connect(KitManager::instance(), SIGNAL(kitRemoved(ProjectExplorer::Kit*)),
@@ -196,7 +193,6 @@ Qt::ItemFlags KitModel::flags(const QModelIndex &index) const
return 0;
KitNode *node = static_cast<KitNode *>(index.internalPointer());
- Q_ASSERT(node);
if (!node->widget)
return Qt::ItemIsEnabled;
@@ -216,7 +212,6 @@ Kit *KitModel::kit(const QModelIndex &index)
if (!index.isValid())
return 0;
KitNode *node = static_cast<KitNode *>(index.internalPointer());
- Q_ASSERT(node);
return node->widget->workingCopy();
}
@@ -231,7 +226,6 @@ void KitModel::setDefaultKit(const QModelIndex &index)
if (!index.isValid())
return;
KitNode *node = static_cast<KitNode *>(index.internalPointer());
- Q_ASSERT(node);
if (node->widget)
setDefaultNode(node);
}
@@ -246,7 +240,6 @@ KitManagerConfigWidget *KitModel::widget(const QModelIndex &index)
if (!index.isValid())
return 0;
KitNode *node = static_cast<KitNode *>(index.internalPointer());
- Q_ASSERT(node);
return node->widget;
}
@@ -284,7 +277,6 @@ void KitModel::apply()
Q_ASSERT(!n->parent);
n->widget->removeKit();
}
- Q_ASSERT(m_toRemoveList.isEmpty());
// Update kits:
foreach (KitNode *n, m_manualRoot->childNodes) {
diff --git a/src/plugins/projectexplorer/kitoptionspage.cpp b/src/plugins/projectexplorer/kitoptionspage.cpp
index 71a0a4d6197..e61123c1a1c 100644
--- a/src/plugins/projectexplorer/kitoptionspage.cpp
+++ b/src/plugins/projectexplorer/kitoptionspage.cpp
@@ -94,7 +94,6 @@ QWidget *KitOptionsPage::createPage(QWidget *parent)
QVBoxLayout *verticalLayout = new QVBoxLayout(m_configWidget);
verticalLayout->addLayout(horizontalLayout);
- Q_ASSERT(!m_model);
m_model = new Internal::KitModel(verticalLayout);
connect(m_model, SIGNAL(kitStateChanged()), this, SLOT(updateState()));
--
GitLab