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

Android: Replace Q_ASSERT with QTC_ASSERT

Browse Source 
Change-Id: Id123fdf3541721075e442aa5e33bca62a1fdbb2e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-10-10 11:24:52 +02:00
parent dd599adad6
commit fae89be345
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ int AndroidExtraLibraryListModel::columnCount(const QModelIndex &) const
QVariant AndroidExtraLibraryListModel::data(const QModelIndex &index, int role) const QVariant AndroidExtraLibraryListModel::data(const QModelIndex &index, int role) const
{ {
Q_ASSERT(index.row() >= 0 && index.row() < m_entries.size()); QTC_ASSERT(index.row() >= 0 && index.row() < m_entries.size(), return {});
if (role == Qt::DisplayRole) if (role == Qt::DisplayRole)
return QDir::cleanPath(m_entries.at(index.row())); return QDir::cleanPath(m_entries.at(index.row()));
return {}; return {};

21
src/plugins/android/androidmanifesteditor.cpp
View File

@@ -31,6 +31,7 @@
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/infobar.h> #include <utils/infobar.h>
#include <utils/qtcassert.h>
#include <utils/stylehelper.h> #include <utils/stylehelper.h>
#include <utils/utilsicons.h> #include <utils/utilsicons.h>
@@ -1018,7 +1019,7 @@ namespace {
QXmlStreamAttributes modifyXmlStreamAttributes(const QXmlStreamAttributes &input, const QStringList &keys, QXmlStreamAttributes modifyXmlStreamAttributes(const QXmlStreamAttributes &input, const QStringList &keys,
const QStringList &values, const QStringList &remove = QStringList()) const QStringList &values, const QStringList &remove = QStringList())
{ {
Q_ASSERT(keys.size() == values.size()); QTC_ASSERT(keys.size() == values.size(), return {});
QXmlStreamAttributes result; QXmlStreamAttributes result;
result.reserve(input.size()); result.reserve(input.size());
for (const QXmlStreamAttribute &attribute : input) { for (const QXmlStreamAttribute &attribute : input) {
@@ -1043,7 +1044,7 @@ QXmlStreamAttributes modifyXmlStreamAttributes(const QXmlStreamAttributes &input
void AndroidManifestEditorWidget::parseManifest(QXmlStreamReader &reader, QXmlStreamWriter &writer) void AndroidManifestEditorWidget::parseManifest(QXmlStreamReader &reader, QXmlStreamWriter &writer)
{ {
Q_ASSERT(reader.isStartElement()); QTC_ASSERT(reader.isStartElement(), return);
writer.writeStartElement(reader.name().toString()); writer.writeStartElement(reader.name().toString());
QXmlStreamAttributes attributes = reader.attributes(); QXmlStreamAttributes attributes = reader.attributes();
@@ -1122,7 +1123,7 @@ void AndroidManifestEditorWidget::parseManifest(QXmlStreamReader &reader, QXmlSt
void AndroidManifestEditorWidget::parseApplication(QXmlStreamReader &reader, QXmlStreamWriter &writer) void AndroidManifestEditorWidget::parseApplication(QXmlStreamReader &reader, QXmlStreamWriter &writer)
{ {
Q_ASSERT(reader.isStartElement()); QTC_ASSERT(reader.isStartElement(), return);
writer.writeStartElement(reader.name().toString()); writer.writeStartElement(reader.name().toString());
QXmlStreamAttributes attributes = reader.attributes(); QXmlStreamAttributes attributes = reader.attributes();
@@ -1209,8 +1210,7 @@ void AndroidManifestEditorWidget::parseSplashScreen(QXmlStreamWriter &writer)
void AndroidManifestEditorWidget::parseActivity(QXmlStreamReader &reader, QXmlStreamWriter &writer) void AndroidManifestEditorWidget::parseActivity(QXmlStreamReader &reader, QXmlStreamWriter &writer)
{ {
Q_ASSERT(reader.isStartElement()); QTC_ASSERT(reader.isStartElement(), return);
writer.writeStartElement(reader.name().toString()); writer.writeStartElement(reader.name().toString());
QXmlStreamAttributes attributes = reader.attributes(); QXmlStreamAttributes attributes = reader.attributes();
QStringList keys = { QLatin1String("android:label"), QLatin1String("android:screenOrientation") }; QStringList keys = { QLatin1String("android:label"), QLatin1String("android:screenOrientation") };
@@ -1254,8 +1254,7 @@ void AndroidManifestEditorWidget::parseActivity(QXmlStreamReader &reader, QXmlSt
bool AndroidManifestEditorWidget::parseMetaData(QXmlStreamReader &reader, QXmlStreamWriter &writer) bool AndroidManifestEditorWidget::parseMetaData(QXmlStreamReader &reader, QXmlStreamWriter &writer)
{ {
Q_ASSERT(reader.isStartElement()); QTC_ASSERT(reader.isStartElement(), return false);
bool found = false; bool found = false;
QXmlStreamAttributes attributes = reader.attributes(); QXmlStreamAttributes attributes = reader.attributes();
QXmlStreamAttributes result; QXmlStreamAttributes result;
@@ -1345,10 +1344,8 @@ QString AndroidManifestEditorWidget::parseUsesPermission(QXmlStreamReader &reade
QXmlStreamWriter &writer, QXmlStreamWriter &writer,
const QSet<QString> &permissions) const QSet<QString> &permissions)
{ {
Q_ASSERT(reader.isStartElement()); QTC_ASSERT(reader.isStartElement(), return {});
const QString permissionName = reader.attributes().value(QLatin1String("android:name")).toString();
QString permissionName = reader.attributes().value(QLatin1String("android:name")).toString();
bool writePermission = permissions.contains(permissionName); bool writePermission = permissions.contains(permissionName);
if (writePermission) if (writePermission)
writer.writeCurrentToken(reader); writer.writeCurrentToken(reader);
@@ -1388,7 +1385,7 @@ QString AndroidManifestEditorWidget::parseComment(QXmlStreamReader &reader, QXml
void AndroidManifestEditorWidget::parseUnknownElement(QXmlStreamReader &reader, QXmlStreamWriter &writer) void AndroidManifestEditorWidget::parseUnknownElement(QXmlStreamReader &reader, QXmlStreamWriter &writer)
{ {
Q_ASSERT(reader.isStartElement()); QTC_ASSERT(reader.isStartElement(), return);
writer.writeCurrentToken(reader); writer.writeCurrentToken(reader);
reader.readNext(); reader.readNext();