From 85ed66bae94dcb87dcd948bfca1dbc4c12042226 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 19 May 2014 23:31:01 +0300 Subject: [PATCH] Android: Pass some values by reference Change-Id: Ic12452320728b161afd2907deb036d0c6d9df644 Reviewed-by: BogDan Vatra --- src/plugins/android/androidmanifesteditorwidget.cpp | 11 +++++++---- src/plugins/android/androidmanifesteditorwidget.h | 9 ++++++--- src/plugins/android/androidsettingswidget.cpp | 2 +- src/plugins/android/androidsettingswidget.h | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp index fbe790fd989..957b9521dbf 100644 --- a/src/plugins/android/androidmanifesteditorwidget.cpp +++ b/src/plugins/android/androidmanifesteditorwidget.cpp @@ -646,7 +646,8 @@ bool AndroidManifestEditorWidget::syncToWidgets() return false; } -bool AndroidManifestEditorWidget::checkDocument(QDomDocument doc, QString *errorMessage, int *errorLine, int *errorColumn) +bool AndroidManifestEditorWidget::checkDocument(const QDomDocument &doc, QString *errorMessage, + int *errorLine, int *errorColumn) { QDomElement manifest = doc.documentElement(); if (manifest.tagName() != QLatin1String("manifest")) { @@ -894,7 +895,7 @@ void AndroidManifestEditorWidget::syncToEditor() namespace { 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()); QXmlStreamAttributes result; @@ -1158,7 +1159,9 @@ void AndroidManifestEditorWidget::parseUsesSdk(QXmlStreamReader &reader, QXmlStr } } -QString AndroidManifestEditorWidget::parseUsesPermission(QXmlStreamReader &reader, QXmlStreamWriter &writer, const QSet permissions) +QString AndroidManifestEditorWidget::parseUsesPermission(QXmlStreamReader &reader, + QXmlStreamWriter &writer, + const QSet &permissions) { Q_ASSERT(reader.isStartElement()); @@ -1374,7 +1377,7 @@ QModelIndex PermissionsModel::addPermission(const QString &permission) return index(idx); } -bool PermissionsModel::updatePermission(QModelIndex index, const QString &permission) +bool PermissionsModel::updatePermission(const QModelIndex &index, const QString &permission) { if (!index.isValid()) return false; diff --git a/src/plugins/android/androidmanifesteditorwidget.h b/src/plugins/android/androidmanifesteditorwidget.h index b9477008579..20b578ccd42 100644 --- a/src/plugins/android/androidmanifesteditorwidget.h +++ b/src/plugins/android/androidmanifesteditorwidget.h @@ -69,7 +69,7 @@ public: void setPermissions(const QStringList &permissions); const QStringList &permissions(); QModelIndex addPermission(const QString &permission); - bool updatePermission(QModelIndex index, const QString &permission); + bool updatePermission(const QModelIndex &index, const QString &permission); void removePermission(int index); QVariant data(const QModelIndex &index, int role) const; @@ -137,7 +137,8 @@ private: void syncToWidgets(const QDomDocument &doc); void syncToEditor(); - bool checkDocument(QDomDocument doc, QString *errorMessage, int *errorLine, int *errorColumn); + bool checkDocument(const QDomDocument &doc, QString *errorMessage, + int *errorLine, int *errorColumn); enum IconDPI { LowDPI, MediumDPI, HighDPI }; QIcon icon(const QString &baseDir, IconDPI dpi); QString iconPath(const QString &baseDir, IconDPI dpi); @@ -152,7 +153,9 @@ private: void parseActivity(QXmlStreamReader &reader, QXmlStreamWriter &writer); bool parseMetaData(QXmlStreamReader &reader, QXmlStreamWriter &writer); void parseUsesSdk(QXmlStreamReader &reader, QXmlStreamWriter &writer); - QString parseUsesPermission(QXmlStreamReader &reader, QXmlStreamWriter &writer, const QSet permissions); + QString parseUsesPermission(QXmlStreamReader &reader, + QXmlStreamWriter &writer, + const QSet &permissions); QString parseComment(QXmlStreamReader &reader, QXmlStreamWriter &writer); void parseUnknownElement(QXmlStreamReader &reader, QXmlStreamWriter &writer); diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index f4397ebf8b3..bf77cf81474 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -603,7 +603,7 @@ void AndroidSettingsWidget::startAVD() m_androidConfig.startAVDAsync(m_AVDModel.avdName(m_ui->AVDTableView->currentIndex())); } -void AndroidSettingsWidget::avdActivated(QModelIndex index) +void AndroidSettingsWidget::avdActivated(const QModelIndex &index) { m_ui->AVDRemovePushButton->setEnabled(index.isValid()); m_ui->AVDStartPushButton->setEnabled(index.isValid()); diff --git a/src/plugins/android/androidsettingswidget.h b/src/plugins/android/androidsettingswidget.h index 20a73eae61c..59b99ae608b 100644 --- a/src/plugins/android/androidsettingswidget.h +++ b/src/plugins/android/androidsettingswidget.h @@ -88,7 +88,7 @@ private slots: void avdAdded(); void removeAVD(); void startAVD(); - void avdActivated(QModelIndex); + void avdActivated(const QModelIndex &); void dataPartitionSizeEditingFinished(); void manageAVD(); void createKitToggled();