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

Replace a few more Aspect::value() calls with operator() uses

Browse Source 
Change-Id: I9343e74bfb51af41df02a411976b82b9260be2fb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-07-19 09:06:17 +02:00
parent 7dfdb6d36c
commit b14b7b1a5f
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/python/pythonwizardpage.cpp
View File

@@ -140,7 +140,7 @@ void PythonWizardPage::initializePage()
bool PythonWizardPage::validatePage() bool PythonWizardPage::validatePage()
{ {
if (m_createVenv.value() && !m_venvPath.pathChooser()->isValid()) if (m_createVenv() && !m_venvPath.pathChooser()->isValid())
return false; return false;
auto wiz = qobject_cast<JsonWizard *>(wizard()); auto wiz = qobject_cast<JsonWizard *>(wizard());
const QMap<QString, QVariant> data = m_pySideVersion.itemValue().toMap(); const QMap<QString, QVariant> data = m_pySideVersion.itemValue().toMap();
@@ -156,7 +156,7 @@ void PythonWizardPage::setupProject(const JsonWizard::GeneratorFiles &files)
Interpreter interpreter = m_interpreter.currentInterpreter(); Interpreter interpreter = m_interpreter.currentInterpreter();
Project *project = ProjectManager::openProject(Utils::mimeTypeForFile(f.file.filePath()), Project *project = ProjectManager::openProject(Utils::mimeTypeForFile(f.file.filePath()),
f.file.filePath().absoluteFilePath()); f.file.filePath().absoluteFilePath());
if (m_createVenv.value()) { if (m_createVenv()) {
auto openProjectWithInterpreter = [f](const std::optional<Interpreter> &interpreter) { auto openProjectWithInterpreter = [f](const std::optional<Interpreter> &interpreter) {
if (!interpreter) if (!interpreter)
return; return;
@@ -202,7 +202,7 @@ void PythonWizardPage::updateInterpreters()
void PythonWizardPage::updateStateLabel() void PythonWizardPage::updateStateLabel()
{ {
QTC_ASSERT(m_stateLabel, return); QTC_ASSERT(m_stateLabel, return);
if (m_createVenv.value()) { if (m_createVenv()) {
if (PathChooser *pathChooser = m_venvPath.pathChooser()) { if (PathChooser *pathChooser = m_venvPath.pathChooser()) {
if (!pathChooser->isValid()) { if (!pathChooser->isValid()) {
m_stateLabel->show(); m_stateLabel->show();

2
src/plugins/subversion/subversionplugin.cpp
View File

@@ -864,7 +864,7 @@ void SubversionPluginPrivate::vcsAnnotateHelper(const FilePath &workingDir, cons
CommandLine args{settings().binaryPath(), {"annotate"}}; CommandLine args{settings().binaryPath(), {"annotate"}};
args << SubversionClient::AddAuthOptions(); args << SubversionClient::AddAuthOptions();
if (settings().spaceIgnorantAnnotation.value()) if (settings().spaceIgnorantAnnotation())
args << "-x" << "-uw"; args << "-x" << "-uw";
if (!revision.isEmpty()) if (!revision.isEmpty())
args << "-r" << revision; args << "-r" << revision;

2
src/plugins/terminal/terminalpane.cpp
View File

@@ -78,7 +78,7 @@ TerminalPane::TerminalPane(QObject *parent)
static const QString shiftEsc = QKeySequence( static const QString shiftEsc = QKeySequence(
QKeyCombination(Qt::ShiftModifier, Qt::Key_Escape)) QKeyCombination(Qt::ShiftModifier, Qt::Key_Escape))
.toString(QKeySequence::NativeText); .toString(QKeySequence::NativeText);
if (settings().sendEscapeToTerminal.value()) { if (settings().sendEscapeToTerminal()) {
m_escSettingButton->setText(escKey); m_escSettingButton->setText(escKey);
m_escSettingButton->setToolTip(Tr::tr("Sends Esc to terminal instead of Qt Creator.")); m_escSettingButton->setToolTip(Tr::tr("Sends Esc to terminal instead of Qt Creator."));
} else { } else {

4
src/plugins/terminal/terminalwidget.cpp
View File

@@ -1004,7 +1004,7 @@ void TerminalWidget::paintCursor(QPainter &p) const
cursor.shape = Internal::Cursor::Shape::Underline; cursor.shape = Internal::Cursor::Shape::Underline;
const bool blinkState = !cursor.blink || m_cursorBlinkState const bool blinkState = !cursor.blink || m_cursorBlinkState
|| !settings().allowBlinkingCursor.value(); || !settings().allowBlinkingCursor();
if (cursor.visible && blinkState) { if (cursor.visible && blinkState) {
const int cursorCellWidth = m_surface->cellWidthAt(cursor.position.x(), cursor.position.y()); const int cursorCellWidth = m_surface->cellWidthAt(cursor.position.x(), cursor.position.y());
@@ -1160,7 +1160,7 @@ void TerminalWidget::keyPressEvent(QKeyEvent *event)
} }
if (event->key() == Qt::Key_Escape) { if (event->key() == Qt::Key_Escape) {
bool sendToTerminal = settings().sendEscapeToTerminal.value(); bool sendToTerminal = settings().sendEscapeToTerminal();
bool send = false; bool send = false;
if (sendToTerminal && event->modifiers() == Qt::NoModifier) if (sendToTerminal && event->modifiers() == Qt::NoModifier)
send = true; send = true;