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

Remove DocumentManager::currentFile, use DocumentManager::currentEditor

Browse Source 
Change-Id: Ided1a14481cfbbcc49e901f3837e056582ff60e3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Daniel Teske
2015-01-16 17:45:06 +01:00
parent a6ea380870
commit 1ed12d39f1
7 changed files with 20 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/plugins/coreplugin/documentmanager.cpp
View File

@@ -152,8 +152,6 @@ struct DocumentManagerPrivate
QList<DocumentManager::RecentFile> m_recentFiles;
static const int m_maxRecentFiles = 7;
QString m_currentFile;
QFileSystemWatcher *m_fileWatcher; // Delayed creation.
QFileSystemWatcher *m_linkWatcher; // Delayed creation (only UNIX/if a link is seen).
bool m_blockActivated;
@@ -878,8 +876,8 @@ QStringList DocumentManager::getOpenFileNames(const QString &filters,
{
QString path = pathIn;
if (path.isEmpty()) {
if (!d->m_currentFile.isEmpty())
path = QFileInfo(d->m_currentFile).absoluteFilePath();
if (EditorManager::currentDocument() && !EditorManager::currentDocument()->isTemporary())
path = EditorManager::currentDocument()->filePath().toString();
if (path.isEmpty() && useProjectsDirectory())
path = projectsDirectory();
}
@@ -1242,34 +1240,6 @@ void readSettings()
s->endGroup();
}
/*!
The current file is the file currently opened when an editor is active,
or the selected file in case a Project Explorer is active.
\sa currentFile
*/
void DocumentManager::setCurrentFile(const QString &filePath)
{
if (d->m_currentFile == filePath)
return;
d->m_currentFile = filePath;
emit m_instance->currentFileChanged(d->m_currentFile);
}
/*!
Returns the absolute path of the current file.
The current file is the file currently opened when an editor is active,
or the selected file in case a Project Explorer is active.
\sa setCurrentFile
*/
QString DocumentManager::currentFile()
{
return d->m_currentFile;
}
/*!
Returns the initial directory for a new file dialog. If there is
@@ -1280,8 +1250,8 @@ QString DocumentManager::currentFile()
QString DocumentManager::fileDialogInitialDirectory()
{
if (!d->m_currentFile.isEmpty())
return QFileInfo(d->m_currentFile).absolutePath();
if (EditorManager::currentDocument() && !EditorManager::currentDocument()->isTemporary())
return QFileInfo(EditorManager::currentDocument()->filePath().toString()).absolutePath();
return d->m_lastVisitedDirectory;
}