1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MSVC2013-compiler warnings with QT_NO_FILESYSTEMWATCHER

Browse Source 
dialogs\qfilesystemmodel.cpp(203,1667,1680): C4189: 'd': local variable is initialized but not referenced
dialogs\qfilesystemmodel.cpp(1547,1720,1847): C4100: 'variable': unreferenced formal parameter

Change-Id: Ic3cef264dcd0b939748bec914eb9c29f86f6ed0e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Jochen Seemann 2014-09-23 21:10:23 +02:00
parent 8f2519660b
commit faefd37db6
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/widgets/dialogs/qfilesystemmodel.cpp
View File

@ -192,8 +192,8 @@ QT_BEGIN_NAMESPACE
bool QFileSystemModel::remove(const QModelIndex &aindex) bool QFileSystemModel::remove(const QModelIndex &aindex)
{ {
const QString path = filePath(aindex); const QString path = filePath(aindex);
QFileSystemModelPrivate * d = const_cast<QFileSystemModelPrivate*>(d_func());
#ifndef QT_NO_FILESYSTEMWATCHER #ifndef QT_NO_FILESYSTEMWATCHER
QFileSystemModelPrivate * d = const_cast<QFileSystemModelPrivate*>(d_func());
d->fileInfoGatherer.removePath(path); d->fileInfoGatherer.removePath(path);
#endif #endif
if (QFileInfo(path).isFile()) if (QFileInfo(path).isFile())
@ -1541,6 +1541,8 @@ void QFileSystemModel::setResolveSymlinks(bool enable)
#ifndef QT_NO_FILESYSTEMWATCHER #ifndef QT_NO_FILESYSTEMWATCHER
Q_D(QFileSystemModel); Q_D(QFileSystemModel);
d->fileInfoGatherer.setResolveSymlinks(enable); d->fileInfoGatherer.setResolveSymlinks(enable);
#else
Q_UNUSED(enable)
#endif #endif
} }
@ -1656,21 +1658,21 @@ QStringList QFileSystemModel::nameFilters() const
*/ */
bool QFileSystemModel::event(QEvent *event) bool QFileSystemModel::event(QEvent *event)
{ {
#ifndef QT_NO_FILESYSTEMWATCHER
Q_D(QFileSystemModel); Q_D(QFileSystemModel);
if (event->type() == QEvent::LanguageChange) { if (event->type() == QEvent::LanguageChange) {
#ifndef QT_NO_FILESYSTEMWATCHER
d->root.retranslateStrings(d->fileInfoGatherer.iconProvider(), QString()); d->root.retranslateStrings(d->fileInfoGatherer.iconProvider(), QString());
#endif
return true; return true;
} }
#endif
return QAbstractItemModel::event(event); return QAbstractItemModel::event(event);
} }
bool QFileSystemModel::rmdir(const QModelIndex &aindex) bool QFileSystemModel::rmdir(const QModelIndex &aindex)
{ {
QString path = filePath(aindex); QString path = filePath(aindex);
QFileSystemModelPrivate * d = const_cast<QFileSystemModelPrivate*>(d_func());
#ifndef QT_NO_FILESYSTEMWATCHER #ifndef QT_NO_FILESYSTEMWATCHER
QFileSystemModelPrivate * d = const_cast<QFileSystemModelPrivate*>(d_func());
d->fileInfoGatherer.removePath(path); d->fileInfoGatherer.removePath(path);
#endif #endif
return QDir().rmdir(path); return QDir().rmdir(path);
@ -1715,6 +1717,8 @@ QFileSystemModelPrivate::QFileSystemNode* QFileSystemModelPrivate::addNode(QFile
QFileSystemModelPrivate::QFileSystemNode *node = new QFileSystemModelPrivate::QFileSystemNode(fileName, parentNode); QFileSystemModelPrivate::QFileSystemNode *node = new QFileSystemModelPrivate::QFileSystemNode(fileName, parentNode);
#ifndef QT_NO_FILESYSTEMWATCHER #ifndef QT_NO_FILESYSTEMWATCHER
node->populate(info); node->populate(info);
#else
Q_UNUSED(info)
#endif #endif
#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT) #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT)
//The parentNode is "" so we are listing the drives //The parentNode is "" so we are listing the drives
@ -1935,6 +1939,9 @@ void QFileSystemModelPrivate::_q_fileSystemChanged(const QString &path, const QL
forceSort = true; forceSort = true;
delayedSort(); delayedSort();
} }
#else
Q_UNUSED(path)
Q_UNUSED(updates)
#endif // !QT_NO_FILESYSTEMWATCHER #endif // !QT_NO_FILESYSTEMWATCHER
} }