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

Rename IDocument::fileName --> filePath

Browse Source 
That is what it actually is, wrt how Qt API calls it.

Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Eike Ziller
2013-07-04 13:30:26 +02:00
parent cee1602253
commit dd43d9908f
118 changed files with 326 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cpptools/cppcompletion_test.cpp
View File

@@ -64,7 +64,7 @@ static QStringList getCompletions(TestData &data, bool *replaceAccessOperator =
QStringList completions;
CppCompletionAssistInterface *ai = new CppCompletionAssistInterface(data.editor->document(), data.pos,
data.editor->editorDocument()->fileName(), ExplicitlyInvoked,
data.editor->editorDocument()->filePath(), ExplicitlyInvoked,
data.snapshot, QStringList(), QStringList());
CppCompletionAssistProcessor processor;
IAssistProposal *proposal = processor.perform(ai);

2
src/plugins/cpptools/cppcompletionassist.cpp
View File

@@ -440,7 +440,7 @@ public:
return new CppTools::Internal::CppCompletionAssistInterface(
document,
position,
editor()->document()->fileName(),
editor()->document()->filePath(),
reason,
modelManager->snapshot(),
includePaths,

4
src/plugins/cpptools/cppcurrentdocumentfilter.cpp
View File

@@ -127,7 +127,7 @@ void CppCurrentDocumentFilter::onDocumentUpdated(Document::Ptr doc)
void CppCurrentDocumentFilter::onCurrentEditorChanged(Core::IEditor * currentEditor)
{
if (currentEditor)
m_currentFileName = currentEditor->document()->fileName();
m_currentFileName = currentEditor->document()->filePath();
else
m_currentFileName.clear();
m_itemsOfCurrentDoc.clear();
@@ -136,7 +136,7 @@ void CppCurrentDocumentFilter::onCurrentEditorChanged(Core::IEditor * currentEdi
void CppCurrentDocumentFilter::onEditorAboutToClose(Core::IEditor * editorAboutToClose)
{
if (!editorAboutToClose) return;
if (m_currentFileName == editorAboutToClose->document()->fileName()) {
if (m_currentFileName == editorAboutToClose->document()->filePath()) {
m_currentFileName.clear();
m_itemsOfCurrentDoc.clear();
}

2
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -377,7 +377,7 @@ void CppModelManager::dumpModelManagerConfiguration()
// Tons of debug output...
qDebug()<<"========= CppModelManager::dumpModelManagerConfiguration ======";
foreach (const ProjectInfo &pinfo, m_projects) {
qDebug()<<" for project:"<< pinfo.project().data()->document()->fileName();
qDebug()<<" for project:"<< pinfo.project().data()->document()->filePath();
foreach (const ProjectPart::Ptr &part, pinfo.projectParts()) {
qDebug() << "=== part ===";
const char* cVersion;

4
src/plugins/cpptools/cpptoolseditorsupport.cpp
View File

@@ -163,7 +163,7 @@ CppEditorSupport::~CppEditorSupport()
QString CppEditorSupport::fileName() const
{
return m_textEditor->document()->fileName();
return m_textEditor->document()->filePath();
}
QString CppEditorSupport::contents() const
@@ -246,7 +246,7 @@ void CppEditorSupport::updateDocumentNow()
if (m_highlightingSupport && !m_highlightingSupport->requiresSemanticInfo())
startHighlighting();
const QStringList sourceFiles(m_textEditor->document()->fileName());
const QStringList sourceFiles(m_textEditor->document()->filePath());
m_documentParser = m_modelManager->updateSourceFiles(sourceFiles);
}
}

4
src/plugins/cpptools/cpptoolsplugin.cpp
View File

@@ -154,7 +154,7 @@ ExtensionSystem::IPlugin::ShutdownFlag CppToolsPlugin::aboutToShutdown()
void CppToolsPlugin::switchHeaderSource()
{
QString otherFile = correspondingHeaderOrSource(
Core::EditorManager::currentEditor()->document()->fileName());
Core::EditorManager::currentEditor()->document()->filePath());
if (!otherFile.isEmpty())
Core::EditorManager::openEditor(otherFile);
}
@@ -162,7 +162,7 @@ void CppToolsPlugin::switchHeaderSource()
void CppToolsPlugin::switchHeaderSourceInNextSplit()
{
QString otherFile = correspondingHeaderOrSource(
Core::EditorManager::currentEditor()->document()->fileName());
Core::EditorManager::currentEditor()->document()->filePath());
if (!otherFile.isEmpty())
Core::EditorManager::openEditor(otherFile, Core::Id(), Core::EditorManager::OpenInOtherSplit);
}