Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Johannes Zarl-Zierl
KPhotoAlbum
Commits
44ffe900
Commit
44ffe900
authored
Oct 15, 2020
by
Robert Krawitz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix version-dependent initialization warning
parent
d2af41aa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
Utilities/FastDateTime.cpp
Utilities/FastDateTime.cpp
+6
-1
XMLDB/FileReader.cpp
XMLDB/FileReader.cpp
+0
-4
No files found.
Utilities/FastDateTime.cpp
View file @
44ffe900
...
...
@@ -38,7 +38,12 @@ Utilities::FastDateTime::FastDateTime(const QDate &d, const QTime &t,
}
Utilities
::
FastDateTime
::
FastDateTime
(
const
QDate
&
d
)
:
m_dateTime
(
d
),
:
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
m_dateTime
(
d
.
startOfDay
()),
#else
m_dateTime
(
d
),
#endif
m_msecsSinceEpoch
(
toValidatedMSecs
(
m_dateTime
))
{
}
...
...
XMLDB/FileReader.cpp
View file @
44ffe900
...
...
@@ -395,11 +395,7 @@ void XMLDB::FileReader::checkIfImagesAreSorted()
if
(
m_db
->
uiDelegate
().
isDialogDisabled
(
QString
::
fromLatin1
(
"checkWhetherImagesAreSorted"
)))
return
;
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
Utilities
::
FastDateTime
last
=
QDate
(
1900
,
1
,
1
).
startOfDay
();
#else
Utilities
::
FastDateTime
last
(
QDate
(
1900
,
1
,
1
));
#endif
bool
wrongOrder
=
false
;
for
(
DB
::
ImageInfoListIterator
it
=
m_db
->
m_images
.
begin
();
!
wrongOrder
&&
it
!=
m_db
->
m_images
.
end
();
++
it
)
{
if
(
last
>
(
*
it
)
->
date
().
start
()
&&
(
*
it
)
->
date
().
start
().
isValid
())
...
...
Write
Preview
Markdown
is supported
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