diff --git a/src/plugins/genericprojectmanager/filesselectionwizardpage.cpp b/src/plugins/genericprojectmanager/filesselectionwizardpage.cpp index 8c9702bba47..c028b6a7899 100644 --- a/src/plugins/genericprojectmanager/filesselectionwizardpage.cpp +++ b/src/plugins/genericprojectmanager/filesselectionwizardpage.cpp @@ -55,8 +55,8 @@ FilesSelectionWizardPage::FilesSelectionWizardPage(GenericProjectWizardDialog *g hbox->addWidget(m_filterLabel); m_filterLineEdit = new QLineEdit; - const QString filter = Core::ICore::settings()->value(Constants::FILEFILTER_SETTING, - Constants::FILEFILTER_DEFAULT).toString(); + const QString filter = Core::ICore::settings()->value(QLatin1String(Constants::FILEFILTER_SETTING), + QLatin1String(Constants::FILEFILTER_DEFAULT)).toString(); m_filterLineEdit->setText(filter); m_filterLineEdit->hide(); hbox->addWidget(m_filterLineEdit); @@ -140,7 +140,7 @@ QStringList FilesSelectionWizardPage::selectedFiles() const void FilesSelectionWizardPage::applyFilter() { const QString filter = m_filterLineEdit->text(); - Core::ICore::settings()->setValue(Constants::FILEFILTER_SETTING, filter); + Core::ICore::settings()->setValue(QLatin1String(Constants::FILEFILTER_SETTING), filter); m_model->applyFilter(filter); } diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 16e8e8785f5..c518131f7a4 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -479,7 +479,7 @@ QString GenericProjectFile::suggestedFileName() const QString GenericProjectFile::mimeType() const { - return Constants::GENERICMIMETYPE; + return QLatin1String(Constants::GENERICMIMETYPE); } bool GenericProjectFile::isModified() const diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.pro b/src/plugins/genericprojectmanager/genericprojectmanager.pro index 02c60f9540e..e40e1e7fcc7 100644 --- a/src/plugins/genericprojectmanager/genericprojectmanager.pro +++ b/src/plugins/genericprojectmanager/genericprojectmanager.pro @@ -2,6 +2,9 @@ TEMPLATE = lib TARGET = GenericProjectManager include(../../qtcreatorplugin.pri) include(genericprojectmanager_dependencies.pri) + +DEFINES += QT_NO_CAST_FROM_ASCII + HEADERS = genericproject.h \ genericprojectplugin.h \ genericprojectmanager.h \ diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.qbs b/src/plugins/genericprojectmanager/genericprojectmanager.qbs index 8a47a547cbc..c574e523e41 100644 --- a/src/plugins/genericprojectmanager/genericprojectmanager.qbs +++ b/src/plugins/genericprojectmanager/genericprojectmanager.qbs @@ -5,6 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin QtcPlugin { name: "GenericProjectManager" + Depends { name: "cpp" } Depends { name: "Qt.widgets" } Depends { name: "Core" } Depends { name: "CPlusPlus" } @@ -14,6 +15,7 @@ QtcPlugin { Depends { name: "Find" } Depends { name: "Locator" } Depends { name: "QtSupport" } + cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"]) files: [ "filesselectionwizardpage.cpp", diff --git a/src/plugins/genericprojectmanager/selectablefilesmodel.cpp b/src/plugins/genericprojectmanager/selectablefilesmodel.cpp index 14adc3d90f3..8b47de535dc 100644 --- a/src/plugins/genericprojectmanager/selectablefilesmodel.cpp +++ b/src/plugins/genericprojectmanager/selectablefilesmodel.cpp @@ -49,7 +49,7 @@ SelectableFilesModel::SelectableFilesModel(const QString &baseDir, QObject *pare { // Dummy tree m_root = new Tree; - m_root->name = "/"; + m_root->name = QLatin1String("/"); m_root->parent = 0; m_root->fullPath = m_baseDir; m_root->isDir = true; @@ -59,7 +59,7 @@ void SelectableFilesModel::setInitialMarkedFiles(const QStringList &files) { m_files = files.toSet(); m_outOfBaseDirFiles.clear(); - QString base = m_baseDir + '/'; + QString base = m_baseDir + QLatin1Char('/'); foreach (const QString &file, m_files) if (!file.startsWith(base)) m_outOfBaseDirFiles.append(file); @@ -75,7 +75,7 @@ void SelectableFilesModel::startParsing() { // Build a tree in a future m_rootForFuture = new Tree; - m_rootForFuture->name = "/"; + m_rootForFuture->name = QLatin1String("/"); m_rootForFuture->parent = 0; m_rootForFuture->fullPath = m_baseDir; m_rootForFuture->isDir = true; @@ -361,14 +361,15 @@ void SelectableFilesModel::collectFiles(Tree *root, QStringList *result) const QList SelectableFilesModel::parseFilter(const QString &filter) { QList result; - QStringList list = filter.split(';', QString::SkipEmptyParts); + QStringList list = filter.split(QLatin1Char(';'), QString::SkipEmptyParts); foreach (const QString &e, list) { QString entry = e.trimmed(); Glob g; - if (entry.indexOf('*') == -1 && entry.indexOf('?') == -1) { + if (entry.indexOf(QLatin1Char('*')) == -1 && entry.indexOf(QLatin1Char('?')) == -1) { g.mode = Glob::EXACT; g.matchString = entry; - } else if (entry.startsWith('*') && entry.indexOf('*', 1) == -1 && entry.indexOf('?', 1) == -1) { + } else if (entry.startsWith(QLatin1Char('*')) && entry.indexOf(QLatin1Char('*'), 1) == -1 + && entry.indexOf(QLatin1Char('?'), 1) == -1) { g.mode = Glob::ENDSWITH; g.matchString = entry.mid(1); } else { @@ -518,8 +519,8 @@ SelectableFilesDialog::SelectableFilesDialog(const QString &path, const QStringL hbox->addWidget(m_filterLabel); m_filterLineEdit = new QLineEdit(this); - const QString filter = Core::ICore::settings()->value(Constants::FILEFILTER_SETTING, - Constants::FILEFILTER_DEFAULT).toString(); + const QString filter = Core::ICore::settings()->value(QLatin1String(Constants::FILEFILTER_SETTING), + QLatin1String(Constants::FILEFILTER_DEFAULT)).toString(); m_filterLineEdit->setText(filter); m_filterLineEdit->hide(); hbox->addWidget(m_filterLineEdit); @@ -610,7 +611,7 @@ QStringList SelectableFilesDialog::selectedFiles() const void SelectableFilesDialog::applyFilter() { const QString filter = m_filterLineEdit->text(); - Core::ICore::settings()->setValue(Constants::FILEFILTER_SETTING, filter); + Core::ICore::settings()->setValue(QLatin1String(Constants::FILEFILTER_SETTING), filter); m_selectableFilesModel->applyFilter(filter); }