D21249: Test current filter before setting a new one

[Nathaniel Graham]

ngraham requested changes to this revision.
ngraham added a comment.
This revision now requires changes to proceed.


  Actually looks like we've got compilation errors now:
  
    /home/dev/kde/src/kio/src/filewidgets/kfilewidget.cpp:2456:9: error: prototype for ‘QString KFileWidgetPrivate::findMatchingFilter(const QString&, const QString&) const’ does not match any in class ‘KFileWidgetPrivate’
     QString KFileWidgetPrivate::findMatchingFilter(const QString &filter, const QString &filename) const
             ^~~~~~~~~~~~~~~~~~
    /home/dev/kde/src/kio/src/filewidgets/kfilewidget.cpp:132:10: error: candidate is: bool KFileWidgetPrivate::findMatchingFilter(const QString&, const QString&) const
         bool findMatchingFilter(const QString &filter, const QString &filename) const;
              ^~~~~~~~~~~~~~~~~~
    /home/dev/kde/src/kio/src/filewidgets/kfilewidget.cpp: In member function ‘void KFileWidgetPrivate::updateFilter()’:
    /home/dev/kde/src/kio/src/filewidgets/kfilewidget.cpp:2493:78: error: request for member ‘isEmpty’ in ‘((KFileWidgetPrivate*)this)->KFileWidgetPrivate::findMatchingFilter(KFileFilterCombo::currentFilter() const(), filename)’, which is of non-class type ‘bool’
                 if (!findMatchingFilter(filterWidget->currentFilter(), filename).isEmpty()) {
                                                                                  ^~~~~~~
    /home/dev/kde/src/kio/src/filewidgets/kfilewidget.cpp:2497:51: error: conversion from ‘bool’ to non-scalar type ‘QString’ requested
                     QString match = findMatchingFilter(filter, filename);
                                     ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~
    src/filewidgets/CMakeFiles/KF5KIOFileWidgets.dir/build.make:413: recipe for target 'src/filewidgets/CMakeFiles/KF5KIOFileWidgets.dir/kfilewidget.cpp.o' failed

REPOSITORY
  R241 KIO

REVISION DETAIL
  https://phabricator.kde.org/D21249

To: jglogowski, #frameworks, ngraham, dfaure
Cc: elvisangelaccio, ngraham, michaelweghorn, kde-frameworks-devel, michaelh, bruns
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20190521/8bd5b2de/attachment.html>