Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-11-30 12:26:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Replaced deprecated QDateTime::toString by QLocale::toString

Browse source
This commit is contained in:
thunder2 2025-07-20 23:43:49 +02:00
parent 291b2f7cad
commit f0286740f4
4 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
retroshare-gui/src/gui/Identity/IdDetailsDialog.cpp
View file

@ -28,6 +28,7 @@
#include "gui/common/FilesDefs.h"
#include "gui/msgs/MessageComposer.h"
#include "gui/RetroShareLink.h"
#include "util/DateTime.h"
#include <retroshare/rspeers.h>
@ -148,7 +149,7 @@ void IdDetailsDialog::loadIdentity(RsGxsIdGroup data)
ui->autoBanIdentities_CB->setVisible(!data.mPgpId.isNull()) ;
ui->banoption_label->setVisible(!data.mPgpId.isNull()) ;
ui->lineEdit_Created->setText(QDateTime::fromMSecsSinceEpoch(qint64(1000)*data.mMeta.mPublishTs).toString(Qt::SystemLocaleShortDate));
ui->lineEdit_Created->setText(QLocale::system().toString(DateTime::DateTimeFromTime_t(data.mMeta.mPublishTs), QLocale::ShortFormat));
time_t now = time(NULL) ;
ui->lineEdit_LastUsed->setText(getHumanReadableDuration(now - data.mLastUsageTS)) ;

3
retroshare-gui/src/gui/Identity/IdDialog.cpp
View file

@ -50,6 +50,7 @@
#include "util/RsQtVersion.h"
#include "util/rstime.h"
#include "util/rsdebug.h"
#include "util/DateTime.h"
#include "retroshare/rsgxsflags.h"
#include "retroshare/rsmsgs.h"
@ -1653,7 +1654,7 @@ void IdDialog::loadIdentity(RsGxsIdGroup data)
/* get GPG Details from rsPeers */
RsPgpId ownPgpId = rsPeers->getGPGOwnId();
ui->lineEdit_PublishTS->setText(QDateTime::fromMSecsSinceEpoch(qint64(1000)*data.mMeta.mPublishTs).toString(Qt::SystemLocaleShortDate));
ui->lineEdit_PublishTS->setText(QLocale::system().toString(DateTime::DateTimeFromTime_t(data.mMeta.mPublishTs), QLocale::ShortFormat));
//ui->lineEdit_Nickname->setText(QString::fromUtf8(data.mMeta.mGroupName.c_str()).left(RSID_MAXIMUM_NICKNAME_SIZE));
ui->lineEdit_KeyId->setText(QString::fromStdString(data.mMeta.mGroupId.toStdString()));
//ui->lineEdit_GpgHash->setText(QString::fromStdString(data.mPgpIdHash.toStdString()));

2
retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
View file

@ -227,7 +227,7 @@ void ChannelPostDelegate::paint(QPainter * painter, const QStyleOptionViewItem &
y += font_height;
y += font_height/2.0;
QString info_text = QDateTime::fromMSecsSinceEpoch(qint64(1000)*post.mMeta.mPublishTs).toString(Qt::DefaultLocaleShortDate);
QString info_text = QLocale::system().toString(DateTime::DateTimeFromTime_t(post.mMeta.mPublishTs), QLocale::ShortFormat);
if(post.mAttachmentCount > 0)
info_text += ", " + QString::number(post.mAttachmentCount)+ " " +((post.mAttachmentCount>1)?tr("files"):tr("file")) + " (" + misc::friendlyUnit(qulonglong(post.mSize)) + ")" ;

5
retroshare-gui/src/util/DateTime.cpp
View file

@ -19,6 +19,7 @@
*******************************************************************************/
#include <QDateTime>
#include <QLocale>
#include "DateTime.h"
#include "rshare.h"
@ -66,7 +67,7 @@ QString DateTime::formatDate(time_t dateValue)
QString DateTime::formatDate(const QDate &dateValue)
{
return dateValue.toString(Qt::SystemLocaleShortDate);
return QLocale::system().toString(dateValue, QLocale::ShortFormat);
}
QString DateTime::formatTime(time_t timeValue)
@ -76,7 +77,7 @@ QString DateTime::formatTime(time_t timeValue)
QString DateTime::formatTime(const QTime &timeValue)
{
return timeValue.toString(Qt::SystemLocaleShortDate);
return QLocale::system().toString(timeValue, QLocale::ShortFormat);
}
QDateTime DateTime::DateTimeFromTime_t(time_t timeValue)