Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix some more breakage caused by [a05b4d4]. Calling QDir::setFilter()…
… with a negative filter overwrites the default positive filters of QDir::Files | QDir::Dirs.
  • Loading branch information
stuartm authored and jyavenard committed Mar 8, 2013
1 parent 7d2ad07 commit d67c4ed
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
6 changes: 3 additions & 3 deletions mythplugins/mythgallery/mythgallery/galleryutil.cpp
Expand Up @@ -584,7 +584,7 @@ bool GalleryUtil::CopyDirectory(const QFileInfo src, QFileInfo &dst)

bool ok = true;
QDir dstDir(dst.absoluteFilePath());
srcDir.setFilter(QDir::NoDotAndDotDot);
srcDir.setFilter(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
QFileInfoList list = srcDir.entryInfoList();
QFileInfoList::const_iterator it = list.begin();
for (; it != list.end(); ++it)
Expand Down Expand Up @@ -613,7 +613,7 @@ bool GalleryUtil::MoveDirectory(const QFileInfo src, QFileInfo &dst)

bool ok = true;
QDir dstDir(dst.absoluteFilePath());
srcDir.setFilter(QDir::NoDotAndDotDot);
srcDir.setFilter(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
QFileInfoList list = srcDir.entryInfoList();
QFileInfoList::const_iterator it = list.begin();
for (; it != list.end(); ++it)
Expand All @@ -632,7 +632,7 @@ bool GalleryUtil::DeleteDirectory(const QFileInfo &dir)
return false;

QDir srcDir(dir.absoluteFilePath());
srcDir.setFilter(QDir::NoDotAndDotDot);
srcDir.setFilter(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
QFileInfoList list = srcDir.entryInfoList();
QFileInfoList::const_iterator it = list.begin();
for (; it != list.end(); ++it)
Expand Down
4 changes: 2 additions & 2 deletions mythplugins/mythgame/mythgame/gamehandler.cpp
Expand Up @@ -561,7 +561,7 @@ int GameHandler::buildFileCount(QString directory, GameHandler *handler)
if (!RomDir.isReadable())
return 0;

RomDir.setFilter(QDir::NoDotAndDotDot);
RomDir.setFilter(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
QFileInfoList List = RomDir.entryInfoList();
for (QFileInfoList::const_iterator it = List.begin();
it != List.end(); ++it)
Expand Down Expand Up @@ -628,7 +628,7 @@ void GameHandler::buildFileList(QString directory, GameHandler *handler,
return;

RomDir.setSorting( QDir:: DirsFirst | QDir::Name );
RomDir.setFilter(QDir::NoDotAndDotDot);
RomDir.setFilter(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
QFileInfoList List = RomDir.entryInfoList();
for (QFileInfoList::const_iterator it = List.begin();
it != List.end(); ++it)
Expand Down
2 changes: 1 addition & 1 deletion mythplugins/mythmusic/mythmusic/filescanner.cpp
Expand Up @@ -87,7 +87,7 @@ void FileScanner::BuildFileList(QString &directory, MusicLoadedMap &music_files,
if (!d.exists())
return;

d.setFilter(QDir::NoDotAndDotDot);
d.setFilter(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
QFileInfoList list = d.entryInfoList();
if (list.isEmpty())
return;
Expand Down
3 changes: 2 additions & 1 deletion mythplugins/mythmusic/mythmusic/importmusic.cpp
Expand Up @@ -554,7 +554,7 @@ void ImportMusicDialog::scanDirectory(QString &directory, vector<TrackInfo*> *tr
if (!d.exists())
return;

d.setFilter(QDir::NoDotAndDotDot);
d.setFilter(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
const QFileInfoList list = d.entryInfoList();
if (list.isEmpty())
return;
Expand Down Expand Up @@ -1028,6 +1028,7 @@ void ImportCoverArtDialog::scanDirectory()
"*.png;*.jpg;*.jpeg;*.gif;*.bmp");

QFileInfoList list = d.entryInfoList(nameFilter.split(";"),
QDir::Files | QDir::Dirs |
QDir::NoDotAndDotDot);
if (list.isEmpty())
return;
Expand Down

0 comments on commit d67c4ed

Please sign in to comment.