From a97ee8695ae23bd6c3fd920e7b027313911363d5 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 22 Jun 2016 22:12:03 +0000 Subject: [PATCH] various cleanups upstream commits: https://github.com/qt/qtbase/commit/94519a441cf1ea77f1422c44a7ef8ec15171ad04 Signed-off-by: Ivailo Monev --- src/gui/dialogs/qfileinfogatherer.cpp | 3 ++- src/gui/dialogs/qfilesystemmodel.cpp | 8 ++++---- src/gui/dialogs/qfilesystemmodel.h | 4 ++-- src/gui/dialogs/qfilesystemmodel_p.h | 1 - src/gui/image/qpixmapcache.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/gui/dialogs/qfileinfogatherer.cpp b/src/gui/dialogs/qfileinfogatherer.cpp index f2654b623..16f87fcdd 100644 --- a/src/gui/dialogs/qfileinfogatherer.cpp +++ b/src/gui/dialogs/qfileinfogatherer.cpp @@ -106,10 +106,11 @@ QFileInfoGatherer::~QFileInfoGatherer() void QFileInfoGatherer::setResolveSymlinks(bool enable) { - Q_UNUSED(enable); #ifdef Q_OS_WIN QMutexLocker locker(&mutex); m_resolveSymlinks = enable; +#else + Q_UNUSED(enable); #endif } diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp index 095509f55..d6477c6e9 100644 --- a/src/gui/dialogs/qfilesystemmodel.cpp +++ b/src/gui/dialogs/qfilesystemmodel.cpp @@ -196,11 +196,11 @@ QT_BEGIN_NAMESPACE \sa rmdir() */ -bool QFileSystemModel::remove(const QModelIndex &aindex) const +bool QFileSystemModel::remove(const QModelIndex &aindex) { + Q_D(QFileSystemModel); //### TODO optim QString path = filePath(aindex); - QFileSystemModelPrivate * d = const_cast(d_func()); d->fileInfoGatherer.removePath(path); QDirIterator it(path, QDir::AllDirs | QDir:: Files | QDir::NoDotAndDotDot, @@ -1635,10 +1635,10 @@ bool QFileSystemModel::event(QEvent *event) return QAbstractItemModel::event(event); } -bool QFileSystemModel::rmdir(const QModelIndex &aindex) const +bool QFileSystemModel::rmdir(const QModelIndex &aindex) { + Q_D(QFileSystemModel); QString path = filePath(aindex); - QFileSystemModelPrivate * d = const_cast(d_func()); d->fileInfoGatherer.removePath(path); return QDir().rmdir(path); } diff --git a/src/gui/dialogs/qfilesystemmodel.h b/src/gui/dialogs/qfilesystemmodel.h index 1291b4bcb..3b1a328e2 100644 --- a/src/gui/dialogs/qfilesystemmodel.h +++ b/src/gui/dialogs/qfilesystemmodel.h @@ -138,12 +138,12 @@ public: QDateTime lastModified(const QModelIndex &index) const; QModelIndex mkdir(const QModelIndex &parent, const QString &name); - bool rmdir(const QModelIndex &index) const; // ### Qt5: should not be const + bool rmdir(const QModelIndex &index); inline QString fileName(const QModelIndex &index) const; inline QIcon fileIcon(const QModelIndex &index) const; QFile::Permissions permissions(const QModelIndex &index) const; inline QFileInfo fileInfo(const QModelIndex &index) const; - bool remove(const QModelIndex &index) const; + bool remove(const QModelIndex &index); protected: QFileSystemModel(QFileSystemModelPrivate &, QObject *parent = 0); diff --git a/src/gui/dialogs/qfilesystemmodel_p.h b/src/gui/dialogs/qfilesystemmodel_p.h index d129962d3..5a0a52989 100644 --- a/src/gui/dialogs/qfilesystemmodel_p.h +++ b/src/gui/dialogs/qfilesystemmodel_p.h @@ -64,7 +64,6 @@ #include #include #include -#include #include #include #include diff --git a/src/gui/image/qpixmapcache.h b/src/gui/image/qpixmapcache.h index 5a6295900..f71f15971 100644 --- a/src/gui/image/qpixmapcache.h +++ b/src/gui/image/qpixmapcache.h @@ -77,10 +77,10 @@ public: static int cacheLimit(); static void setCacheLimit(int); static QPixmap *find(const QString &key); + static bool find(const QString &key, QPixmap *pixmap); // ### get rid of this function static inline bool find(const QString &key, QPixmap &pixmap) { return find(key, &pixmap); }; - static bool find(const QString &key, QPixmap *pixmap); static bool find(const Key &key, QPixmap *pixmap); static bool insert(const QString &key, const QPixmap &pixmap); static Key insert(const QPixmap &pixmap); -- 2.11.0