diff --git a/plugins/generic/skg_monthly/skgmonthlypluginwidget.cpp b/plugins/generic/skg_monthly/skgmonthlypluginwidget.cpp --- a/plugins/generic/skg_monthly/skgmonthlypluginwidget.cpp +++ b/plugins/generic/skg_monthly/skgmonthlypluginwidget.cpp @@ -66,7 +66,7 @@ ui.kTemplate->setValidator(newValidator); connect(getDocument(), &SKGDocument::tableModified, this, &SKGMonthlyPluginWidget::dataModified, Qt::QueuedConnection); - connect(ui.kMonth, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGMonthlyPluginWidget::onPeriodChanged, Qt::QueuedConnection); + connect(ui.kMonth, static_cast(&SKGComboBox::currentTextChanged), this, &SKGMonthlyPluginWidget::onPeriodChanged, Qt::QueuedConnection); QStringList overlays; overlays.push_back(QStringLiteral("list-add")); @@ -148,7 +148,7 @@ void SKGMonthlyPluginWidget::fillTemplateList() { - disconnect(ui.kTemplate, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGMonthlyPluginWidget::onPeriodChanged); + disconnect(ui.kTemplate, static_cast(&SKGComboBox::currentTextChanged), this, &SKGMonthlyPluginWidget::onPeriodChanged); // Get previous selected item QString current = ui.kTemplate->text(); @@ -172,7 +172,7 @@ if (!current.isEmpty() && ui.kTemplate->contains(current)) { ui.kTemplate->setCurrentItem(current); } - connect(ui.kTemplate, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGMonthlyPluginWidget::onPeriodChanged, Qt::QueuedConnection); + connect(ui.kTemplate, static_cast(&SKGComboBox::currentTextChanged), this, &SKGMonthlyPluginWidget::onPeriodChanged, Qt::QueuedConnection); } void SKGMonthlyPluginWidget::onAddTemplate() diff --git a/plugins/generic/skg_properties/skgpropertiesplugin.cpp b/plugins/generic/skg_properties/skgpropertiesplugin.cpp --- a/plugins/generic/skg_properties/skgpropertiesplugin.cpp +++ b/plugins/generic/skg_properties/skgpropertiesplugin.cpp @@ -51,7 +51,7 @@ m_billsProcess.setStandardOutputFile(QDir::tempPath() % "/skg_bills.csv"); m_billsProcess.start(QStringLiteral("boobill bills -q -f csv -v")); - connect(&m_billsProcess, static_cast(&QProcess::finished), this, &SKGPropertiesPlugin::onBillsRetreived); + connect(&m_billsProcess, QOverload::of(&QProcess::finished), this, &SKGPropertiesPlugin::onBillsRetreived); connect(&m_billsProcess, static_cast(&QProcess::error), this, &SKGPropertiesPlugin::onBillsRetreived); } diff --git a/plugins/generic/skg_properties/skgpropertiesplugindockwidget.cpp b/plugins/generic/skg_properties/skgpropertiesplugindockwidget.cpp --- a/plugins/generic/skg_properties/skgpropertiesplugindockwidget.cpp +++ b/plugins/generic/skg_properties/skgpropertiesplugindockwidget.cpp @@ -87,7 +87,7 @@ connect(modelview, &SKGObjectModelBase::beforeReset, ui.kView, &SKGTreeView::saveSelection); connect(modelview, &SKGObjectModelBase::afterReset, ui.kView, &SKGTreeView::resetSelection); connect(ui.kView, &SKGTableView::selectionChangedDelayed, this, &SKGPropertiesPluginDockWidget::onSelectionChanged); - connect(ui.kForCmb, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGPropertiesPluginDockWidget::refresh); + connect(ui.kForCmb, static_cast(&SKGComboBox::currentTextChanged), this, &SKGPropertiesPluginDockWidget::refresh); connect(ui.kAdd, &QPushButton::clicked, this, &SKGPropertiesPluginDockWidget::onAddProperty); connect(ui.kRemove, &QPushButton::clicked, this, &SKGPropertiesPluginDockWidget::onRemoveProperty); connect(ui.kSelectFile, &QPushButton::clicked, this, &SKGPropertiesPluginDockWidget::onSelectFile); diff --git a/plugins/generic/skg_statistic/skgstatisticplugin.cpp b/plugins/generic/skg_statistic/skgstatisticplugin.cpp --- a/plugins/generic/skg_statistic/skgstatisticplugin.cpp +++ b/plugins/generic/skg_statistic/skgstatisticplugin.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #include "skgmainpanel.h" #include "skgtraces.h" @@ -141,7 +142,7 @@ QString os = QStringLiteral("Unknown"); #endif m_stats[QStringLiteral("current.os")] = os; - QRect scr = QApplication::desktop()->screenGeometry(); + QRect scr = QGuiApplication::primaryScreen()->geometry(); m_stats[QStringLiteral("current.screen")] = QString(SKGServices::intToString(scr.width()) % 'x' % SKGServices::intToString(scr.height())); #ifdef HAVE_UNAME diff --git a/plugins/import/skrooge_import_mmb/skgimportpluginmmb.cpp b/plugins/import/skrooge_import_mmb/skgimportpluginmmb.cpp --- a/plugins/import/skrooge_import_mmb/skgimportpluginmmb.cpp +++ b/plugins/import/skrooge_import_mmb/skgimportpluginmmb.cpp @@ -69,7 +69,7 @@ if (!originalDocument.open()) { // Set error message QSqlError sqlErr = originalDocument.lastError(); - err = SKGError(SQLLITEERROR + sqlErr.number(), sqlErr.text()); + err = SKGError(SQLLITEERROR + sqlErr.nativeErrorCode().toInt(), sqlErr.text()); } IFOK(err) { QMap mapUnit; diff --git a/plugins/import/skrooge_import_skg/skgimportpluginskg.cpp b/plugins/import/skrooge_import_skg/skgimportpluginskg.cpp --- a/plugins/import/skrooge_import_skg/skgimportpluginskg.cpp +++ b/plugins/import/skrooge_import_skg/skgimportpluginskg.cpp @@ -498,7 +498,7 @@ if (!fileDb.open()) { // Set error message QSqlError sqlErr = fileDb.lastError(); - err = SKGError(SQLLITEERROR + sqlErr.number(), sqlErr.text()); + err = SKGError(SQLLITEERROR + sqlErr.nativeErrorCode().toInt(), sqlErr.text()); } else { if (ext == QStringLiteral("SQLCIPHER") && !pwd.isEmpty()) { IFOKDO(err, SKGServices::executeSqliteOrder(fileDb, "PRAGMA KEY = '" % SKGServices::stringToSqlString(pwd) % "'")); diff --git a/plugins/skrooge/skrooge_budget/skgbudgetpluginwidget.cpp b/plugins/skrooge/skrooge_budget/skgbudgetpluginwidget.cpp --- a/plugins/skrooge/skrooge_budget/skgbudgetpluginwidget.cpp +++ b/plugins/skrooge/skrooge_budget/skgbudgetpluginwidget.cpp @@ -182,7 +182,7 @@ connect(ui.kAddBtn, &QPushButton::clicked, this, &SKGBudgetPluginWidget::onAddClicked); connect(ui.kModifyBtn, &QPushButton::clicked, this, &SKGBudgetPluginWidget::onUpdateClicked); connect(ui.kAmountEdit, &SKGCalculatorEdit::textChanged, this, &SKGBudgetPluginWidget::onCreatorModified); - connect(ui.kPeriod, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGBudgetPluginWidget::onCreatorModified); + connect(ui.kPeriod, static_cast(&SKGComboBox::currentTextChanged), this, &SKGBudgetPluginWidget::onCreatorModified); connect(ui.kYearCheck, &QCheckBox::toggled, ui.kYearRule, &QSpinBox::setEnabled); connect(ui.kMonthCheck, &QCheckBox::toggled, ui.kMonthRule, &QSpinBox::setEnabled); connect(ui.kCategoryCheck, &QCheckBox::toggled, ui.kCategoryRule, &SKGComboBox::setEnabled); diff --git a/plugins/skrooge/skrooge_calculator/skgcalculatorpluginwidget.cpp b/plugins/skrooge/skrooge_calculator/skgcalculatorpluginwidget.cpp --- a/plugins/skrooge/skrooge_calculator/skgcalculatorpluginwidget.cpp +++ b/plugins/skrooge/skrooge_calculator/skgcalculatorpluginwidget.cpp @@ -96,8 +96,8 @@ ui.kWidgetSelector->setSelectedMode(0); // Refresh - connect(ui.kDisplayAccountCombo, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGCalculatorPluginWidget::onFilterChanged, Qt::QueuedConnection); - connect(ui.KYearEdit, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGCalculatorPluginWidget::onFilterChanged, Qt::QueuedConnection); + connect(ui.kDisplayAccountCombo, static_cast(&SKGComboBox::currentTextChanged), this, &SKGCalculatorPluginWidget::onFilterChanged, Qt::QueuedConnection); + connect(ui.KYearEdit, static_cast(&SKGComboBox::currentTextChanged), this, &SKGCalculatorPluginWidget::onFilterChanged, Qt::QueuedConnection); connect(getDocument(), &SKGDocument::tableModified, this, &SKGCalculatorPluginWidget::dataModified, Qt::QueuedConnection); dataModified(QLatin1String(""), 0); @@ -113,7 +113,7 @@ connect(ui.kAdd, &QPushButton::clicked, this, &SKGCalculatorPluginWidget::onAdd); connect(ui.kUpdate, &QPushButton::clicked, this, &SKGCalculatorPluginWidget::onUpdate); connect(ui.kLoanEdit, &SKGCalculatorEdit::textChanged, this, &SKGCalculatorPluginWidget::onAmortizationComputationDelayed); - connect(ui.kUnitEdit, static_cast(&SKGUnitComboBox::currentIndexChanged), this, &SKGCalculatorPluginWidget::onAmortizationComputationDelayed); + connect(ui.kUnitEdit, static_cast(&SKGUnitComboBox::currentTextChanged), this, &SKGCalculatorPluginWidget::onAmortizationComputationDelayed); connect(ui.kLenghtEdit, static_cast(&QSpinBox::valueChanged), this, &SKGCalculatorPluginWidget::onAmortizationComputationDelayed); connect(ui.kAnnualRateEdit, static_cast(&QDoubleSpinBox::valueChanged), this, &SKGCalculatorPluginWidget::onAmortizationComputationDelayed); connect(ui.kInsuranceRateEdit, static_cast(&QDoubleSpinBox::valueChanged), this, &SKGCalculatorPluginWidget::onAmortizationComputationDelayed); @@ -318,7 +318,7 @@ // Fill years if (db != nullptr && (iTableName == QStringLiteral("v_operation_display") || iTableName.isEmpty())) { - disconnect(ui.KYearEdit, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGCalculatorPluginWidget::onFilterChanged); + disconnect(ui.KYearEdit, static_cast(&SKGComboBox::currentTextChanged), this, &SKGCalculatorPluginWidget::onFilterChanged); int lastYear = QDate::currentDate().year(); int firstYear = lastYear; @@ -340,7 +340,7 @@ } ui.KYearEdit->setText(year); - connect(ui.KYearEdit, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGCalculatorPluginWidget::onFilterChanged); + connect(ui.KYearEdit, static_cast(&SKGComboBox::currentTextChanged), this, &SKGCalculatorPluginWidget::onFilterChanged); } // Refresh computation if (db != nullptr && (iTableName == QStringLiteral("interest") || iTableName == QStringLiteral("account") || iTableName.isEmpty())) { diff --git a/plugins/skrooge/skrooge_operation/skgoperationpluginwidget.cpp b/plugins/skrooge/skrooge_operation/skgoperationpluginwidget.cpp --- a/plugins/skrooge/skrooge_operation/skgoperationpluginwidget.cpp +++ b/plugins/skrooge/skrooge_operation/skgoperationpluginwidget.cpp @@ -216,7 +216,7 @@ connect(ui.kAmountSharesEdit, &SKGCalculatorEdit::textChanged, this, &SKGOperationPluginWidget::onOperationCreatorModified, Qt::QueuedConnection); connect(ui.kCommissionEdit, &SKGCalculatorEdit::textChanged, this, &SKGOperationPluginWidget::onOperationCreatorModified, Qt::QueuedConnection); connect(ui.kTaxEdit, &SKGCalculatorEdit::textChanged, this, &SKGOperationPluginWidget::onOperationCreatorModified, Qt::QueuedConnection); - connect(ui.kAccountEdit, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGOperationPluginWidget::onOperationCreatorModified, Qt::QueuedConnection); + connect(ui.kAccountEdit, static_cast(&SKGComboBox::currentTextChanged), this, &SKGOperationPluginWidget::onOperationCreatorModified, Qt::QueuedConnection); connect(ui.kOperationView->getShowWidget(), &SKGShow::stateChanged, this, &SKGOperationPluginWidget::onFilterChanged, Qt::QueuedConnection); connect(ui.kPayeeEdit->lineEdit(), &QLineEdit::returnPressed, this, &SKGOperationPluginWidget::onPayeeChanged, Qt::QueuedConnection); @@ -1498,7 +1498,7 @@ disconnect(showWidget, &SKGShow::stateChanged, this, &SKGOperationPluginWidget::onAccountChanged); disconnect(showWidget, &SKGShow::stateChanged, this, &SKGOperationPluginWidget::onRefreshInformationZoneDelayed); disconnect(showWidget, &SKGShow::stateChanged, this, &SKGOperationPluginWidget::onOperationCreatorModified); - disconnect(ui.kAccountEdit, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGOperationPluginWidget::fillTargetAccount); + disconnect(ui.kAccountEdit, static_cast(&SKGComboBox::currentTextChanged), this, &SKGOperationPluginWidget::fillTargetAccount); // Clear ui.kAccountEdit->clear(); @@ -1608,7 +1608,7 @@ } // Connect combo filter account - connect(ui.kAccountEdit, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGOperationPluginWidget::fillTargetAccount, Qt::QueuedConnection); + connect(ui.kAccountEdit, static_cast(&SKGComboBox::currentTextChanged), this, &SKGOperationPluginWidget::fillTargetAccount, Qt::QueuedConnection); connect(showWidget, &SKGShow::stateChanged, this, &SKGOperationPluginWidget::onAccountChanged, Qt::QueuedConnection); connect(showWidget, &SKGShow::stateChanged, this, &SKGOperationPluginWidget::onRefreshInformationZoneDelayed, Qt::QueuedConnection); connect(showWidget, &SKGShow::stateChanged, this, &SKGOperationPluginWidget::onOperationCreatorModified, Qt::QueuedConnection); diff --git a/plugins/skrooge/skrooge_report/skgreportpluginwidget.cpp b/plugins/skrooge/skrooge_report/skgreportpluginwidget.cpp --- a/plugins/skrooge/skrooge_report/skgreportpluginwidget.cpp +++ b/plugins/skrooge/skrooge_report/skgreportpluginwidget.cpp @@ -181,18 +181,18 @@ // Refresh connect(ui.kPeriod, &SKGPeriodEdit::changed, this, &SKGReportPluginWidget::refresh, Qt::QueuedConnection); - connect(ui.kColumns, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGReportPluginWidget::refresh, Qt::QueuedConnection); - connect(ui.kLines, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGReportPluginWidget::refresh, Qt::QueuedConnection); - connect(ui.kMode, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGReportPluginWidget::refresh, Qt::QueuedConnection); + connect(ui.kColumns, static_cast(&SKGComboBox::currentTextChanged), this, &SKGReportPluginWidget::refresh, Qt::QueuedConnection); + connect(ui.kLines, static_cast(&SKGComboBox::currentTextChanged), this, &SKGReportPluginWidget::refresh, Qt::QueuedConnection); + connect(ui.kMode, static_cast(&SKGComboBox::currentTextChanged), this, &SKGReportPluginWidget::refresh, Qt::QueuedConnection); connect(ui.kIncomes, &QCheckBox::stateChanged, this, &SKGReportPluginWidget::refresh, Qt::QueuedConnection); connect(ui.kExpenses, &QCheckBox::stateChanged, this, &SKGReportPluginWidget::refresh, Qt::QueuedConnection); connect(ui.kTransfers, &QCheckBox::stateChanged, this, &SKGReportPluginWidget::refresh, Qt::QueuedConnection); connect(ui.kGrouped, &QCheckBox::stateChanged, this, &SKGReportPluginWidget::refresh, Qt::QueuedConnection); connect(ui.kTracked, &QCheckBox::stateChanged, this, &SKGReportPluginWidget::refresh, Qt::QueuedConnection); - connect(ui.kForecastCmb, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGReportPluginWidget::refresh, Qt::QueuedConnection); + connect(ui.kForecastCmb, static_cast(&SKGComboBox::currentTextChanged), this, &SKGReportPluginWidget::refresh, Qt::QueuedConnection); connect(ui.kForecastValue, static_cast(&QSlider::valueChanged), this, &SKGReportPluginWidget::refresh, Qt::QueuedConnection); connect(ui.kCorrectedBy, static_cast(&SKGUnitComboBox::currentIndexChanged), this, &SKGReportPluginWidget::refresh, Qt::QueuedConnection); - connect(ui.kCorrectedByMode, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGReportPluginWidget::refresh, Qt::QueuedConnection); + connect(ui.kCorrectedByMode, static_cast(&SKGComboBox::currentTextChanged), this, &SKGReportPluginWidget::refresh, Qt::QueuedConnection); connect(getDocument(), &SKGDocument::tableModified, this, &SKGReportPluginWidget::dataModified); connect(SKGMainPanel::getMainPanel(), &SKGMainPanel::currentPageChanged, this, &SKGReportPluginWidget::pageChanged, Qt::QueuedConnection); diff --git a/plugins/skrooge/skrooge_scheduled/skgscheduledboardwidget.cpp b/plugins/skrooge/skrooge_scheduled/skgscheduledboardwidget.cpp --- a/plugins/skrooge/skrooge_scheduled/skgscheduledboardwidget.cpp +++ b/plugins/skrooge/skrooge_scheduled/skgscheduledboardwidget.cpp @@ -58,7 +58,7 @@ addAction(daysmaxWidget); - connect(m_daysmax, static_cast(&SKGComboBox::currentIndexChanged), this, [ = ]() { + connect(m_daysmax, static_cast(&SKGComboBox::currentTextChanged), this, [ = ]() { this->dataModified(); }); } diff --git a/plugins/skrooge/skrooge_scheduled/skgscheduledpluginwidget.cpp b/plugins/skrooge/skrooge_scheduled/skgscheduledpluginwidget.cpp --- a/plugins/skrooge/skrooge_scheduled/skgscheduledpluginwidget.cpp +++ b/plugins/skrooge/skrooge_scheduled/skgscheduledpluginwidget.cpp @@ -96,7 +96,7 @@ connect(ui.kModifyBtn, &QPushButton::clicked, this, &SKGScheduledPluginWidget::onUpdate); connect(ui.kJumpBtn, &QPushButton::clicked, this, &SKGScheduledPluginWidget::onJumpToTheOperation); - connect(ui.kOnceEveryUnit, static_cast(&KComboBox::currentIndexChanged), this, &SKGScheduledPluginWidget::onNbOccurrenceChanged); + connect(ui.kOnceEveryUnit, static_cast(&KComboBox::currentTextChanged), this, &SKGScheduledPluginWidget::onNbOccurrenceChanged); connect(ui.kLastOccurenceDate, &SKGDateEdit::dateChanged, this, &SKGScheduledPluginWidget::onNbOccurrenceChanged); connect(ui.kNbTimesVal, static_cast(&QSpinBox::valueChanged), this, &SKGScheduledPluginWidget::onNbOccurrenceChanged); connect(ui.kOnceEveryVal, static_cast(&QSpinBox::valueChanged), this, &SKGScheduledPluginWidget::onNbOccurrenceChanged); diff --git a/plugins/skrooge/skrooge_search/skgsearchpluginwidget.cpp b/plugins/skrooge/skrooge_search/skgsearchpluginwidget.cpp --- a/plugins/skrooge/skrooge_search/skgsearchpluginwidget.cpp +++ b/plugins/skrooge/skrooge_search/skgsearchpluginwidget.cpp @@ -226,7 +226,7 @@ SKGObjectBase::SKGListSKGObjectBase list = ui.kView->getView()->getSelectedObjects(); // Sort selection by f_sortorder. It is mandatory for reorder functions - qStableSort(list.begin(), list.end()); + std::stable_sort(list.begin(), list.end()); return list; } diff --git a/skgbankgui/skgpredicatcreator.cpp b/skgbankgui/skgpredicatcreator.cpp --- a/skgbankgui/skgpredicatcreator.cpp +++ b/skgbankgui/skgpredicatcreator.cpp @@ -262,7 +262,7 @@ } } - connect(m_kOperator, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGPredicatCreator::onOperatorChanged); + connect(m_kOperator, static_cast(&SKGComboBox::currentTextChanged), this, &SKGPredicatCreator::onOperatorChanged); onOperatorChanged(); } diff --git a/skgbankmodeler/skgreportbank.cpp b/skgbankmodeler/skgreportbank.cpp --- a/skgbankmodeler/skgreportbank.cpp +++ b/skgbankmodeler/skgreportbank.cpp @@ -510,7 +510,7 @@ } } } - qSort(table.begin(), table.end(), [](const QVariant & v1, const QVariant & v2) { + std::sort(table.begin(), table.end(), [](const QVariant & v1, const QVariant & v2) { return v1.toList().at(3).toDate() < v2.toList().at(3).toDate(); }); m_cache[cacheId] = table; diff --git a/skgbasegui/kdateedit.cpp b/skgbasegui/kdateedit.cpp --- a/skgbasegui/kdateedit.cpp +++ b/skgbasegui/kdateedit.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #include #include "kdatevalidator.h" @@ -112,7 +113,7 @@ return; } - QRect desk = QApplication::desktop()->screenGeometry(); + QRect desk = QGuiApplication::primaryScreen()->geometry(); QPoint popupPoint = mapToGlobal(QPoint(0, 0)); @@ -349,7 +350,7 @@ QString dayName; for (int i = 1; i <= 7; ++i) { - dayName = QDate::longDayName(i).toLower(); + dayName = QLocale().dayName(i).toLower(); mKeywordMap.insert(dayName, i + 100); } diff --git a/skgbasegui/skghtmlboardwidget.cpp b/skgbasegui/skghtmlboardwidget.cpp --- a/skgbasegui/skghtmlboardwidget.cpp +++ b/skgbasegui/skghtmlboardwidget.cpp @@ -111,7 +111,7 @@ // Connects connect(getDocument(), &SKGDocument::tableModified, this, &SKGHtmlBoardWidget::dataModified, Qt::QueuedConnection); if (m_period != nullptr) { - connect(m_period, static_cast(&SKGComboBox::currentIndexChanged), this, [ = ]() { + connect(m_period, static_cast(&SKGComboBox::currentTextChanged), this, [ = ]() { this->dataModified(); }); } diff --git a/skgbasegui/skgperiodedit.cpp b/skgbasegui/skgperiodedit.cpp --- a/skgbasegui/skgperiodedit.cpp +++ b/skgbasegui/skgperiodedit.cpp @@ -49,8 +49,8 @@ ui.kPeriod->setCurrentIndex(1); ui.kInterval->setCurrentIndex(2); - connect(ui.kPeriod, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGPeriodEdit::refresh); - connect(ui.kInterval, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGPeriodEdit::refresh); + connect(ui.kPeriod, static_cast(&SKGComboBox::currentTextChanged), this, &SKGPeriodEdit::refresh); + connect(ui.kInterval, static_cast(&SKGComboBox::currentTextChanged), this, &SKGPeriodEdit::refresh); connect(ui.kDateBegin, &SKGDateEdit::dateEntered, this, &SKGPeriodEdit::refresh); connect(ui.kDateEnd, &SKGDateEdit::dateEntered, this, &SKGPeriodEdit::refresh); connect(ui.kNbIntervals, static_cast(&QSpinBox::valueChanged), this, &SKGPeriodEdit::refresh); diff --git a/skgbasegui/skgtablewidget.cpp b/skgbasegui/skgtablewidget.cpp --- a/skgbasegui/skgtablewidget.cpp +++ b/skgbasegui/skgtablewidget.cpp @@ -103,7 +103,7 @@ } // Sort reverse - std::sort(listIndex.begin(), listIndex.end(), qGreater()); + std::sort(listIndex.begin(), listIndex.end(), std::greater()); // Emit events nb = listIndex.count(); diff --git a/skgbasegui/skgtablewithgraph.cpp b/skgbasegui/skgtablewithgraph.cpp --- a/skgbasegui/skgtablewithgraph.cpp +++ b/skgbasegui/skgtablewithgraph.cpp @@ -283,7 +283,7 @@ } connect(ui.kTable->horizontalScrollBar(), &QScrollBar::valueChanged, this, &SKGTableWithGraph::onHorizontalScrollBarChanged); - connect(m_displayMode, static_cast(&SKGComboBox::currentIndexChanged), this, &SKGTableWithGraph::redrawGraphDelayed, Qt::QueuedConnection); + connect(m_displayMode, static_cast(&SKGComboBox::currentTextChanged), this, &SKGTableWithGraph::redrawGraphDelayed, Qt::QueuedConnection); connect(ui.graphicView, &SKGGraphicsView::resized, this, &SKGTableWithGraph::redrawGraphDelayed, Qt::QueuedConnection); connect(ui.kTable, &SKGTableWidget::cellDoubleClicked, this, &SKGTableWithGraph::onDoubleClick); @@ -1179,7 +1179,7 @@ // Set header auto itemTmp = new QTableWidgetItem(val); - itemTmp->setBackgroundColor(color); + itemTmp->setBackground(color); itemTmp->setToolTip(val); ui.kTable->setVerticalHeaderItem(i - 1, itemTmp); } diff --git a/skgbasemodeler/skgdocument.cpp b/skgbasemodeler/skgdocument.cpp --- a/skgbasemodeler/skgdocument.cpp +++ b/skgbasemodeler/skgdocument.cpp @@ -1460,7 +1460,7 @@ if (!tryOpen.open()) { // Set error message QSqlError sqlErr = tryOpen.lastError(); - err = SKGError(SQLLITEERROR + sqlErr.number(), sqlErr.text()); + err = SKGError(SQLLITEERROR + sqlErr.nativeErrorCode().toInt(), sqlErr.text()); } if (d->m_modeSQLCipher) { IFOKDO(err, SKGServices::executeSqliteOrder(tryOpen, "PRAGMA KEY = '" % SKGServices::stringToSqlString(iPassword.isEmpty() ? QStringLiteral("DEFAULTPASSWORD") : iPassword) % "'")); @@ -1496,7 +1496,7 @@ if (!d->m_currentDatabase.open()) { // Set error message QSqlError sqlErr = d->m_currentDatabase.lastError(); - err = SKGError(SQLLITEERROR + sqlErr.number(), sqlErr.text()); + err = SKGError(SQLLITEERROR + sqlErr.nativeErrorCode().toInt(), sqlErr.text()); } d->m_directAccessDb = true; @@ -1515,7 +1515,7 @@ if (!d->m_currentDatabase.open()) { // Set error message QSqlError sqlErr = d->m_currentDatabase.lastError(); - err = SKGError(SQLLITEERROR + sqlErr.number(), sqlErr.text()); + err = SKGError(SQLLITEERROR + sqlErr.nativeErrorCode().toInt(), sqlErr.text()); } d->m_directAccessDb = false; @@ -1789,7 +1789,7 @@ if (!fileDb.open()) { // Set error message QSqlError sqlErr = fileDb.lastError(); - err = SKGError(SQLLITEERROR + sqlErr.number(), sqlErr.text()); + err = SKGError(SQLLITEERROR + sqlErr.nativeErrorCode().toInt(), sqlErr.text()); } else { IFOKDO(err, SKGServices::executeSqliteOrder(fileDb, "PRAGMA KEY = '" % SKGServices::stringToSqlString(pwd.isEmpty() ? QStringLiteral("DEFAULTPASSWORD") : pwd) % "'")); addSqliteAddon(&fileDb); @@ -2435,7 +2435,7 @@ if (Q_LIKELY(!query.exec())) { QSqlError sqlError = query.lastError(); QString msg = sqlQuery % ':' % sqlError.text(); - err = SKGError(SQLLITEERROR + sqlError.number(), msg); + err = SKGError(SQLLITEERROR + sqlError.nativeErrorCode().toInt(), msg); } } } diff --git a/skgbasemodeler/skgservices.cpp b/skgbasemodeler/skgservices.cpp --- a/skgbasemodeler/skgservices.cpp +++ b/skgbasemodeler/skgservices.cpp @@ -1545,15 +1545,15 @@ if (!prep || !query.exec()) { QSqlError sqlError = query.lastError(); - if (sqlError.number() != 19 /*SQLITE_CONSTRAINT*/ && iSqlOrder != QStringLiteral("SELECT count(*) FROM sqlite_master") /*Test password*/) { + if (sqlError.nativeErrorCode().toInt() != 19 /*SQLITE_CONSTRAINT*/ && iSqlOrder != QStringLiteral("SELECT count(*) FROM sqlite_master") /*Test password*/) { SKGTRACE << "WARNING: " << iSqlOrder << endl; SKGTRACE << " returns :" << sqlError.text() << endl; } - err = SKGError(SQLLITEERROR + sqlError.number(), iSqlOrder); - err.addError(SQLLITEERROR + sqlError.number(), sqlError.text()); + err = SKGError(SQLLITEERROR + sqlError.nativeErrorCode().toInt(), iSqlOrder); + err.addError(SQLLITEERROR + sqlError.nativeErrorCode().toInt(), sqlError.text()); - if (sqlError.number() == 19 && iSqlOrder.startsWith(QLatin1String("INSERT "))) { + if (sqlError.nativeErrorCode().toInt() == 19 && iSqlOrder.startsWith(QLatin1String("INSERT "))) { err.addError(ERR_FAIL, i18nc("Error message", "Creation failed. The object already exists.")); } } else { @@ -1662,8 +1662,8 @@ SKGTRACE << "WARNING: " << iSqlOrder << endl; SKGTRACE << " returns :" << sqlError.text() << endl; } - err = SKGError(SQLLITEERROR + sqlError.number(), iSqlOrder); - err.addError(SQLLITEERROR + sqlError.number(), sqlError.text()); + err = SKGError(SQLLITEERROR + sqlError.nativeErrorCode().toInt(), iSqlOrder); + err.addError(SQLLITEERROR + sqlError.nativeErrorCode().toInt(), sqlError.text()); } else { double elapse1 = 0; if (SKGServices::SKGSqlTraces != -1) {