Qt6 port:

* Explicitly include some missing headers
* Use 'static const char*' for XPM icon
* Skip template parameters for qMakePair
* Constructor of QFileInfo is marked as 'explicit' now
* QString::fromLatin1() also accepts a QByteArray
* QDateTime::fromTime_t() is deprecated in Qt5 and has been removed in Qt6. Use QDateTime::fromSecsSinceEpoch()
* QDateTime::toTime_t() is deprecated in Qt5 and has been removed in Qt6. Use QDateTime::toSecsSinceEpoch()
* QApplication::globalStrut() is deprecated. Don't use it any more.
* QWidget::isTopLevel() is deprecated, use QWidget::isWindow()
This commit is contained in:
wmayer
2022-11-02 15:16:41 +01:00
parent e610d884eb
commit fac648fff5
18 changed files with 26 additions and 29 deletions

View File

@@ -65,7 +65,7 @@ public:
QString fileName;
EditorView::DisplayName displayName;
QTimer* activityTimer;
uint timeStamp;
qint64 timeStamp;
bool lock;
bool aboutToClose;
QStringList undos;
@@ -191,7 +191,7 @@ void EditorView::OnChange(Base::Subject<const char*> &rCaller,const char* rcReas
void EditorView::checkTimestamp()
{
QFileInfo fi(d->fileName);
uint timeStamp = fi.lastModified().toTime_t();
qint64 timeStamp = fi.lastModified().toSecsSinceEpoch();
if (timeStamp != d->timeStamp) {
switch( QMessageBox::question( this, tr("Modified file"),
tr("%1.\n\nThis has been modified outside of the source editor. Do you want to reload it?").arg(d->fileName),
@@ -369,7 +369,7 @@ bool EditorView::open(const QString& fileName)
file.close();
QFileInfo fi(fileName);
d->timeStamp = fi.lastModified().toTime_t();
d->timeStamp = fi.lastModified().toSecsSinceEpoch();
d->activityTimer->setSingleShot(true);
d->activityTimer->start(3000);
@@ -530,7 +530,7 @@ bool EditorView::saveFile()
d->textEdit->document()->setModified(false);
QFileInfo fi(d->fileName);
d->timeStamp = fi.lastModified().toTime_t();
d->timeStamp = fi.lastModified().toSecsSinceEpoch();
return true;
}