diff options
author | João Abecasis <joao@trolltech.com> | 2010-02-02 19:34:23 (GMT) |
---|---|---|
committer | João Abecasis <joao@trolltech.com> | 2010-02-03 14:16:21 (GMT) |
commit | 14054a47230d41063a10ce8fbf7dc65c916163d7 (patch) | |
tree | 50cd404468e90d072bfbad3c6e6a88259318ed6f /tests/shared | |
parent | 63f66fb0008f93638de782b03f53e9777a941ab7 (diff) | |
download | Qt-14054a47230d41063a10ce8fbf7dc65c916163d7.zip Qt-14054a47230d41063a10ce8fbf7dc65c916163d7.tar.gz Qt-14054a47230d41063a10ce8fbf7dc65c916163d7.tar.bz2 |
QDir fix issues with (shared) cached lists
With 2964718224c0ed356511335742368d4fc421c6bd, QDir started really using
the cached file lists. However, these were not being properly updated on
setNameFilters, setFilter and setSorting.
QDir::refresh, on the other hand, would invalidate the lists without
first detaching, thus breaking the copy-on-write promise.
Summarizing, shared data must be detached and cached lists invalidated,
so they get regenerated.
Reviewed-by: Olivier Goffart
Reviewed-by: Ritt Konstantin
Diffstat (limited to 'tests/shared')
-rw-r--r-- | tests/shared/filesystem.h | 97 |
1 files changed, 97 insertions, 0 deletions
diff --git a/tests/shared/filesystem.h b/tests/shared/filesystem.h new file mode 100644 index 0000000..2d46c0d --- /dev/null +++ b/tests/shared/filesystem.h @@ -0,0 +1,97 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +// Helper functions for creating file-system hierarchies and cleaning up. + +#ifndef QT_TESTS_SHARED_FILESYSTEM_H_INCLUDED +#define QT_TESTS_SHARED_FILESYSTEM_H_INCLUDED + +#include <QString> +#include <QStringList> +#include <QDir> +#include <QFile> + +struct FileSystem +{ + ~FileSystem() + { + Q_FOREACH(QString fileName, createdFiles) + QFile::remove(fileName); + + Q_FOREACH(QString dirName, createdDirectories) + currentDir.rmdir(dirName); + } + + bool createDirectory(const QString &dirName) + { + if (currentDir.mkdir(dirName)) { + createdDirectories.prepend(dirName); + return true; + } + return false; + } + + bool createFile(const QString &fileName) + { + QFile file(fileName); + if (file.open(QIODevice::WriteOnly)) { + createdFiles << fileName; + return true; + } + return false; + } + + bool createLink(const QString &destination, const QString &linkName) + { + if (QFile::link(destination, linkName)) { + createdFiles << linkName; + return true; + } + return false; + } + +private: + QDir currentDir; + + QStringList createdDirectories; + QStringList createdFiles; +}; + +#endif // include guard |