WSL/SLF GitLab Repository
Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
snow-models
inishell
Commits
7889235f
Commit
7889235f
authored
Feb 01, 2022
by
Mathias Bavay
Browse files
Fixing deprecation warnings by QT5.15 (paving the way for Qt6)
parent
c063dfb7
Changes
5
Show whitespace changes
Inline
Side-by-side
src/main/Error.cc
View file @
7889235f
...
...
@@ -77,9 +77,9 @@ Error::Error(const QString &message, const QString &infotext, const QString &det
if
(
level
==
error
::
fatal
)
{
//currently not used
QString
msg
;
QTextStream
ss
(
&
msg
);
ss
<<
QMessageBox
::
tr
(
"Aborted after fatal error:"
)
<<
endl
;
ss
<<
message
<<
endl
;
ss
<<
infotext
<<
endl
<<
details
;
ss
<<
QMessageBox
::
tr
(
"Aborted after fatal error:"
)
<<
Qt
::
endl
;
ss
<<
message
<<
Qt
::
endl
;
ss
<<
infotext
<<
Qt
::
endl
<<
details
;
throw
std
::
runtime_error
(
msg
.
toStdString
());
//TODO: autosave log if this level is ever actually used
}
...
...
src/main/common.h
View file @
7889235f
...
...
@@ -35,6 +35,15 @@
#include
<QStringList>
#include
<QtXml>
#include
<QtXmlPatterns/QAbstractMessageHandler>
#include
<QtGlobal>
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
namespace
Qt
{
static
auto
endl
=
::
endl
;
static
auto
SkipEmptyParts
=
QString
::
SkipEmptyParts
;
}
#endif
namespace
html
{
...
...
src/main/main.cc
View file @
7889235f
...
...
@@ -238,7 +238,7 @@ inline void perform_cmd_ini_operations(const QCommandLineParser &parser, const c
const
QStringList
mod_ini_list
(
pos
.
split
(
"="
)
);
if
(
mod_ini_list
.
size
()
==
2
)
{
const
QStringList
param_list
(
mod_ini_list
.
at
(
0
).
trimmed
().
split
(
Cst
::
sep
,
Q
String
::
SkipEmptyParts
));
Cst
::
sep
,
Q
t
::
SkipEmptyParts
));
if
(
param_list
.
size
()
==
2
)
//silently skip wrong formats
cmd_ini
.
set
(
param_list
.
at
(
0
),
param_list
.
at
(
1
),
mod_ini_list
.
at
(
1
).
trimmed
());
...
...
src/panels/Checklist.cc
View file @
7889235f
...
...
@@ -213,7 +213,7 @@ void Checklist::onPropertySet()
const
QString
values
(
this
->
property
(
"ini_value"
).
toString
()
);
if
(
ini_value_
==
values
)
return
;
const
QStringList
value_list
(
values
.
split
(
QRegExp
(
"
\\
s+"
),
Q
String
::
SkipEmptyParts
)
);
const
QStringList
value_list
(
values
.
split
(
QRegExp
(
"
\\
s+"
),
Q
t
::
SkipEmptyParts
)
);
/* clear the list, overwriting current settings */
for
(
int
ii
=
0
;
ii
<
list_
->
count
();
++
ii
)
{
...
...
src/panels/Choice.cc
View file @
7889235f
...
...
@@ -203,7 +203,7 @@ void Choice::onPropertySet()
const
QString
values
(
this
->
property
(
"ini_value"
).
toString
()
);
if
(
ini_value_
==
values
)
return
;
const
QStringList
value_list
(
values
.
split
(
QRegExp
(
"
\\
s+"
),
Q
String
::
SkipEmptyParts
)
);
const
QStringList
value_list
(
values
.
split
(
QRegExp
(
"
\\
s+"
),
Q
t
::
SkipEmptyParts
)
);
if
(
checkbox_container_
->
count
()
==
1
)
{
topLog
(
QString
(
tr
(
R"(XML error: No checkable options set for Choice panel "%1::%2".)"
).
arg
(
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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