diff options
Diffstat (limited to 'src/plugins/android/avddialog.cpp')
-rw-r--r-- | src/plugins/android/avddialog.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/android/avddialog.cpp b/src/plugins/android/avddialog.cpp index 78fcfe6b0f..878ccad276 100644 --- a/src/plugins/android/avddialog.cpp +++ b/src/plugins/android/avddialog.cpp @@ -64,7 +64,7 @@ AvdDialog::AvdDialog(int minApiLevel, AndroidSdkManager *sdkManager, const QStri m_avdDialog.abiComboBox->addItems(abis); } - auto v = new QRegExpValidator(m_allowedNameChars, this); + auto v = new QRegularExpressionValidator(m_allowedNameChars, this); m_avdDialog.nameLineEdit->setValidator(v); m_avdDialog.nameLineEdit->installEventFilter(this); @@ -135,7 +135,7 @@ void AvdDialog::parseDeviceDefinitionsList() QStringList avdDeviceInfo; - for (QString line : output.split('\n')) { + for (const QString &line : output.split('\n')) { if (line.startsWith("---------") || line.isEmpty()) { DeviceDefinitionStruct deviceDefinition; for (const QString &line : avdDeviceInfo) { @@ -171,7 +171,7 @@ void AvdDialog::updateDeviceDefinitionComboBox() m_avdDialog.deviceDefinitionTypeComboBox->currentText()); m_avdDialog.deviceDefinitionComboBox->clear(); - for (auto item : m_deviceDefinitionsList) { + for (const DeviceDefinitionStruct &item : m_deviceDefinitionsList) { if (item.deviceType == curDeviceType) m_avdDialog.deviceDefinitionComboBox->addItem(item.name_id); } @@ -258,7 +258,7 @@ bool AvdDialog::eventFilter(QObject *obj, QEvent *event) if (obj == m_avdDialog.nameLineEdit && event->type() == QEvent::KeyPress) { auto ke = static_cast<QKeyEvent *>(event); const QString key = ke->text(); - if (!key.isEmpty() && !m_allowedNameChars.exactMatch(key)) { + if (!key.isEmpty() && !m_allowedNameChars.match(key).hasMatch()) { QPoint position = m_avdDialog.nameLineEdit->parentWidget()->mapToGlobal(m_avdDialog.nameLineEdit->geometry().bottomLeft()); position -= Utils::ToolTip::offsetFromPosition(); Utils::ToolTip::show(position, tr("Allowed characters are: a-z A-Z 0-9 and . _ -"), m_avdDialog.nameLineEdit); |