kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 20:50:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Qt 6 deprecated Qt::SystemLocaleShortDate

Browse Source 
The format options
Qt::SystemLocaleDate, Qt::SystemLocaleShortDate
and Qt::SystemLocaleLongDate
shall be removed in Qt 6.
	Their use should be replaced with
QLocale::system().toString(date, QLocale::ShortFormat)
or
QLocale::system().toString(date, QLocale::LongFormat).
This commit is contained in:
Simon De Backer
2020-09-21 20:23:20 +02:00
parent f21cdb4040
commit c7ffae7918
3 changed files with 82 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sources/bordertitleblock.cpp
View File

@@ -17,6 +17,8 @@
*/ */
#include <QPainter> #include <QPainter>
#include <utility> #include <utility>
#include <QLocale>
#include "titleblocktemplate.h" #include "titleblocktemplate.h"
#include "titleblocktemplaterenderer.h" #include "titleblocktemplaterenderer.h"
#include "bordertitleblock.h" #include "bordertitleblock.h"
@@ -934,9 +936,12 @@ void BorderTitleBlock::updateDiagramContextForTitleBlock(
} }
// ... overridden by the historical and/or dynamically generated fields // ... overridden by the historical and/or dynamically generated fields
QLocale var;
var.dateFormat(QLocale::ShortFormat);
context.addValue("author", btb_author_); context.addValue("author", btb_author_);
context.addValue("date", btb_date_.toString( context.addValue(
Qt::SystemLocaleShortDate)); "date",
QLocale::system().toString(btb_date_, QLocale::ShortFormat));
context.addValue("title", btb_title_); context.addValue("title", btb_title_);
context.addValue("filename", btb_filename_); context.addValue("filename", btb_filename_);
context.addValue("plant", btb_plant_); context.addValue("plant", btb_plant_);

13
sources/dataBase/projectdatabase.cpp
View File

@@ -24,6 +24,7 @@
#include "diagramposition.h" #include "diagramposition.h"
#include <QSqlError> #include <QSqlError>
#include <QLocale>
#if defined(Q_OS_LINUX) || defined(Q_OS_WINDOWS) #if defined(Q_OS_LINUX) || defined(Q_OS_WINDOWS)
#include <QSqlDriver> #include <QSqlDriver>
@@ -161,7 +162,11 @@ void projectDataBase::addDiagram(Diagram *diagram)
for (auto key : QETApp::diagramInfoKeys()) for (auto key : QETApp::diagramInfoKeys())
{ {
if (key == "date") { if (key == "date") {
m_insert_diagram_info_query.bindValue(":date", QDate::fromString(infos.value("date").toString(), Qt::SystemLocaleShortDate)); m_insert_diagram_info_query.bindValue(
":date",
QLocale::system().toString(
infos.value("date").toDate(),
QLocale::ShortFormat));
} else { } else {
auto value = infos.value(key); auto value = infos.value(key);
auto bind = key.prepend(":"); auto bind = key.prepend(":");
@@ -419,7 +424,11 @@ void projectDataBase::populateDiagramInfoTable()
for (auto key : QETApp::diagramInfoKeys()) for (auto key : QETApp::diagramInfoKeys())
{ {
if (key == "date") { if (key == "date") {
m_insert_diagram_info_query.bindValue(":date", QDate::fromString(infos.value("date").toString(), Qt::SystemLocaleShortDate)); m_insert_diagram_info_query.bindValue(
":date",
QLocale::system().toString(
infos.value("date").toDate(),
QLocale::ShortFormat));
} else { } else {
auto value = infos.value(key); auto value = infos.value(key);
auto bind = key.prepend(":"); auto bind = key.prepend(":");

10
sources/qetproject.cpp
View File

@@ -934,13 +934,17 @@ QETResult QETProject::write()
return(error_message); return(error_message);
//title block variables should be updated after file save dialog is confirmed, before file is saved. //title block variables should be updated after file save dialog is confirmed, before file is saved.
m_project_properties.addValue("saveddate", QDate::currentDate().toString(Qt::SystemLocaleShortDate)); m_project_properties.addValue(
"saveddate",
QDate::currentDate().toString(
QLocale::system().toString(
QLocale::ShortFormat)));
m_project_properties.addValue("savedtime", QDateTime::currentDateTime().toString("HH:mm")); m_project_properties.addValue("savedtime", QDateTime::currentDateTime().toString("HH:mm"));
m_project_properties.addValue("savedfilename", QFileInfo(filePath()).baseName()); m_project_properties.addValue("savedfilename", QFileInfo(filePath()).baseName());
m_project_properties.addValue("savedfilepath", filePath()); m_project_properties.addValue("savedfilepath", filePath());
emit(projectInformationsChanged(this)); emit(projectInformationsChanged(this));
updateDiagramsFolioData(); updateDiagramsFolioData();
setModified(false); setModified(false);
return(QETResult()); return(QETResult());