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
SDK
KDiff3
Commits
40f6a2d2
Commit
40f6a2d2
authored
Apr 09, 2017
by
Michael Reeves
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use std:sort
parent
adce42e2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
src/directorymergewindow.cpp
src/directorymergewindow.cpp
+2
-2
No files found.
src/directorymergewindow.cpp
View file @
40f6a2d2
...
...
@@ -2234,9 +2234,9 @@ class MfiLessThan {
return
bDir1
;
}
};
//FIXME:Don't sort twice to get reverse order. Really?!
static
void
sortHelper
(
MergeFileInfos
*
pMFI
,
int
sortColumn
,
Qt
::
SortOrder
order
)
{
qS
ort
(
pMFI
->
m_children
.
begin
(),
pMFI
->
m_children
.
end
(),
MfiLessThan
(
sortColumn
)
);
std
::
s
ort
(
pMFI
->
m_children
.
begin
(),
pMFI
->
m_children
.
end
(),
MfiLessThan
(
sortColumn
)
);
if
(
order
==
Qt
::
DescendingOrder
)
std
::
reverse
(
pMFI
->
m_children
.
begin
(),
pMFI
->
m_children
.
end
()
);
...
...
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