Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
KDiff3
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
5
Issues
5
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
KDE
KDiff3
Commits
cc6d76e3
Commit
cc6d76e3
authored
Jun 28, 2019
by
Michael Reeves
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't try to manually build url if parent is not set.
parent
85052379
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
3 deletions
+20
-3
src/Logging.cpp
src/Logging.cpp
+1
-0
src/Logging.h
src/Logging.h
+1
-0
src/fileaccess.cpp
src/fileaccess.cpp
+17
-3
src/pdiff.cpp
src/pdiff.cpp
+1
-0
No files found.
src/Logging.cpp
View file @
cc6d76e3
...
...
@@ -20,3 +20,4 @@
#include "Logging.h"
Q_LOGGING_CATEGORY
(
kdeMain
,
"org.kde.kdiff3"
)
Q_LOGGING_CATEGORY
(
kdiffFileAccess
,
"org.kde.kdiff3.fileAccess"
)
src/Logging.h
View file @
cc6d76e3
...
...
@@ -22,4 +22,5 @@
#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY
(
kdeMain
)
Q_DECLARE_LOGGING_CATEGORY
(
kdiffFileAccess
)
#endif // !LOGGING_H
src/fileaccess.cpp
View file @
cc6d76e3
...
...
@@ -10,6 +10,7 @@
#include "fileaccess.h"
#include "cvsignorelist.h"
#include "common.h"
#include "Logging.h"
#include "progress.h"
#include "Utils.h"
...
...
@@ -282,9 +283,22 @@ void FileAccess::setFromUdsEntry(const KIO::UDSEntry& e, FileAccess *parent)
m_fileInfo
.
setCaching
(
true
);
if
(
m_url
.
isEmpty
())
{
m_url
=
parent
->
url
().
resolved
(
QUrl
(
filePath
));
//Verify that the scheme doesn't change.
Q_ASSERT
(
m_url
.
scheme
()
==
parent
->
url
().
scheme
());
if
(
parent
!=
nullptr
)
{
m_url
=
parent
->
url
().
resolved
(
QUrl
(
filePath
));
//Verify that the scheme doesn't change.
Q_ASSERT
(
m_url
.
scheme
()
==
parent
->
url
().
scheme
());
}
else
{
/*
Invalid entry we don't know the full url because KIO didn't tell us and there is no parent
node supplied.
This is a bug if it happens and should be logged . However it is a recoverable error.
*/
qCWarning
(
kdiffFileAccess
)
<<
i18n
(
"Unable to determine full url. No parent specified."
);
return
;
}
}
m_name
=
m_fileInfo
.
fileName
();
...
...
src/pdiff.cpp
View file @
cc6d76e3
...
...
@@ -157,6 +157,7 @@ void KDiff3App::mainInit(TotalDiffStatus* pTotalDiffStatus, bool bLoadFiles, boo
// First get all input data.
pp
.
setInformation
(
i18n
(
"Loading A"
));
qCInfo
(
kdeMain
)
<<
i18n
(
"Loading A: %1"
,
m_sd1
.
getFilename
());
if
(
bUseCurrentEncoding
)
errors
=
m_sd1
.
readAndPreprocess
(
m_sd1
.
getEncoding
(),
false
);
else
...
...
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