diff --git a/src/plugins/beautifier/abstractsettings.cpp b/src/plugins/beautifier/abstractsettings.cpp index 75d2bc049d3e8d87adaaad49d0f9cf670bdc1016..d2294f4e9383280193f3121ff6e48d62fd0cba02 100644 --- a/src/plugins/beautifier/abstractsettings.cpp +++ b/src/plugins/beautifier/abstractsettings.cpp @@ -65,7 +65,11 @@ QStringList AbstractSettings::completerWords() QStringList AbstractSettings::styles() const { QStringList list = m_styles.keys(); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) list.sort(Qt::CaseInsensitive); +#else //QT_VERSION_CHECK(5, 0, 0) + list.sort(); +#endif // QT_VERSION_CHECK(5, 0, 0) return list; } diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp index 7ee6c50d859161fb49ec0c6b0323c11d31976671..e640c7ad1756f9434cf416a7110618417c32ecc8 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp @@ -39,6 +39,7 @@ #include <QFile> #include <QFileInfo> #include <QProcess> +#include <QTextDocument> // Qt::escape() in Qt 4 #include <QXmlStreamWriter> namespace Beautifier { @@ -164,7 +165,7 @@ void ArtisticStyleSettings::createDocumentationFile() const const QString text = QLatin1String("<p><span class=\"option\">") + keys.filter(QRegExp(QLatin1String("^\\-"))).join(QLatin1String(", ")) + QLatin1String("</span></p><p>") - + Qt::escape(docu.join(QLatin1Char(' '))) + + Qt::escape(docu.join(QLatin1String(" "))) + QLatin1String("</p>"); stream.writeTextElement(QLatin1String(Constants::DOCUMENTATION_XMLDOC), text); stream.writeEndElement(); diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp index abf8e16b38e7c1baef7fe5fc2af99b836d7867d8..0f3363b2fa9a536ba5905f6d97fc48e00fe25a3e 100644 --- a/src/plugins/beautifier/beautifierplugin.cpp +++ b/src/plugins/beautifier/beautifierplugin.cpp @@ -135,14 +135,15 @@ QString BeautifierPlugin::format(const QString &text, QStringList command, const // Format temporary file QProcess process; command.replaceInStrings(QLatin1String("%file"), sourceFile.fileName()); - process.start(command.takeFirst(), command); + const QString processProgram = command.takeFirst(); + process.start(processProgram, command); if (!process.waitForFinished()) { - showError(tr("Failed to call %1 or an error occurred.").arg(process.program())); + showError(tr("Failed to call %1 or an error occurred.").arg(processProgram)); return QString(); } const QByteArray output = process.readAllStandardError(); if (!output.isEmpty()) - showError(process.program() + QLatin1String(": ") + QString::fromLocal8Bit(output)); + showError(processProgram + QLatin1String(": ") + QString::fromLocal8Bit(output)); // Read text back Utils::FileReader reader; diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp index b8ea14477bd66b365f8a2dbd9cd625cbc65933f8..62544a80755bcc451b4051f6efaeb561ff1e1f6d 100644 --- a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp +++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp @@ -80,7 +80,9 @@ QString ClangFormatOptionsPageWidget::searchKeywords() const void ClangFormatOptionsPageWidget::restore() { ui->command->setPath(m_settings->command()); - ui->predefinedStyle->setCurrentText(m_settings->predefinedStyle()); + int textIndex = ui->predefinedStyle->findText(m_settings->predefinedStyle()); + if (textIndex != -1) + ui->predefinedStyle->setCurrentIndex(textIndex); ui->formatEntireFileFallback->setChecked(m_settings->formatEntireFileFallback()); ui->configurations->setSettings(m_settings); ui->configurations->setCurrentConfiguration(m_settings->customStyle()); diff --git a/src/plugins/beautifier/configurationeditor.cpp b/src/plugins/beautifier/configurationeditor.cpp index 0fdbeaa38845c29ae7f64089b8c0241b904bab85..eb3890fdf14e235d28482d23c60a43a718d2ae21 100644 --- a/src/plugins/beautifier/configurationeditor.cpp +++ b/src/plugins/beautifier/configurationeditor.cpp @@ -63,7 +63,7 @@ void ConfigurationSyntaxHighlighter::setKeywords(const QStringList &keywords) for (int i = 0, total = keywords.count(); i < total; ++i) pattern << QRegExp::escape(keywords.at(i)); - m_expressionKeyword.setPattern(QLatin1String("(?:\\s|^)(") + pattern.join(QLatin1Char('|')) + m_expressionKeyword.setPattern(QLatin1String("(?:\\s|^)(") + pattern.join(QLatin1String("|")) + QLatin1String(")(?=\\s|\\:|\\=|\\,|$)")); } @@ -120,7 +120,11 @@ void ConfigurationEditor::setSettings(AbstractSettings *settings) QStringList keywords = m_settings->options(); m_highlighter->setKeywords(keywords); keywords << m_settings->completerWords(); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) keywords.sort(Qt::CaseInsensitive); +#else //QT_VERSION_CHECK(5, 0, 0) + keywords.sort(); +#endif //QT_VERSION_CHECK(5, 0, 0) m_model->setStringList(keywords); } diff --git a/src/plugins/beautifier/configurationpanel.cpp b/src/plugins/beautifier/configurationpanel.cpp index 01d246d9f9b7fd76391c233254cf1a9b5e2e80cc..e127f8bdb2e8f5e971f220b922908e099b8c3948 100644 --- a/src/plugins/beautifier/configurationpanel.cpp +++ b/src/plugins/beautifier/configurationpanel.cpp @@ -63,7 +63,9 @@ void ConfigurationPanel::setSettings(AbstractSettings *settings) void ConfigurationPanel::setCurrentConfiguration(const QString &text) { - ui->configurations->setCurrentText(text); + int textIndex = ui->configurations->findText(text); + if (textIndex != -1) + ui->configurations->setCurrentIndex(textIndex); } QString ConfigurationPanel::currentConfiguration() const @@ -113,7 +115,9 @@ void ConfigurationPanel::populateConfigurations(const QString &key) const QString currentText = (!key.isEmpty()) ? key : ui->configurations->currentText(); ui->configurations->clear(); ui->configurations->addItems(m_settings->styles()); - ui->configurations->setCurrentText(currentText); + int textIndex = ui->configurations->findText(currentText); + if (textIndex != -1) + ui->configurations->setCurrentIndex(textIndex); updateButtons(); ui->configurations->blockSignals(false); } diff --git a/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp b/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp index 705c0c922f530fb60825a664b24b01a825e2fda6..e956d68b6af34e306d13fb3f94e8cb283547fc12 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp @@ -39,6 +39,7 @@ #include <QFile> #include <QFileInfo> #include <QProcess> +#include <QTextDocument> // Qt::escape() in Qt 4 #include <QXmlStreamWriter> namespace Beautifier { @@ -150,7 +151,8 @@ void UncrustifySettings::createDocumentationFile() const //TODO As soon as Qt 4 support is dropped, use toHtmlEscaped(). const QString text = QLatin1String("<p><span class=\"option\">") + keyword + QLatin1String("</span> <span class=\"param\">") + options - + QLatin1String("</span></p><p>") + Qt::escape(docu.join(QLatin1Char(' '))) + + QLatin1String("</span></p><p>") + + Qt::escape(docu.join(QLatin1String(" "))) + QLatin1String("</p>"); stream.writeStartElement(QLatin1String(Constants::DOCUMENTATION_XMLENTRY)); stream.writeTextElement(QLatin1String(Constants::DOCUMENTATION_XMLKEY), keyword);