From be45d72a1a56b22db020e7749d82bc833147a08a Mon Sep 17 00:00:00 2001 From: Fanda Vacek Date: Sat, 20 Jan 2024 21:07:00 +0100 Subject: [PATCH] Some spaces identation changed to tabs --- .../src/reports/processor/style/brush.cpp | 14 +++++----- .../src/reports/processor/style/sheet.cpp | 18 ++++++------ .../reports/processor/style/styleobject.cpp | 28 +++++++++---------- .../CardReader/src/cardreaderplugin.cpp | 14 +++++----- .../CardReader/src/services/qropunch.cpp | 4 +-- .../src/services/qropunchwidget.cpp | 2 +- .../plugins/Core/src/coreplugin.cpp | 4 +-- 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/libqf/libqfqmlwidgets/src/reports/processor/style/brush.cpp b/libqf/libqfqmlwidgets/src/reports/processor/style/brush.cpp index e09e54c3a..04f59f165 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/style/brush.cpp +++ b/libqf/libqfqmlwidgets/src/reports/processor/style/brush.cpp @@ -18,17 +18,17 @@ QBrush Brush::brush() { qfLogFuncFrame() << this << "is dirty:" << isDirty(); if(isDirty()) { - setDirty(false); - { + setDirty(false); + { QVariant v = basedOn(); qfDebug() << "\t based on:" << v.toString(); if(v.isValid()) { - QObject *o = styleobjectFromVariant(v); + QObject *o = styleobjectFromVariant(v); Brush *based_on = qobject_cast(o); qfDebug() << "\t\t based on object:" << based_on; - if(based_on) { - m_brush = based_on->brush(); - } + if(based_on) { + m_brush = based_on->brush(); + } } } { @@ -54,5 +54,5 @@ QBrush Brush::brush() m_brush.setStyle(Qt::SolidPattern); } } - return m_brush; + return m_brush; } diff --git a/libqf/libqfqmlwidgets/src/reports/processor/style/sheet.cpp b/libqf/libqfqmlwidgets/src/reports/processor/style/sheet.cpp index b2edff1c6..fb0ed665c 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/style/sheet.cpp +++ b/libqf/libqfqmlwidgets/src/reports/processor/style/sheet.cpp @@ -43,21 +43,21 @@ void Sheet::createStyleCache_helper(QObject *parent) QObject *Sheet::styleObjectForName(StyleObject::StyleGroup style_object_group, const QString &name, bool should_exist) { - ObjectMap om = m_definedStyles.value(style_object_group); - QObject *ret = om.value(name); - if(ret == nullptr && should_exist) - qfError() << "Cannot find style object for style group:" << style_object_group << "name:" + name; - return ret; + ObjectMap om = m_definedStyles.value(style_object_group); + QObject *ret = om.value(name); + if(ret == nullptr && should_exist) + qfError() << "Cannot find style object for style group:" << style_object_group << "name:" + name; + return ret; } void Sheet::setStyleObjectForName(StyleObject::StyleGroup style_object_group, const QString &name, QObject *o) { //qfInfo() << Q_FUNC_INFO << name << style_object_group << o; - ObjectMap &om = m_definedStyles[style_object_group]; - if(o) - om[name] = o; + ObjectMap &om = m_definedStyles[style_object_group]; + if(o) + om[name] = o; else - om.remove(name); + om.remove(name); } QQmlListProperty Sheet::colors() diff --git a/libqf/libqfqmlwidgets/src/reports/processor/style/styleobject.cpp b/libqf/libqfqmlwidgets/src/reports/processor/style/styleobject.cpp index 96443993e..56874c83c 100644 --- a/libqf/libqfqmlwidgets/src/reports/processor/style/styleobject.cpp +++ b/libqf/libqfqmlwidgets/src/reports/processor/style/styleobject.cpp @@ -72,23 +72,23 @@ Sheet *StyleObject::rootStyleSheet() QObject *StyleObject::styleobjectFromVariant(const QVariant &v, StyleGroup style_group, bool should_exist) { - QObject *ret = nullptr; - if(v.isValid()) { - ret = v.value(); - if(!ret) { + QObject *ret = nullptr; + if(v.isValid()) { + ret = v.value(); + if(!ret) { #if QT_VERSION_MAJOR >= 6 - if(v.typeId() == QMetaType::QString) { + if(v.typeId() == QMetaType::QString) { #else - if(v.type() == QVariant::String) { + if(v.type() == QVariant::String) { #endif - StyleGroup sg = style_group; - if(sg == SGOwn) - sg = m_styleGroup; - ret = rootStyleSheet()->styleObjectForName(sg, v.toString(), should_exist); - } - } - } - return ret; + StyleGroup sg = style_group; + if(sg == SGOwn) + sg = m_styleGroup; + ret = rootStyleSheet()->styleObjectForName(sg, v.toString(), should_exist); + } + } + } + return ret; } /* QString StyleObject::nextSequentialName() diff --git a/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.cpp b/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.cpp index 5ab4a178e..ecbbde184 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.cpp +++ b/quickevent/app/quickevent/plugins/CardReader/src/cardreaderplugin.cpp @@ -115,17 +115,17 @@ int CardReaderPlugin::findRunId(int si_id, int si_finish_time, QString *err_msg) bool is_relays = getPlugin()->eventConfig()->isRelays(); if(is_relays) { q.exec("SELECT id, leg, startTimeMs, finishTimeMs FROM runs WHERE siId=" QF_IARG(si_id) - " AND isRunning" - " ORDER BY leg DESC" - , qf::core::Exception::Throw); + " AND isRunning" + " ORDER BY leg DESC" +, qf::core::Exception::Throw); } else { int stage_no = currentStageId(); q.exec("SELECT id, startTimeMs, finishTimeMs FROM runs WHERE stageId=" QF_IARG(stage_no) - " AND siId=" QF_IARG(si_id) - " AND isRunning" - //" ORDER BY finishTimeMs" - , qf::core::Exception::Throw); + " AND siId=" QF_IARG(si_id) + " AND isRunning" + //" ORDER BY finishTimeMs" + , qf::core::Exception::Throw); } while(q.next()) { diff --git a/quickevent/app/quickevent/plugins/CardReader/src/services/qropunch.cpp b/quickevent/app/quickevent/plugins/CardReader/src/services/qropunch.cpp index 89512783b..c3032ffb7 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/services/qropunch.cpp +++ b/quickevent/app/quickevent/plugins/CardReader/src/services/qropunch.cpp @@ -74,8 +74,8 @@ void QrOPunch::init() } if (ss.isWriteLogFile()) { m_logFileFs.close(); - m_logFileFs.open(ss.logFileName().toLocal8Bit(), std::ios_base::app); - if (!m_logFileFs) { + m_logFileFs.open(ss.logFileName().toLocal8Bit(), std::ios_base::app); + if (!m_logFileFs) { qfError() << "Failed to open file for logging: " << ss.logFileName(); } else { qfInfo() << "Opened file for logging: " << ss.logFileName(); diff --git a/quickevent/app/quickevent/plugins/CardReader/src/services/qropunchwidget.cpp b/quickevent/app/quickevent/plugins/CardReader/src/services/qropunchwidget.cpp index 5448c0332..4ed7ace70 100644 --- a/quickevent/app/quickevent/plugins/CardReader/src/services/qropunchwidget.cpp +++ b/quickevent/app/quickevent/plugins/CardReader/src/services/qropunchwidget.cpp @@ -72,7 +72,7 @@ void QrOPunchWidget::onBtChooseLogFileClicked() if (svc) { QrOPunchSettings ss = svc->settings(); QString file = QFileDialog::getSaveFileName(this, tr("Choose file to log requests"), ss.logFileName(), - {}, nullptr, QFileDialog::DontConfirmOverwrite); + {}, nullptr, QFileDialog::DontConfirmOverwrite); if (!file.isEmpty()) ui->edLogFile->setText(file); } diff --git a/quickevent/app/quickevent/plugins/Core/src/coreplugin.cpp b/quickevent/app/quickevent/plugins/Core/src/coreplugin.cpp index e57168c91..f75749c0d 100644 --- a/quickevent/app/quickevent/plugins/Core/src/coreplugin.cpp +++ b/quickevent/app/quickevent/plugins/Core/src/coreplugin.cpp @@ -52,8 +52,8 @@ void CorePlugin::onInstalled() { auto *page = new ReportsSettingsPage(); settingsDialog()->addPage(page); - setReportsDir(page->reportsDirectory()); - qfInfo() << "Reports dir set to:" << reportsDir(); + setReportsDir(page->reportsDirectoryFromSettings()); + qfInfo() << "Reports dir set to:" << effectiveReportsDir(); } auto *a_file = fwk->menuBar()->actionForPath("file", true);