From 0344b728e94e4fb31b5ee3f87c5eb307a0ceed64 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Tue, 22 Jun 2010 10:45:08 +0200
Subject: [PATCH] Store the time stamp if necessary.
---
src/plugins/cppeditor/cpprefactoringchanges.cpp | 16 +++++++++++++++-
src/plugins/cppeditor/cpprefactoringchanges.h | 4 +---
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/plugins/cppeditor/cpprefactoringchanges.cpp b/src/plugins/cppeditor/cpprefactoringchanges.cpp
index 6d6e095e62d..196ce53fd40 100644
--- a/src/plugins/cppeditor/cpprefactoringchanges.cpp
+++ b/src/plugins/cppeditor/cpprefactoringchanges.cpp
@@ -42,6 +42,12 @@ CppRefactoringChanges::CppRefactoringChanges(const Snapshot &snapshot)
m_workingCopy = m_modelManager->workingCopy();
}
+const CPlusPlus::Snapshot &CppRefactoringChanges::snapshot() const
+{
+ return m_snapshot;
+}
+
+
QStringList CppRefactoringChanges::apply()
{
const QStringList changedFiles = TextEditor::RefactoringChanges::apply();
@@ -53,6 +59,8 @@ Document::Ptr CppRefactoringChanges::document(const QString &fileName) const
{
QString source;
unsigned editorRevision = 0;
+ QDateTime lastModified;
+
if (m_workingCopy.contains(fileName)) {
const QPair<QString, unsigned> workingCopy = m_workingCopy.get(fileName);
source = workingCopy.first;
@@ -62,13 +70,19 @@ Document::Ptr CppRefactoringChanges::document(const QString &fileName) const
if (! file.open(QFile::ReadOnly))
return Document::Ptr();
+ lastModified = QFileInfo(file).lastModified();
source = QTextStream(&file).readAll(); // ### FIXME read bytes, and remove the convert below
file.close();
}
const QByteArray contents = m_snapshot.preprocessedCode(source, fileName);
Document::Ptr doc = m_snapshot.documentFromSource(contents, fileName);
- doc->setEditorRevision(editorRevision);
+
+ if (lastModified.isValid())
+ doc->setLastModified(lastModified);
+ else
+ doc->setEditorRevision(editorRevision);
doc->check();
+
return doc;
}
diff --git a/src/plugins/cppeditor/cpprefactoringchanges.h b/src/plugins/cppeditor/cpprefactoringchanges.h
index 9b684772f20..147d9014a1a 100644
--- a/src/plugins/cppeditor/cpprefactoringchanges.h
+++ b/src/plugins/cppeditor/cpprefactoringchanges.h
@@ -46,9 +46,7 @@ public:
virtual QStringList apply();
- const CPlusPlus::Snapshot &snapshot() const
- { return m_snapshot; }
-
+ const CPlusPlus::Snapshot &snapshot() const;
CPlusPlus::Document::Ptr document(const QString &fileName) const;
private:
--
GitLab