feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clean the BaseTextDocument filename.

Browse Source 
Previously, it could contain multiple directory separators, . or ..

This makes using the filename safe for hashes like the ones used in the
C++ and Qml code models.

Reviewed-by: Roberto Raggi
Reviewed-by: mae
This commit is contained in:
Christian Kamm
2010-04-01 14:27:52 +02:00
parent f1e5851257
commit 80fa321609
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/texteditor/basetextdocument.cpp
View File

@@ -32,6 +32,7 @@
#include "storagesettings.h"
#include <QtCore/QFile>
#include <QtCore/QDir>
#include <QtCore/QFileInfo>
#include <QtCore/QTextStream>
#include <QtCore/QTextCodec>
@@ -115,7 +116,7 @@ bool BaseTextDocument::save(const QString &fileName)
file.close();
const QFileInfo fi(fName);
m_fileName = fi.absoluteFilePath();
m_fileName = QDir::cleanPath(fi.absoluteFilePath());
m_document->setModified(false);
emit titleChanged(fi.fileName());
@@ -158,7 +159,7 @@ bool BaseTextDocument::open(const QString &fileName)
if (!fileName.isEmpty()) {
const QFileInfo fi(fileName);
m_fileIsReadOnly = !fi.isWritable();
m_fileName = fi.absoluteFilePath();
m_fileName = QDir::cleanPath(fi.absoluteFilePath());
QFile file(fileName);
if (!file.open(QIODevice::ReadOnly))