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
b794c833
Commit
b794c833
authored
Mar 29, 2019
by
Michael Reeves
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
set Directory compare flag when passed parameters
parent
5ac57037
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
src/kdiff3.cpp
src/kdiff3.cpp
+3
-1
src/main.cpp
src/main.cpp
+1
-1
No files found.
src/kdiff3.cpp
View file @
b794c833
...
@@ -266,7 +266,9 @@ KDiff3App::KDiff3App(QWidget* pParent, const QString& name, KDiff3Part* pKDiff3P
...
@@ -266,7 +266,9 @@ KDiff3App::KDiff3App(QWidget* pParent, const QString& name, KDiff3Part* pKDiff3P
if
(
args
.
count
()
>
0
)
m_sd2
.
setFilename
(
args
[
0
]);
if
(
args
.
count
()
>
0
)
m_sd2
.
setFilename
(
args
[
0
]);
if
(
args
.
count
()
>
1
)
m_sd3
.
setFilename
(
args
[
1
]);
if
(
args
.
count
()
>
1
)
m_sd3
.
setFilename
(
args
[
1
]);
}
}
//never properly defined and redundant
//Set m_bDirCompare flag
m_bDirCompare
=
FileAccess
(
m_sd1
.
getFilename
()).
isDir
();
QStringList
aliasList
;
//KDiff3Shell::getParser()->values( "fname" );
QStringList
aliasList
;
//KDiff3Shell::getParser()->values( "fname" );
QStringList
::
Iterator
ali
=
aliasList
.
begin
();
QStringList
::
Iterator
ali
=
aliasList
.
begin
();
...
...
src/main.cpp
View file @
b794c833
...
@@ -144,7 +144,7 @@ int main(int argc, char* argv[])
...
@@ -144,7 +144,7 @@ int main(int argc, char* argv[])
else
else
{
{
/*
/*
There is no terminal connected so don't just exit mysteriously
exit
on error.
There is no terminal connected so don't just exit mysteriously on error.
*/
*/
if
(
!
cmdLineParser
->
parse
(
QCoreApplication
::
arguments
()))
if
(
!
cmdLineParser
->
parse
(
QCoreApplication
::
arguments
()))
{
{
...
...
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