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

Remove some stone old compat code + use methods for user resource path.

Browse Source 
Reviewed-by: dt
This commit is contained in:
con
2010-10-25 17:12:19 +02:00
parent 99a93dc2e3
commit a96267ea12
1 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,18 +155,6 @@ bool SessionFile::load(const QString &fileName)
QStringList fileList = QStringList fileList =
reader.restoreValue(QLatin1String("ProjectList")).toStringList(); reader.restoreValue(QLatin1String("ProjectList")).toStringList();
QString configDir = QFileInfo(m_core->settings()->fileName()).path();
QMutableStringListIterator it(fileList);
while (it.hasNext()) {
const QString &file = it.next();
if (QFileInfo(file).isRelative()) {
// We used to write relative paths into the session file
// relative to the session files, and those were stored in the
// config dir
it.setValue(configDir + QLatin1Char('/') + file);
}
}
int openEditorsCount = reader.restoreValue(QLatin1String("OpenEditors")).toInt(); int openEditorsCount = reader.restoreValue(QLatin1String("OpenEditors")).toInt();
future.setProgressRange(0, fileList.count() + openEditorsCount + 2); future.setProgressRange(0, fileList.count() + openEditorsCount + 2);
@@ -349,23 +337,6 @@ SessionManager::SessionManager(QObject *parent)
m_currentEditor(0), m_currentEditor(0),
m_virginSession(true) m_virginSession(true)
{ {
// Create qtcreator dir if it doesn't yet exist
QString configDir = QFileInfo(m_core->settings()->fileName()).path();
QFileInfo fi(configDir + "/qtcreator/");
if (!fi.exists()) {
QDir dir;
dir.mkpath(configDir + "/qtcreator");
// Move sessions to that directory
foreach (const QString &session, sessions()) {
QFile file(configDir + QLatin1Char('/') + session + QLatin1String(".qws"));
if (file.exists())
if (file.copy(configDir + QLatin1String("/qtcreator/") + session + QLatin1String(".qws")))
file.remove();
}
}
connect(m_core->modeManager(), SIGNAL(currentModeChanged(Core::IMode*)), connect(m_core->modeManager(), SIGNAL(currentModeChanged(Core::IMode*)),
this, SLOT(saveActiveMode(Core::IMode*))); this, SLOT(saveActiveMode(Core::IMode*)));
@@ -1023,7 +994,7 @@ QStringList SessionManager::sessions() const
{ {
if (m_sessions.isEmpty()) { if (m_sessions.isEmpty()) {
// We are not initialized yet, so do that now // We are not initialized yet, so do that now
QDir sessionDir(QFileInfo(m_core->settings()->fileName()).path()+ "/qtcreator/"); QDir sessionDir(Core::ICore::instance()->userResourcePath());
QList<QFileInfo> sessionFiles = sessionDir.entryInfoList(QStringList() << QLatin1String("*.qws"), QDir::NoFilter, QDir::Time); QList<QFileInfo> sessionFiles = sessionDir.entryInfoList(QStringList() << QLatin1String("*.qws"), QDir::NoFilter, QDir::Time);
Q_FOREACH(const QFileInfo& fileInfo, sessionFiles) { Q_FOREACH(const QFileInfo& fileInfo, sessionFiles) {
if (fileInfo.completeBaseName() != "default") if (fileInfo.completeBaseName() != "default")