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
4a8cbc61
Commit
4a8cbc61
authored
Jun 07, 2019
by
Michael Reeves
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't append to already complete url
parent
5c3ea7c4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
src/fileaccess.cpp
src/fileaccess.cpp
+3
-2
src/fileaccess.h
src/fileaccess.h
+1
-1
No files found.
src/fileaccess.cpp
View file @
4a8cbc61
...
@@ -63,7 +63,6 @@ void FileAccess::reset()
...
@@ -63,7 +63,6 @@ void FileAccess::reset()
m_linkTarget
=
""
;
m_linkTarget
=
""
;
//m_fileType = -1;
//m_fileType = -1;
m_pParent
=
nullptr
;
tmpFile
.
clear
();
tmpFile
.
clear
();
tmpFile
=
QSharedPointer
<
QTemporaryFile
>::
create
();
tmpFile
=
QSharedPointer
<
QTemporaryFile
>::
create
();
realFile
=
nullptr
;
realFile
=
nullptr
;
...
@@ -102,6 +101,7 @@ void FileAccess::setFile(const QString& name, bool bWantToWrite)
...
@@ -102,6 +101,7 @@ void FileAccess::setFile(const QString& name, bool bWantToWrite)
void
FileAccess
::
setFile
(
const
QUrl
&
url
,
bool
bWantToWrite
)
void
FileAccess
::
setFile
(
const
QUrl
&
url
,
bool
bWantToWrite
)
{
{
reset
();
reset
();
Q_ASSERT
(
parent
()
==
nullptr
||
url
!=
parent
()
->
url
());
m_url
=
url
;
m_url
=
url
;
//QUrl::isLocalFile assumes the scheme is set.
//QUrl::isLocalFile assumes the scheme is set.
...
@@ -1208,7 +1208,8 @@ void FileAccessJobHandler::slotListDirProcessNewEntries(KIO::Job*, const KIO::UD
...
@@ -1208,7 +1208,8 @@ void FileAccessJobHandler::slotListDirProcessNewEntries(KIO::Job*, const KIO::UD
//must be manually filtered KDE does not supply API for ignoring these.
//must be manually filtered KDE does not supply API for ignoring these.
if
(
fa
.
fileName
()
!=
"."
&&
fa
.
fileName
()
!=
".."
)
if
(
fa
.
fileName
()
!=
"."
&&
fa
.
fileName
()
!=
".."
)
{
{
fa
.
addPath
(
fa
.
fileName
());
//quick fix to preserve behavoir without creating invalid urls. TODO: look for altertive machanism for use with next major release.
fa
.
setFile
(
fa
.
url
());
m_pDirList
->
push_back
(
fa
);
m_pDirList
->
push_back
(
fa
);
}
}
...
...
src/fileaccess.h
View file @
4a8cbc61
...
@@ -118,7 +118,7 @@ class FileAccess
...
@@ -118,7 +118,7 @@ class FileAccess
bool
m_bValidData
;
bool
m_bValidData
;
//long m_fileType; // for testing only
//long m_fileType; // for testing only
FileAccess
*
m_pParent
;
FileAccess
*
m_pParent
=
nullptr
;
QDir
m_baseDir
;
QDir
m_baseDir
;
QFileInfo
m_fileInfo
;
QFileInfo
m_fileInfo
;
...
...
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