diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-06-19 08:37:21 +0300 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2013-06-19 11:05:23 +0200 |
commit | 5c900d205d2c1a9b4bd288da432adcf4b6941c1b (patch) | |
tree | 3d9c4e331bacd747381ac33ef959e739649aaf42 /src/plugins/coreplugin | |
parent | 91d8ecbd605b239e917e197b502a90057507569d (diff) | |
download | qt-creator-5c900d205d2c1a9b4bd288da432adcf4b6941c1b.tar.gz |
Revert "DocumentManager: Support expect/unexpect directory changes"
Doesn't work
This reverts commit f6ec8c334258dd04306c20a7db6ae357fa261209.
Change-Id: I84ecb956bd8ad2358228e11630e95ac03c903c21
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/coreplugin')
-rw-r--r-- | src/plugins/coreplugin/documentmanager.cpp | 55 | ||||
-rw-r--r-- | src/plugins/coreplugin/documentmanager.h | 4 |
2 files changed, 2 insertions, 57 deletions
diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp index 0362853598..540e2fa7d2 100644 --- a/src/plugins/coreplugin/documentmanager.cpp +++ b/src/plugins/coreplugin/documentmanager.cpp @@ -52,7 +52,6 @@ #include <QFile> #include <QFileInfo> #include <QFileSystemWatcher> -#include <QSet> #include <QSettings> #include <QTimer> #include <QAction> @@ -157,7 +156,6 @@ struct DocumentManagerPrivate QString m_projectsDirectory; bool m_useProjectsDirectory; QString m_buildDirectory; - QSet<QString> m_expectedDirectories; // When we are callling into a IDocument // we don't want to receive a changed() // signal @@ -549,46 +547,6 @@ void DocumentManager::unexpectFileChange(const QString &fileName) updateExpectedState(fixedResolvedName); } -static QString dirWithTrailingSlash(const QString &directory) -{ - static const QChar slash(QLatin1Char('/')); - return directory.endsWith(slash) ? directory : directory + slash; -} - -/*! - * Any subsequent change to any file inside \a directory is treated as - * an expected file change. - * - * \see DocumentManager::unexpectDirectoryChange(const QString &directory) - */ -void DocumentManager::expectDirectoryChange(const QString &directory) -{ - QTC_ASSERT(!directory.isEmpty(), return); - d->m_expectedDirectories.insert(dirWithTrailingSlash(directory)); -} - -/*! - * Any subsequent change to any file inside \a directory is unexpected again. - * - * \see DocumentManager::expectDirectoryChange(const QString &directory) - */ -void DocumentManager::unexpectDirectoryChange(const QString &directory) -{ - QTimer *timer = new QTimer; - timer->setProperty("directory", QString(dirWithTrailingSlash(directory))); - connect(timer, SIGNAL(timeout()), instance(), SLOT(clearExpectedDirectory())); - timer->setSingleShot(true); - timer->start(300); -} - - -void DocumentManager::clearExpectedDirectory() -{ - if (QTimer *timer = qobject_cast<QTimer *>(sender())) { - d->m_expectedDirectories.remove(timer->property("directory").toString()); - timer->deleteLater(); - } -} /*! Tries to save the files listed in \a documents. The \a cancelled argument is set to true @@ -945,18 +903,9 @@ void DocumentManager::checkForReload() continue; // was the change unexpected? - if ((currentState.modified != expectedState.modified - || currentState.permissions != expectedState.permissions) + if ((currentState.modified != expectedState.modified || currentState.permissions != expectedState.permissions) && !expectedFileNames.contains(fileName)) { - bool expectedDir = false; - foreach (const QString &expectedDirectory, d->m_expectedDirectories) { - if (fileName.startsWith(expectedDirectory)) { - expectedDir = true; - break; - } - } - if (!expectedDir) - trigger = IDocument::TriggerExternal; + trigger = IDocument::TriggerExternal; } // find out the type diff --git a/src/plugins/coreplugin/documentmanager.h b/src/plugins/coreplugin/documentmanager.h index 2eef97b8e4..7f294244be 100644 --- a/src/plugins/coreplugin/documentmanager.h +++ b/src/plugins/coreplugin/documentmanager.h @@ -74,9 +74,6 @@ public: static void expectFileChange(const QString &fileName); static void unexpectFileChange(const QString &fileName); - static void expectDirectoryChange(const QString &directory); - static void unexpectDirectoryChange(const QString &directory); - // recent files static void addToRecentFiles(const QString &fileName, const Id &editorId = Id()); Q_SLOT void clearRecentFiles(); @@ -153,7 +150,6 @@ private slots: void changedFile(const QString &file); void mainWindowActivated(); void syncWithEditor(const QList<Core::IContext *> &context); - void clearExpectedDirectory(); }; /*! The FileChangeBlocker blocks all change notifications to all IDocument * that |