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

Add the hostname to the .user file.

Browse Source 
Warn the user on loading them.

Task-Nr: QTCREATORBUG-1084
This commit is contained in:
dt
2010-05-19 15:17:12 +02:00
parent 1d43d8988a
commit 5da667b4a1
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/projectexplorer/projectexplorer.pro
View File

@@ -1,7 +1,8 @@
TEMPLATE = lib TEMPLATE = lib
TARGET = ProjectExplorer TARGET = ProjectExplorer
QT += xml \ QT += xml \
script script \
network
include(../../qtcreatorplugin.pri) include(../../qtcreatorplugin.pri)
include(projectexplorer_dependencies.pri) include(projectexplorer_dependencies.pri)
include(../../shared/scriptwrapper/scriptwrapper.pri) include(../../shared/scriptwrapper/scriptwrapper.pri)

39
src/plugins/projectexplorer/userfileaccessor.cpp
View File

@@ -35,17 +35,22 @@
#include "target.h" #include "target.h"
#include "toolchain.h" #include "toolchain.h"
#include <coreplugin/icore.h>
#include <coreplugin/mainwindow.h>
#include <coreplugin/ifile.h> #include <coreplugin/ifile.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QtCore/QCoreApplication> #include <QtGui/QApplication>
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QtGui/QMessageBox>
#include <QtNetwork/QHostInfo>
using namespace ProjectExplorer; using namespace ProjectExplorer;
namespace { namespace {
const char * const USER_FILE_VERSION("ProjectExplorer.Project.Updater.FileVersion"); const char * const USER_FILE_VERSION = "ProjectExplorer.Project.Updater.FileVersion";
const char * const WAS_UPDATED("ProjectExplorer.Project.Updater.DidUpdate"); const char * const USER_FILE_HOSTNAME = "ProjectExplorer.Project.Updater.Hostname";
const char * const WAS_UPDATED = "ProjectExplorer.Project.Updater.DidUpdate";
const char * const PROJECT_FILE_POSTFIX(".user"); const char * const PROJECT_FILE_POSTFIX(".user");
// Version 0 is used in Qt Creator 1.3.x and // Version 0 is used in Qt Creator 1.3.x and
@@ -225,7 +230,7 @@ QVariantMap UserFileAccessor::restoreSettings(Project *project)
if (m_lastVersion < 0 || !project) if (m_lastVersion < 0 || !project)
return QVariantMap(); return QVariantMap();
QString fileName(fileNameFor(project->file()->fileName())); QString fileName = fileNameFor(project->file()->fileName());
if (!QFile::exists(fileName)) if (!QFile::exists(fileName))
return QVariantMap(); return QVariantMap();
@@ -235,12 +240,35 @@ QVariantMap UserFileAccessor::restoreSettings(Project *project)
QVariantMap map(reader.restoreValues()); QVariantMap map(reader.restoreValues());
// Get and verify file version: // Get and verify file version:
const int fileVersion(map.value(QLatin1String(USER_FILE_VERSION), 0).toInt()); const int fileVersion = map.value(QLatin1String(USER_FILE_VERSION), 0).toInt();
if (fileVersion < m_firstVersion || fileVersion > m_lastVersion + 1) { if (fileVersion < m_firstVersion || fileVersion > m_lastVersion + 1) {
qWarning() << "File version" << fileVersion << "is not supported."; qWarning() << "File version" << fileVersion << "is not supported.";
return QVariantMap(); return QVariantMap();
} }
// Verify hostname
const QString hostname = map.value(QLatin1String(USER_FILE_HOSTNAME)).toString();
if (!hostname.isEmpty() && hostname != QHostInfo::localHostName()) {
// Ask the user
// TODO tr, casing check
QMessageBox msgBox(QMessageBox::Question,
QApplication::translate("ProjectExplorer::UserFileAccessor",
"Project Settings File from a different Host?"),
QApplication::translate("ProjectExplorer::UserFileAccessor",
"Qt Creator has found a .user settings file from a host %1. "
"The hostname for this computer is %2. \n\n"
"The .user settings files contain machine specific settings. "
"They should not be copied to a different environment. \n\n"
"Still load the settigns file?").arg(hostname, QHostInfo::localHostName()),
QMessageBox::Yes | QMessageBox::No,
Core::ICore::instance()->mainWindow());
msgBox.setDefaultButton(QMessageBox::No);
msgBox.setEscapeButton(QMessageBox::No);
int result = msgBox.exec();
if (result == QMessageBox::No)
return QVariantMap();
}
// Do we need to do a update? // Do we need to do a update?
if (fileVersion != m_lastVersion + 1) { if (fileVersion != m_lastVersion + 1) {
map.insert(QLatin1String(WAS_UPDATED), true); map.insert(QLatin1String(WAS_UPDATED), true);
@@ -269,6 +297,7 @@ bool UserFileAccessor::saveSettings(Project *project, const QVariantMap &map)
writer.saveValue(i.key(), i.value()); writer.saveValue(i.key(), i.value());
writer.saveValue(QLatin1String(USER_FILE_VERSION), m_lastVersion + 1); writer.saveValue(QLatin1String(USER_FILE_VERSION), m_lastVersion + 1);
writer.saveValue(QLatin1String(USER_FILE_HOSTNAME), QHostInfo::localHostName());
return writer.save(fileNameFor(project->file()->fileName()), "QtCreatorProject"); return writer.save(fileNameFor(project->file()->fileName()), "QtCreatorProject");
} }