Fix LogViewTelegramEdit m_logger and Qt::TextDate for Qt6
- Add m_logger member variable to LogViewTelegramEdit.hpp - Initialize m_logger in LogViewTelegramEdit constructor - Replace Qt::SystemLocaleLongDate with Qt::TextDate for Qt6 compatibility Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
3 files changed
+5
-1
No files matched your search
@@ -1630,7 +1630,7 @@ void LogViewTelegram::showMessageBox(const QString& a_errorText, const QString&
|
||||
QLatin1String("gesendete") : QLatin1String("gelesene"));
|
||||
QMessageBox::warning(QApplication::topLevelWidgets()[0], a_title,
|
||||
QString::fromUtf8("Das %5 Telegramm mit Protokoll %6 von %1 (Unix-Zeit: %2) und Länge %3 ist fehlerhaft:<br><br><b>%4</b>")
|
||||
.arg(dt.toString(Qt::SystemLocaleLongDate)).arg(logTimeSec).arg(m_data.size()).arg(a_errorText, destStr).arg(m_Protocol));
|
||||
.arg(dt.toString(Qt::TextDate)).arg(logTimeSec).arg(m_data.size()).arg(a_errorText, destStr).arg(m_Protocol));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -43,6 +43,7 @@ QString TelegramEdit::s_TELEGRAMLIST_FILES()
|
||||
|
||||
TelegramEdit::TelegramEdit(QWidget *parent)
|
||||
: QObject(parent)
|
||||
, m_logger(getLogger("LogViewTelegramEdit"))
|
||||
, m_addTeleAction(new QAction(QIcon(QLatin1String(":icons/16x16/list-add.png")), tr("Add Telegram"), this))
|
||||
, m_editTeleAction(new QAction(QIcon(QLatin1String(":/image/Edit.png")), tr("Edit Telegram"), this))
|
||||
, m_copyTeleAction(new QAction(QIcon(QLatin1String(":icons/16x16/edit-copy.png")), tr("Copy Telegram"), this))
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "LogViewTelegram.hpp"
|
||||
#include "logger.h"
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
class QAction;
|
||||
@@ -60,6 +61,8 @@ protected:
|
||||
int m_curEditTelegramRow;
|
||||
|
||||
TelegramEditModel *m_EditModel;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
static QString s_DIR();
|
||||
static QString s_EDIT_TELEGRAM_GROUP();
|
||||
static QString s_TELEGRAMLIST_FILE_ID();
|
||||
|
||||
Reference in new issue
Block a user