Commit f0dadf39 authored by Joachim Eibl's avatar Joachim Eibl
Browse files

Fixed reading clearcase file

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@154 c8aa9fed-2811-0410-8543-893ada326672
parent 614cfcaf
...@@ -180,8 +180,10 @@ static QString nicePath( const QFileInfo& fi ) ...@@ -180,8 +180,10 @@ static QString nicePath( const QFileInfo& fi )
void FileAccess::setFile( const QFileInfo& fi, FileAccess* pParent ) void FileAccess::setFile( const QFileInfo& fi, FileAccess* pParent )
{ {
m_filePath = nicePath( fi.filePath() ); // remove "./" at start
m_bSymLink = fi.isSymLink(); m_bSymLink = fi.isSymLink();
if ( m_bSymLink && !m_bUseData ) if ( ( m_bSymLink || (!m_bExists && m_filePath.contains("@@") ) )&& !m_bUseData )
{ {
m_pData = new Data; m_pData = new Data;
m_bUseData = true; m_bUseData = true;
...@@ -192,8 +194,6 @@ void FileAccess::setFile( const QFileInfo& fi, FileAccess* pParent ) ...@@ -192,8 +194,6 @@ void FileAccess::setFile( const QFileInfo& fi, FileAccess* pParent )
else else
m_pParent = pParent; m_pParent = pParent;
m_filePath = nicePath( fi.filePath() ); // remove "./" at start
if ( parent() || d() ) // if a parent is specified then we arrive here because of listing a directory if ( parent() || d() ) // if a parent is specified then we arrive here because of listing a directory
{ {
m_bFile = fi.isFile(); m_bFile = fi.isFile();
...@@ -258,6 +258,8 @@ void FileAccess::setFile( const QFileInfo& fi, FileAccess* pParent ) ...@@ -258,6 +258,8 @@ void FileAccess::setFile( const QFileInfo& fi, FileAccess* pParent )
#endif #endif
//d()->m_creationTime = fi.created(); //d()->m_creationTime = fi.created();
//d()->m_accessTime = fi.lastRead(); //d()->m_accessTime = fi.lastRead();
m_bExists = fi.exists();
m_size = fi.size();
} }
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment