diff --git a/src/core/KexiFileFilters.cpp b/src/core/KexiFileFilters.cpp
index 69e7448bc..ddf99e8f6 100644
--- a/src/core/KexiFileFilters.cpp
+++ b/src/core/KexiFileFilters.cpp
@@ -1,326 +1,326 @@
 /* This file is part of the KDE project
    Copyright (C) 2003-2018 Jarosław Staniek <staniek@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
 */
 
 #include "KexiFileFilters.h"
 #include <core/KexiMainWindowIface.h>
 #include <core/KexiMigrateManagerInterface.h>
 
 #include <QMimeDatabase>
 #include <QMimeType>
 #include <QSet>
 
 #include <KDb>
 
 //! @internal
 class Q_DECL_HIDDEN KexiFileFilters::Private
 {
 public:
     Private() {}
 
     QList<QMimeType> mimeTypes() {
         update();
         return m_mimeTypes;
     }
 
     QMimeDatabase db;
     KexiFileFilters::Mode mode = KexiFileFilters::Opening;
     QStringList comments;
     QSet<QString> additionalMimeTypes;
     QSet<QString> excludedMimeTypes;
     QString defaultFilter;
     bool filtersUpdated = false;
 
 private:
     void update()
     {
         if (filtersUpdated) {
             return;
         }
         filtersUpdated = true;
         m_mimeTypes.clear();
 
         if (mode == KexiFileFilters::Opening || mode == KexiFileFilters::SavingFileBasedDB) {
             addMimeType(KDb::defaultFileBasedDriverMimeType());
         }
         if (mode == KexiFileFilters::Opening || mode == KexiFileFilters::SavingServerBasedDB) {
             addMimeType("application/x-kexiproject-shortcut");
         }
         if (mode == KexiFileFilters::Opening || mode == KexiFileFilters::SavingServerBasedDB) {
             addMimeType("application/x-kexi-connectiondata");
         }
 
         if (mode == KexiFileFilters::Opening) {
             const QStringList supportedFileMimeTypes = KexiMainWindowIface::global()->migrateManager()->supportedFileMimeTypes();
             foreach (const QString& supportedFileMimeType, supportedFileMimeTypes) {
                 addMimeType(supportedFileMimeType);
             }
         }
 
         foreach(const QString& mimeName, additionalMimeTypes) {
             if (mimeName == "all/allfiles") {
                 continue; // "All files" is added automatically by KFileWidget and we add it
                           // dynamically for KexiFileRequester
             }
             addMimeType(mimeName);
         }
     }
 
     bool addMimeType(const QString &mimeName)
     {
         const QMimeType mime = db.mimeTypeForName(mimeName);
         if (mime.isValid() && !excludedMimeTypes.contains(mime.name().toLower())) {
             m_mimeTypes += mime;
             return true;
         }
         return false;
     }
     /*! Adds file dialog-compatible filter to @a filter and patterns to @allfilters based on
         @a mimeName mime type name. Does nothing if excludedMimeTypes contains this mime name. */
     //! @todo ?
     /*
     bool addFilterForType(QStringList *allfilters, const QString &mimeName)
     {
         QMimeDatabase db;
         const QMimeType mime = db.mimeTypeForName(mimeName);
         if (mime.isValid() && !excludedMimeTypes.contains(mime.name().toLower())) {
             filters += mime.filterString(); // KexiUtils::fileDialogFilterString(mime);
             *allfilters += mime.globPatterns();
             return true;
         }
         return false;
     }*/
 
     QList<QMimeType> m_mimeTypes;
 };
 
 KexiFileFilters::KexiFileFilters()
  : d(new Private)
 {
 }
 
 KexiFileFilters::~KexiFileFilters()
 {
     delete d;
 }
 
 KexiFileFilters::Mode KexiFileFilters::mode() const
 {
     return d->mode;
 }
 
 void KexiFileFilters::setMode(Mode mode)
 {
     d->mode = mode;
     d->filtersUpdated = false;
 }
 
 void KexiFileFilters::setDefaultFilter(const QString &filter)
 {
     d->defaultFilter = filter;
 }
 
 QString KexiFileFilters::defaultFilter() const
 {
     return d->defaultFilter;
 }
 
 QStringList KexiFileFilters::additionalMimeTypes() const
 {
     return d->additionalMimeTypes.toList();
 }
 
 void KexiFileFilters::setAdditionalMimeTypes(const QStringList &mimeTypes)
 {
     //delayed
     d->additionalMimeTypes = mimeTypes.toSet();
     d->filtersUpdated = false;
 }
 
 QStringList KexiFileFilters::excludedMimeTypes() const
 {
     return d->excludedMimeTypes.toList();
 }
 
 void KexiFileFilters::setExcludedMimeTypes(const QStringList &mimeTypes)
 {
     //delayed
     d->excludedMimeTypes.clear();
     //convert to lowercase
     for(const QString& mimeType : mimeTypes) {
         d->excludedMimeTypes.insert(mimeType.toLower());
     }
     d->filtersUpdated = false;
 }
 
 static QStringList globPatterns(const QMimeType &mimeType)
 {
     QStringList result = mimeType.globPatterns();
     //! @todo Improve if possible.
     //!       This is a hack to remove misleading filter, QFileSystemModel can't check by content.
     if (mimeType.name() == QStringLiteral("text/plain")) {
         result.removeOne(QStringLiteral("*.doc"));
     }
     return result;
 }
 
 QStringList KexiFileFilters::allGlobPatterns() const
 {
     QStringList result;
     for(const QMimeType &mimeType : d->mimeTypes()) {
         result += globPatterns(mimeType);
     }
     //remove duplicates made because upper- and lower-case extensions are used:
     result = result.toSet().toList();
     std::sort(result.begin(), result.end());
     return result;
 }
 
 QList<QMimeType> KexiFileFilters::mimeTypes() const
 {
     return d->mimeTypes();
 }
 
 QStringList KexiFileFilters::mimeTypeNames() const
 {
     QStringList result;
     for (const QMimeType &mimeType : d->mimeTypes()) {
         result += mimeType.name();
     }
     return result;
 }
 
 bool KexiFileFilters::isExistingFileRequired() const
 {
     switch (mode()) {
     case Opening:
         return true;
     case CustomOpening:
         return true;
     default:
         return false;
     }
 }
 
 //static
 QString KexiFileFilters::separator(const KexiFileFiltersFormat &format)
 {
     return format.type == KexiFileFiltersFormat::Type::Qt ? QStringLiteral(";;")
                                                           : QStringLiteral("\n");
 }
 
 QStringList KexiFileFilters::toList(const KexiFileFiltersFormat &format) const
 {
     QStringList result;
     QStringList allPatterns;
     for(const QMimeType &mimeType : d->mimeTypes()) {
         result += KexiFileFilters::toString(mimeType, format);
     }
 
     if (!d->defaultFilter.isEmpty() && !d->excludedMimeTypes.contains("all/allfiles")) {
         result += d->defaultFilter;
     }
 
     const QStringList allGlobPatterns(this->allGlobPatterns());
     if (allGlobPatterns.count() > 1) {//prepend "all supoported files" entry
         result.prepend(KexiFileFilters::toString(allGlobPatterns,
             xi18n("All Supported Files"), format));
     }
 
     if (format.addAllFiles) {
         result.append(KexiFileFilters::toString({ QStringLiteral("*") }, xi18n("All Files"), format));
     }
     return result;
 }
 
 QString KexiFileFilters::toString(const KexiFileFiltersFormat &format) const
 {
     return toList(format).join(KexiFileFilters::separator(format));
 }
 
 //static
 QString KexiFileFilters::toString(const QStringList &patterns, const QString &comment,
                                   const KexiFileFiltersFormat &format)
 {
     QString str;
     if (format.type == KexiFileFiltersFormat::Type::KDE
         || format.type == KexiFileFiltersFormat::Type::KUrlRequester)
     {
         str += patterns.join(QStringLiteral(" ")) + QStringLiteral("|");
     }
     str += comment;
     if (format.type == KexiFileFiltersFormat::Type::Qt
         || format.type == KexiFileFiltersFormat::Type::KDE)
     {
         str += QStringLiteral(" (");
         if (patterns.isEmpty()) {
             str += QStringLiteral("*");
         } else {
 #ifdef Q_OS_WIN
-            str += patterns.join(format == KexiFileFiltersFormat::Type::Qt ? " " : ";");
+            str += patterns.join(format.type == KexiFileFiltersFormat::Type::Qt ? " " : ";");
 #else
             str += QLocale().createSeparatedList(patterns);
 #endif
             str += ")";
         }
     }
     return str;
 }
 
 //static
 QString KexiFileFilters::toString(const QMimeType &mime, const KexiFileFiltersFormat &format)
 {
     if (!mime.isValid()) {
         return QString();
     }
 
     if (format.type == KexiFileFiltersFormat::Type::Qt) {
         return mime.filterString();
     }
 
     QString str;
     QStringList patterns(globPatterns(mime));
     if (patterns.isEmpty()) {
         patterns += QStringLiteral("*");
     }
     return toString(patterns, mime.comment(), format);
 }
 
 //static
 QString KexiFileFilters::toString(const QString& mimeName, const KexiFileFiltersFormat &format)
 {
     QMimeDatabase db;
     return KexiFileFilters::toString(db.mimeTypeForName(mimeName), format);
 }
 
 // static
 QStringList KexiFileFilters::toList(const QStringList &mimeNames,
                                     const KexiFileFiltersFormat &format)
 {
     QStringList result;
     for(const QString &mimeName : mimeNames) {
         result += KexiFileFilters::toString(mimeName, format);
     }
     return result;
 }
 
 //static
 QString KexiFileFilters::toString(const QStringList& mimeNames, const KexiFileFiltersFormat &format)
 {
     return KexiFileFilters::toList(mimeNames, format).join(KexiFileFilters::separator(format));
 }