Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
System
KSystemLog
Commits
b7a17340
Commit
b7a17340
authored
Dec 22, 2021
by
Laurent Montel
Browse files
Fix some compile error against qt6
parent
f525d679
Pipeline
#113171
passed with stage
in 1 minute and 26 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/lib/kioLogFileReader.cpp
View file @
b7a17340
...
...
@@ -10,7 +10,6 @@
#include
<kio/filejob.h>
#include
<kio/job.h>
#include
<kio_version.h>
#include
<KDirWatch>
...
...
src/lib/localLogFileReader.cpp
View file @
b7a17340
...
...
@@ -13,7 +13,6 @@
#include
<KDirWatch>
#include
<KLocalizedString>
#include
<karchive_version.h>
#include
<KCompressionDevice>
#include
"logFileReaderPrivate.h"
...
...
src/lib/logMode.h
View file @
b7a17340
...
...
@@ -10,6 +10,7 @@
#include
<QList>
#include
<QObject>
#include
<QString>
#include
<QVariant>
#include
<QVector>
#include
"logFile.h"
...
...
src/lib/logViewColumns.h
View file @
b7a17340
...
...
@@ -7,9 +7,9 @@
#pragma once
#include
<QList>
#include
<QStringList>
class
LogViewColumn
;
class
QStringList
;
class
LogViewColumns
{
...
...
src/lib/logViewWidget.cpp
View file @
b7a17340
...
...
@@ -7,6 +7,7 @@
#include
"logViewWidget.h"
#include
<QAction>
#include
<QActionGroup>
#include
<QHeaderView>
#include
<KLocalizedString>
...
...
src/modes/base/syslogAnalyzer.cpp
View file @
b7a17340
...
...
@@ -87,14 +87,21 @@ LogLine *SyslogAnalyzer::parseMessage(const QString &logLine, const LogFile &ori
line
.
remove
(
0
,
3
);
// Time
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QString
stringTime
(
line
.
left
(
8
));
const
int
h
=
stringTime
.
leftRef
(
2
).
toInt
();
stringTime
.
remove
(
0
,
3
);
const
int
m
=
stringTime
.
leftRef
(
2
).
toInt
();
stringTime
.
remove
(
0
,
3
);
const
int
s
=
stringTime
.
leftRef
(
2
).
toInt
();
#else
QString
stringTime
(
line
.
left
(
8
));
const
int
h
=
QStringView
(
stringTime
).
left
(
2
).
toInt
();
stringTime
.
remove
(
0
,
3
);
const
int
m
=
QStringView
(
stringTime
).
left
(
2
).
toInt
();
stringTime
.
remove
(
0
,
3
);
const
int
s
=
QStringView
(
stringTime
).
left
(
2
).
toInt
();
#endif
const
QDateTime
dateTime
(
QDate
(
year
,
monthNum
,
dayNum
),
QTime
(
h
,
m
,
s
));
if
(
!
dateTime
.
isValid
())
{
qCDebug
(
KSYSTEMLOG
)
<<
"Malformed date and time"
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment