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

Core: Use FileName for file path in IDocument

Browse Source 
Change-Id: I85f7398aee59d0d36f0e5c3bf88ff3c96002e394
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2014-12-21 21:54:30 +02:00
committed by Orgad Shaneh
parent 9c1b28fec2
commit c6a983d271
123 changed files with 327 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmlprojectmanager/qmlprojectfile.cpp
View File

@@ -36,7 +36,7 @@
namespace QmlProjectManager {
namespace Internal {
QmlProjectFile::QmlProjectFile(QmlProject *parent, QString fileName)
QmlProjectFile::QmlProjectFile(QmlProject *parent, const QString &fileName)
: Core::IDocument(parent),
m_project(parent)
{
@@ -44,7 +44,7 @@ QmlProjectFile::QmlProjectFile(QmlProject *parent, QString fileName)
QTC_CHECK(!fileName.isEmpty());
setId("Qml.ProjectFile");
setMimeType(QLatin1String(Constants::QMLPROJECT_MIMETYPE));
setFilePath(fileName);
setFilePath(Utils::FileName::fromString(fileName));
}
QmlProjectFile::~QmlProjectFile()

2
src/plugins/qmlprojectmanager/qmlprojectfile.h
View File

@@ -44,7 +44,7 @@ class QmlProjectFile : public Core::IDocument
Q_OBJECT
public:
QmlProjectFile(QmlProject *parent, QString fileName);
QmlProjectFile(QmlProject *parent, const QString &fileName);
virtual ~QmlProjectFile();
virtual bool save(QString *errorString, const QString &fileName, bool autoSave);

6
src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
View File

@@ -42,11 +42,11 @@ namespace QmlProjectManager {
namespace Internal {
QmlProjectNode::QmlProjectNode(QmlProject *project, Core::IDocument *projectFile)
: ProjectExplorer::ProjectNode(QFileInfo(projectFile->filePath()).absoluteFilePath()),
: ProjectExplorer::ProjectNode(projectFile->filePath().toString()),
m_project(project),
m_projectFile(projectFile)
{
setDisplayName(QFileInfo(projectFile->filePath()).completeBaseName());
setDisplayName(projectFile->filePath().toFileInfo().completeBaseName());
// make overlay
const QSize desiredSize = QSize(16, 16);
const QIcon projectBaseIcon(QLatin1String(":/qmlproject/images/qmlfolder.png"));
@@ -63,7 +63,7 @@ Core::IDocument *QmlProjectNode::projectFile() const
{ return m_projectFile; }
QString QmlProjectNode::projectFilePath() const
{ return m_projectFile->filePath(); }
{ return m_projectFile->filePath().toString(); }
void QmlProjectNode::refresh()
{

4
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -257,7 +257,7 @@ void QmlProjectRunConfiguration::changeCurrentFile(IEditor *editor)
editor = EditorManager::currentEditor();
if (editor)
m_currentFileFilename = editor->document()->filePath();
m_currentFileFilename = editor->document()->filePath().toString();
updateEnabled();
}
@@ -267,7 +267,7 @@ void QmlProjectRunConfiguration::updateEnabled()
if (mainScriptSource() == FileInEditor) {
IDocument *document = EditorManager::currentDocument();
if (document) {
m_currentFileFilename = document->filePath();
m_currentFileFilename = document->filePath().toString();
if (MimeDatabase::findByFile(mainScript()).type() == QLatin1String("application/x-qml"))
qmlFileFound = true;
}