AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix hidden detach

Browse Source 
The methods are const but the member is mutable.

Spotted being detached a few times at app startup.
Strings were a few hundred chars big.

Change-Id: Iaa3dc42a4f01f819a3fc4f8d756e35d38ce0aa1b
Reviewed-by: David Faure <david.faure@kdab.com>
This commit is contained in:
Sérgio Martins 2015-05-12 11:37:17 +01:00 committed by Konstantin Ritt
parent 2a2e7ec20a
commit 894a81a1fb
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/corelib/io/qfilesystementry.cpp
View File

@ -255,15 +255,15 @@ QString QFileSystemEntry::completeSuffix() const
bool QFileSystemEntry::isRelative() const
{
resolveFilePath();
return (m_filePath.isEmpty() || (!m_filePath.isEmpty() && (m_filePath[0].unicode() != '/')
&& (!(m_filePath.length() >= 2 && m_filePath[1].unicode() == ':'))));
return (m_filePath.isEmpty() || (!m_filePath.isEmpty() && (m_filePath.at(0).unicode() != '/')
&& (!(m_filePath.length() >= 2 && m_filePath.at(1).unicode() == ':'))));
}
bool QFileSystemEntry::isAbsolute() const
{
resolveFilePath();
return (!m_filePath.isEmpty() && ((m_filePath.length() >= 3
&& (m_filePath[0].isLetter() && m_filePath[1].unicode() == ':' && m_filePath[2].unicode() == '/'))
&& (m_filePath.at(0).isLetter() && m_filePath.at(1).unicode() == ':' && m_filePath.at(2).unicode() == '/'))
|| (m_filePath.length() >= 2 && (m_filePath.at(0) == QLatin1Char('/') && m_filePath.at(1) == QLatin1Char('/')))
));
}
@ -276,7 +276,7 @@ bool QFileSystemEntry::isRelative() const
bool QFileSystemEntry::isAbsolute() const
{
resolveFilePath();
return (!m_filePath.isEmpty() && (m_filePath[0].unicode() == '/'));
return (!m_filePath.isEmpty() && (m_filePath.at(0).unicode() == '/'));
}
#endif
@ -337,10 +337,10 @@ void QFileSystemEntry::findFileNameSeparators() const
int i = m_filePath.size() - 1;
for (; i >= stop; --i) {
if (m_filePath[i].unicode() == '.') {
if (m_filePath.at(i).unicode() == '.') {
firstDotInFileName = lastDotInFileName = i;
break;
} else if (m_filePath[i].unicode() == '/') {
} else if (m_filePath.at(i).unicode() == '/') {
lastSeparator = i;
break;
}
@ -348,9 +348,9 @@ void QFileSystemEntry::findFileNameSeparators() const
if (lastSeparator != i) {
for (--i; i >= stop; --i) {
if (m_filePath[i].unicode() == '.')
if (m_filePath.at(i).unicode() == '.')
firstDotInFileName = i;
else if (m_filePath[i].unicode() == '/') {
else if (m_filePath.at(i).unicode() == '/') {
lastSeparator = i;
break;
}