Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove deprecated Qt::DateFormat enums

Browse source 
indent and replace default with enum case while at it. automated
adjustments can be done with the following command:

find -type f -exec sed \
    -e 's|Qt::SystemLocaleDate|Qt::SystemLocaleShortDate|g' \
    -e 's|Qt::LocalDate|Qt::SystemLocaleShortDate|g' \
    -e 's|Qt::LocaleDate|Qt::DefaultLocaleShortDate|g' -i {} +

if you are doing it to git repository, move it out of the way as the
command may corrupt it.

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-02-24 18:34:21 +00:00
parent 68c84e8f70
commit 36aaf16f82
7 changed files with 105 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/global/qnamespace.h
View file

@ -1011,9 +1011,6 @@ public:
enum DateFormat { enum DateFormat {
TextDate, // default Qt TextDate, // default Qt
ISODate, // ISO 8601 ISODate, // ISO 8601
SystemLocaleDate, // deprecated
LocalDate = SystemLocaleDate, // deprecated
LocaleDate, // deprecated
SystemLocaleShortDate, SystemLocaleShortDate,
SystemLocaleLongDate, SystemLocaleLongDate,
DefaultLocaleShortDate, DefaultLocaleShortDate,

181
src/core/tools/qdatetime.cpp
View file

@ -663,29 +663,26 @@ QString QDate::toString(Qt::DateFormat f) const
int y, m, d; int y, m, d;
getDateFromJulianDay(jd, &y, &m, &d); getDateFromJulianDay(jd, &y, &m, &d);
switch (f) { switch (f) {
case Qt::SystemLocaleDate: case Qt::SystemLocaleShortDate:
case Qt::SystemLocaleShortDate: case Qt::SystemLocaleLongDate:
case Qt::SystemLocaleLongDate: return QLocale::system().toString(*this, f == Qt::SystemLocaleLongDate ? QLocale::LongFormat
return QLocale::system().toString(*this, f == Qt::SystemLocaleLongDate ? QLocale::LongFormat : QLocale::ShortFormat);
: QLocale::ShortFormat); case Qt::DefaultLocaleShortDate:
case Qt::LocaleDate: case Qt::DefaultLocaleLongDate:
case Qt::DefaultLocaleShortDate: return QLocale().toString(*this, f == Qt::DefaultLocaleLongDate ? QLocale::LongFormat
case Qt::DefaultLocaleLongDate: : QLocale::ShortFormat);
return QLocale().toString(*this, f == Qt::DefaultLocaleLongDate ? QLocale::LongFormat
: QLocale::ShortFormat);
default:
#ifndef QT_NO_TEXTDATE #ifndef QT_NO_TEXTDATE
case Qt::TextDate: case Qt::TextDate: {
{
return QString::fromLatin1("%0 %1 %2 %3") return QString::fromLatin1("%0 %1 %2 %3")
.arg(shortDayName(dayOfWeek())) .arg(shortDayName(dayOfWeek()))
.arg(shortMonthName(m)) .arg(shortMonthName(m))
.arg(d) .arg(d)
.arg(y); .arg(y);
} }
#else
case Qt::TextDate:
#endif #endif
case Qt::ISODate: case Qt::ISODate: {
{
if (year() < 0 || year() > 9999) if (year() < 0 || year() > 9999)
return QString(); return QString();
QString month(QString::number(m).rightJustified(2, QLatin1Char('0'))); QString month(QString::number(m).rightJustified(2, QLatin1Char('0')));
@ -693,6 +690,8 @@ QString QDate::toString(Qt::DateFormat f) const
return QString::number(y) + QLatin1Char('-') + month + QLatin1Char('-') + day; return QString::number(y) + QLatin1Char('-') + month + QLatin1Char('-') + day;
} }
} }
return QString();
} }
/*! /*!
@ -1027,55 +1026,53 @@ QDate QDate::fromString(const QString& s, Qt::DateFormat f)
return QDate(); return QDate();
switch (f) { switch (f) {
case Qt::ISODate: case Qt::SystemLocaleShortDate:
{ case Qt::SystemLocaleLongDate:
return QLocale::system().toDate(s, f == Qt::SystemLocaleLongDate ? QLocale::LongFormat
: QLocale::ShortFormat);
case Qt::DefaultLocaleShortDate:
case Qt::DefaultLocaleLongDate:
return QLocale().toDate(s, f == Qt::DefaultLocaleLongDate ? QLocale::LongFormat
: QLocale::ShortFormat);
#ifndef QT_NO_TEXTDATE
case Qt::TextDate: {
QStringList parts = s.split(QLatin1Char(' '), QString::SkipEmptyParts);
if (parts.count() != 4) {
return QDate();
}
int month = fromShortMonthName(parts.at(1));
if (month < 1 || month > 12) {
return QDate();
}
bool ok;
int day = parts.at(2).toInt(&ok);
if (!ok) {
return QDate();
}
int year = parts.at(3).toInt(&ok);
if (!ok) {
return QDate();
}
return QDate(year, month, day);
}
#else
case Qt::TextDate:
#endif
case Qt::ISODate: {
int year(s.mid(0, 4).toInt()); int year(s.mid(0, 4).toInt());
int month(s.mid(5, 2).toInt()); int month(s.mid(5, 2).toInt());
int day(s.mid(8, 2).toInt()); int day(s.mid(8, 2).toInt());
if (year && month && day) if (year && month && day)
return QDate(year, month, day); return QDate(year, month, day);
break;
} }
break;
case Qt::SystemLocaleDate:
case Qt::SystemLocaleShortDate:
case Qt::SystemLocaleLongDate:
return QLocale::system().toDate(s, f == Qt::SystemLocaleLongDate ? QLocale::LongFormat
: QLocale::ShortFormat);
case Qt::LocaleDate:
case Qt::DefaultLocaleShortDate:
case Qt::DefaultLocaleLongDate:
return QLocale().toDate(s, f == Qt::DefaultLocaleLongDate ? QLocale::LongFormat
: QLocale::ShortFormat);
default:
#ifndef QT_NO_TEXTDATE
case Qt::TextDate: {
QStringList parts = s.split(QLatin1Char(' '), QString::SkipEmptyParts);
if (parts.count() != 4) {
return QDate();
}
int month = fromShortMonthName(parts.at(1));
if (month < 1 || month > 12) {
return QDate();
}
bool ok;
int day = parts.at(2).toInt(&ok);
if (!ok) {
return QDate();
}
int year = parts.at(3).toInt(&ok);
if (!ok) {
return QDate();
}
return QDate(year, month, day);
}
#else
break;
#endif
} }
return QDate(); return QDate();
} }
@ -1427,25 +1424,24 @@ QString QTime::toString(Qt::DateFormat format) const
return QString(); return QString();
switch (format) { switch (format) {
case Qt::SystemLocaleDate: case Qt::SystemLocaleShortDate:
case Qt::SystemLocaleShortDate: case Qt::SystemLocaleLongDate:
case Qt::SystemLocaleLongDate: return QLocale::system().toString(*this, format == Qt::SystemLocaleLongDate ? QLocale::LongFormat
return QLocale::system().toString(*this, format == Qt::SystemLocaleLongDate ? QLocale::LongFormat : QLocale::ShortFormat);
: QLocale::ShortFormat); case Qt::DefaultLocaleShortDate:
case Qt::LocaleDate: case Qt::DefaultLocaleLongDate:
case Qt::DefaultLocaleShortDate: return QLocale().toString(*this, format == Qt::DefaultLocaleLongDate ? QLocale::LongFormat
case Qt::DefaultLocaleLongDate: : QLocale::ShortFormat);
return QLocale().toString(*this, format == Qt::DefaultLocaleLongDate ? QLocale::LongFormat
: QLocale::ShortFormat);
default: case Qt::ISODate:
case Qt::ISODate: case Qt::TextDate:
case Qt::TextDate: return QString::fromLatin1("%1:%2:%3")
return QString::fromLatin1("%1:%2:%3") .arg(hour(), 2, 10, QLatin1Char('0'))
.arg(hour(), 2, 10, QLatin1Char('0')) .arg(minute(), 2, 10, QLatin1Char('0'))
.arg(minute(), 2, 10, QLatin1Char('0')) .arg(second(), 2, 10, QLatin1Char('0'));
.arg(second(), 2, 10, QLatin1Char('0'));
} }
return QString();
} }
/*! /*!
@ -1666,18 +1662,17 @@ QTime QTime::fromString(const QString& s, Qt::DateFormat f)
} }
switch (f) { switch (f) {
case Qt::SystemLocaleDate: case Qt::SystemLocaleShortDate:
case Qt::SystemLocaleShortDate: case Qt::SystemLocaleLongDate:
case Qt::SystemLocaleLongDate: return QLocale::system().toTime(s, f == Qt::SystemLocaleLongDate ? QLocale::LongFormat
return QLocale::system().toTime(s, f == Qt::SystemLocaleLongDate ? QLocale::LongFormat : QLocale::ShortFormat);
: QLocale::ShortFormat);
case Qt::LocaleDate: case Qt::DefaultLocaleShortDate:
case Qt::DefaultLocaleShortDate: case Qt::DefaultLocaleLongDate:
case Qt::DefaultLocaleLongDate: return QLocale().toTime(s, f == Qt::DefaultLocaleLongDate ? QLocale::LongFormat
return QLocale().toTime(s, f == Qt::DefaultLocaleLongDate ? QLocale::LongFormat : QLocale::ShortFormat);
: QLocale::ShortFormat); case Qt::ISODate:
default: case Qt::TextDate: {
{
bool ok = true; bool ok = true;
const int hour(s.mid(0, 2).toInt(&ok)); const int hour(s.mid(0, 2).toInt(&ok));
if (!ok) if (!ok)
@ -1695,6 +1690,8 @@ QTime QTime::fromString(const QString& s, Qt::DateFormat f)
return QTime(hour, minute, second, qMin(qRound(msec * 1000.0), 999)); return QTime(hour, minute, second, qMin(qRound(msec * 1000.0), 999));
} }
} }
return QTime();
} }
/*! /*!
@ -2361,9 +2358,8 @@ QString QDateTime::toString(Qt::DateFormat f) const
default: default:
break; break;
} }
}
#ifndef QT_NO_TEXTDATE #ifndef QT_NO_TEXTDATE
else if (f == Qt::TextDate) { } else if (f == Qt::TextDate) {
buf = d->date.shortDayName(d->date.dayOfWeek()); buf = d->date.shortDayName(d->date.dayOfWeek());
buf += QLatin1Char(' '); buf += QLatin1Char(' ');
buf += d->date.shortMonthName(d->date.month()); buf += d->date.shortMonthName(d->date.month());
@ -2373,9 +2369,8 @@ QString QDateTime::toString(Qt::DateFormat f) const
buf += d->time.toString(); buf += d->time.toString();
buf += QLatin1Char(' '); buf += QLatin1Char(' ');
buf += QString::number(d->date.year()); buf += QString::number(d->date.year());
}
#endif #endif
else { } else {
buf = d->date.toString(f); buf = d->date.toString(f);
if (buf.isEmpty()) if (buf.isEmpty())
return QString(); // failed to convert return QString(); // failed to convert
@ -3025,12 +3020,12 @@ QDateTime QDateTime::fromString(const QString& s, Qt::DateFormat f)
} }
return QDateTime(date, QTime::fromString(tmp, Qt::ISODate), ts); return QDateTime(date, QTime::fromString(tmp, Qt::ISODate), ts);
} }
case Qt::SystemLocaleDate:
case Qt::SystemLocaleShortDate: case Qt::SystemLocaleShortDate:
case Qt::SystemLocaleLongDate: case Qt::SystemLocaleLongDate:
return QLocale::system().toDateTime(s, f == Qt::SystemLocaleLongDate ? QLocale::LongFormat return QLocale::system().toDateTime(s, f == Qt::SystemLocaleLongDate ? QLocale::LongFormat
: QLocale::ShortFormat); : QLocale::ShortFormat);
case Qt::LocaleDate:
case Qt::DefaultLocaleShortDate: case Qt::DefaultLocaleShortDate:
case Qt::DefaultLocaleLongDate: case Qt::DefaultLocaleLongDate:
return QLocale().toDateTime(s, f == Qt::DefaultLocaleLongDate ? QLocale::LongFormat return QLocale().toDateTime(s, f == Qt::DefaultLocaleLongDate ? QLocale::LongFormat

2
src/gui/dialogs/qfilesystemmodel.cpp
View file

@ -670,7 +670,7 @@ QString QFileSystemModelPrivate::time(const QModelIndex &index) const
if (!index.isValid()) if (!index.isValid())
return QString(); return QString();
#ifndef QT_NO_DATESTRING #ifndef QT_NO_DATESTRING
return node(index)->lastModified().toString(Qt::SystemLocaleDate); return node(index)->lastModified().toString(Qt::SystemLocaleShortDate);
#else #else
Q_UNUSED(index); Q_UNUSED(index);
return QString(); return QString();

2
src/gui/itemviews/qdirmodel.cpp
View file

@ -1265,7 +1265,7 @@ QString QDirModelPrivate::type(const QModelIndex &index) const
QString QDirModelPrivate::time(const QModelIndex &index) const QString QDirModelPrivate::time(const QModelIndex &index) const
{ {
#ifndef QT_NO_DATESTRING #ifndef QT_NO_DATESTRING
return node(index)->info.lastModified().toString(Qt::LocalDate); return node(index)->info.lastModified().toString(Qt::SystemLocaleShortDate);
#else #else
Q_UNUSED(index); Q_UNUSED(index);
return QString(); return QString();

8
tests/auto/qdate/tst_qdate.cpp
View file

@ -751,14 +751,14 @@ void tst_QDate::yearsZeroToNinetyNine()
void tst_QDate::toString() void tst_QDate::toString()
{ {
QDate date(1974,12,1); QDate date(1974,12,1);
QCOMPARE(date.toString(Qt::SystemLocaleDate), QCOMPARE(date.toString(Qt::SystemLocaleShortDate),
QLocale::system().toString(date, QLocale::ShortFormat)); QLocale::system().toString(date, QLocale::ShortFormat));
QCOMPARE(date.toString(Qt::LocaleDate), QCOMPARE(date.toString(Qt::DefaultLocaleShortDate),
QLocale().toString(date, QLocale::ShortFormat)); QLocale().toString(date, QLocale::ShortFormat));
QLocale::setDefault(QLocale::German); QLocale::setDefault(QLocale::German);
QCOMPARE(date.toString(Qt::SystemLocaleDate), QCOMPARE(date.toString(Qt::SystemLocaleShortDate),
QLocale::system().toString(date, QLocale::ShortFormat)); QLocale::system().toString(date, QLocale::ShortFormat));
QCOMPARE(date.toString(Qt::LocaleDate), QCOMPARE(date.toString(Qt::DefaultLocaleShortDate),
QLocale().toString(date, QLocale::ShortFormat)); QLocale().toString(date, QLocale::ShortFormat));
} }

14
tests/auto/qdatetime/tst_qdatetime.cpp
View file

@ -529,7 +529,7 @@ void tst_QDateTime::toString_enumformat()
QString str2 = dt1.toString(Qt::ISODate); QString str2 = dt1.toString(Qt::ISODate);
QCOMPARE(str2, QString("1995-05-20T12:34:56")); QCOMPARE(str2, QString("1995-05-20T12:34:56"));
QString str3 = dt1.toString(Qt::LocalDate); QString str3 = dt1.toString(Qt::SystemLocaleShortDate);
qDebug() << str3; qDebug() << str3;
QVERIFY(!str3.isEmpty()); QVERIFY(!str3.isEmpty());
//check for date/time components in any order //check for date/time components in any order
@ -1560,8 +1560,8 @@ void tst_QDateTime::fromString()
QCOMPARE(QDateTime::fromString(dt2.toString(Qt::SystemLocaleShortDate), Qt::SystemLocaleShortDate), dt2); QCOMPARE(QDateTime::fromString(dt2.toString(Qt::SystemLocaleShortDate), Qt::SystemLocaleShortDate), dt2);
// obsolete // obsolete
QCOMPARE(QDateTime::fromString(dt2.toString(Qt::SystemLocaleDate), Qt::SystemLocaleDate), dt2); QCOMPARE(QDateTime::fromString(dt2.toString(Qt::SystemLocaleShortDate), Qt::SystemLocaleShortDate), dt2);
QCOMPARE(QDateTime::fromString(dt2.toString(Qt::LocaleDate), Qt::LocaleDate), dt2); QCOMPARE(QDateTime::fromString(dt2.toString(Qt::DefaultLocaleShortDate), Qt::DefaultLocaleShortDate), dt2);
QCOMPARE(QDateTime::fromString(dt2.toString(Qt::DefaultLocaleLongDate), Qt::DefaultLocaleLongDate), dt2); QCOMPARE(QDateTime::fromString(dt2.toString(Qt::DefaultLocaleLongDate), Qt::DefaultLocaleLongDate), dt2);
QCOMPARE(QDateTime::fromString(dt2.toString(Qt::SystemLocaleLongDate), Qt::SystemLocaleLongDate), dt2); QCOMPARE(QDateTime::fromString(dt2.toString(Qt::SystemLocaleLongDate), Qt::SystemLocaleLongDate), dt2);
@ -1571,12 +1571,12 @@ void tst_QDateTime::fromString()
QCOMPARE(QDate::fromString(dt2.date().toString(Qt::DefaultLocaleShortDate), Qt::DefaultLocaleShortDate), dt2.date()); QCOMPARE(QDate::fromString(dt2.date().toString(Qt::DefaultLocaleShortDate), Qt::DefaultLocaleShortDate), dt2.date());
QCOMPARE(QDate::fromString(dt2.date().toString(Qt::SystemLocaleShortDate), Qt::SystemLocaleShortDate), dt2.date()); QCOMPARE(QDate::fromString(dt2.date().toString(Qt::SystemLocaleShortDate), Qt::SystemLocaleShortDate), dt2.date());
QCOMPARE(QDate::fromString(dt2.date().toString(Qt::LocaleDate), Qt::LocaleDate), dt2.date()); QCOMPARE(QDate::fromString(dt2.date().toString(Qt::DefaultLocaleShortDate), Qt::DefaultLocaleShortDate), dt2.date());
QCOMPARE(QDate::fromString(dt2.date().toString(Qt::SystemLocaleDate), Qt::SystemLocaleDate), dt2.date()); QCOMPARE(QDate::fromString(dt2.date().toString(Qt::SystemLocaleShortDate), Qt::SystemLocaleShortDate), dt2.date());
QCOMPARE(QTime::fromString(dt2.time().toString(Qt::DefaultLocaleShortDate), Qt::DefaultLocaleShortDate), dt2.time());
QCOMPARE(QTime::fromString(dt2.time().toString(Qt::SystemLocaleShortDate), Qt::SystemLocaleShortDate), dt2.time());
QCOMPARE(QTime::fromString(dt2.time().toString(Qt::DefaultLocaleShortDate), Qt::DefaultLocaleShortDate), dt2.time()); QCOMPARE(QTime::fromString(dt2.time().toString(Qt::DefaultLocaleShortDate), Qt::DefaultLocaleShortDate), dt2.time());
QCOMPARE(QTime::fromString(dt2.time().toString(Qt::SystemLocaleShortDate), Qt::SystemLocaleShortDate), dt2.time()); QCOMPARE(QTime::fromString(dt2.time().toString(Qt::SystemLocaleShortDate), Qt::SystemLocaleShortDate), dt2.time());
QCOMPARE(QTime::fromString(dt2.time().toString(Qt::LocaleDate), Qt::LocaleDate), dt2.time());
QCOMPARE(QTime::fromString(dt2.time().toString(Qt::SystemLocaleDate), Qt::SystemLocaleDate), dt2.time());
QLocale::setDefault(def); QLocale::setDefault(def);
} }

8
tests/auto/qtime/tst_qtime.cpp
View file

@ -664,14 +664,14 @@ void tst_QTime::toString_format()
void tst_QTime::toStringLocale() void tst_QTime::toStringLocale()
{ {
QTime time(18, 30); QTime time(18, 30);
QCOMPARE(time.toString(Qt::SystemLocaleDate), QCOMPARE(time.toString(Qt::SystemLocaleShortDate),
QLocale::system().toString(time, QLocale::ShortFormat)); QLocale::system().toString(time, QLocale::ShortFormat));
QCOMPARE(time.toString(Qt::LocaleDate), QCOMPARE(time.toString(Qt::DefaultLocaleShortDate),
QLocale().toString(time, QLocale::ShortFormat)); QLocale().toString(time, QLocale::ShortFormat));
QLocale::setDefault(QLocale::German); QLocale::setDefault(QLocale::German);
QCOMPARE(time.toString(Qt::SystemLocaleDate), QCOMPARE(time.toString(Qt::SystemLocaleShortDate),
QLocale::system().toString(time, QLocale::ShortFormat)); QLocale::system().toString(time, QLocale::ShortFormat));
QCOMPARE(time.toString(Qt::LocaleDate), QCOMPARE(time.toString(Qt::DefaultLocaleShortDate),
QLocale().toString(time, QLocale::ShortFormat)); QLocale().toString(time, QLocale::ShortFormat));
} }