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

SessionFile::fileName can't return a empty filename

Browse Source 
So remove code that checks for that

Change-Id: I6e717f27713fae0b7487e18a45790b82e4e1e8cd
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Daniel Teske
2012-02-06 15:10:05 +01:00
parent c59bf4b402
commit a92830e37a
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/projectexplorer/session.cpp
View File

@@ -226,8 +226,6 @@ bool SessionFile::load(const QString &fileName)
bool SessionFile::save() bool SessionFile::save()
{ {
Q_ASSERT(!m_fileName.isEmpty());
if (debug) if (debug)
qDebug() << "SessionFile - saving " << m_fileName; qDebug() << "SessionFile - saving " << m_fileName;
@@ -545,12 +543,10 @@ bool SessionManager::createImpl(const QString &fileName)
qDebug() << "SessionManager - creating new session " << fileName << " ..."; qDebug() << "SessionManager - creating new session " << fileName << " ...";
bool success = true; bool success = true;
if (isDefaultVirgin()) {
if (!m_file->fileName().isEmpty()) { // do not save initial and virgin default session
if (isDefaultVirgin()) { } else if (!save() || !clear()) {
// do not save initial and virgin default session success = false;
} else if (!save() || !clear())
success = false;
} }
if (success) { if (success) {
@@ -588,13 +584,10 @@ bool SessionManager::loadImpl(const QString &fileName)
qDebug() << "SessionManager - restoring session " << fileName << " ..."; qDebug() << "SessionManager - restoring session " << fileName << " ...";
bool success = true; bool success = true;
if (isDefaultVirgin()) {
if (!m_file->fileName().isEmpty()) { // do not save initial and virgin default session
if (isDefaultVirgin()) { } else if (!save() || !clear()) {
// do not save initial and virgin default session success = false;
} else if (!save() || !clear()) {
success = false;
}
} }
m_virginSession = false; m_virginSession = false;
@@ -1075,8 +1068,7 @@ void SessionManager::reportProjectLoadingProgress()
void SessionManager::markSessionFileDirty(bool makeDefaultVirginDirty) void SessionManager::markSessionFileDirty(bool makeDefaultVirginDirty)
{ {
if (m_file && !m_file->fileName().isEmpty()) m_autoSaveSessionTimer->start();
m_autoSaveSessionTimer->start();
if (makeDefaultVirginDirty) if (makeDefaultVirginDirty)
m_virginSession = false; m_virginSession = false;
} }