From 3747e941ad79f64e28c78c83a840783eb3edfd6f Mon Sep 17 00:00:00 2001 From: Orgad Shaneh <orgad.shaneh@audiocodes.com> Date: Wed, 28 Nov 2012 20:28:42 +0200 Subject: [PATCH] Clean up whitespace before EOL Change-Id: I385544a10b9be66589b0d1a48594128035836c8a Reviewed-by: hjk <qthjk@ovi.com> --- src/libs/extensionsystem/pluginmanager.cpp | 2 +- src/libs/qmldebug/qpacketprotocol.cpp | 2 +- src/libs/qmleditorwidgets/colorbox.cpp | 2 +- .../qmleditorwidgets/contextpanetextwidget.cpp | 10 +++++----- src/libs/qmleditorwidgets/contextpanewidget.cpp | 6 +++--- .../qmleditorwidgets/contextpanewidgetimage.cpp | 10 +++++----- .../qmleditorwidgets/contextpanewidgetimage.h | 2 +- .../contextpanewidgetrectangle.cpp | 2 +- src/libs/qmleditorwidgets/fontsizespinbox.cpp | 2 +- src/libs/qmljs/parser/qmldirparser.cpp | 2 +- src/libs/qmljs/parser/qmlerror.cpp | 6 +++--- src/libs/qmljs/parser/qmljslexer.cpp | 2 +- src/libs/qmljs/qmljsinterpreter.h | 2 +- src/libs/qtcomponents/styleitem/qstyleplugin.cpp | 2 +- .../progressmanager/futureprogress.cpp | 2 +- src/plugins/coreplugin/versiondialog.cpp | 2 +- src/plugins/cpptools/cppcodeformatter.cpp | 4 ++-- src/plugins/debugger/disassembleragent.cpp | 2 +- src/plugins/debugger/pdb/pdbengine.h | 2 +- src/plugins/debugger/snapshotwindow.cpp | 2 +- .../designer/qt_private/formwindowbase_p.h | 2 +- src/plugins/help/centralwidget.cpp | 2 +- src/plugins/help/helpviewer_p.h | 2 +- src/plugins/perforce/perforceplugin.cpp | 2 +- src/plugins/projectexplorer/gccparser.cpp | 2 +- src/plugins/projectexplorer/projectnodes.cpp | 2 +- .../components/formeditor/dragtool.cpp | 2 +- .../itemlibrary/itemlibraryimageprovider.cpp | 4 ++-- .../itemlibrary/itemlibraryimageprovider.h | 2 +- .../components/navigator/navigatortreemodel.cpp | 4 ++-- .../components/propertyeditor/basicwidgets.cpp | 2 +- .../components/propertyeditor/originwidget.cpp | 2 +- .../components/propertyeditor/propertyeditor.cpp | 10 +++++----- .../propertyeditor/siblingcombobox.cpp | 2 +- .../designercore/filemanager/qmlrewriter.h | 2 +- .../designercore/instances/nodeinstanceview.cpp | 2 +- .../metainfo/subcomponentmanager.cpp | 2 +- .../designercore/model/modelmerger.cpp | 2 +- .../designercore/model/qmlmodelview.cpp | 2 +- .../designercore/model/qmlobjectnode.cpp | 2 +- .../designercore/model/texttomodelmerger.cpp | 6 +++--- src/plugins/qmldesigner/designersettings.h | 2 +- src/plugins/qmljseditor/quicktoolbar.cpp | 4 ++-- .../qmlprojectrunconfiguration.h | 2 +- .../highlightdefinitionhandler.cpp | 10 +++++----- .../generichighlighter/keywordlist.cpp | 2 +- .../managedefinitionsdialog.cpp | 2 +- .../texteditor/generichighlighter/rule.cpp | 2 +- .../generichighlighter/specificrules.h | 2 +- src/shared/cpaster/cgi.cpp | 16 ++++++++-------- 50 files changed, 83 insertions(+), 83 deletions(-) diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp index 7987be6103d..0887d65c80a 100644 --- a/src/libs/extensionsystem/pluginmanager.cpp +++ b/src/libs/extensionsystem/pluginmanager.cpp @@ -133,7 +133,7 @@ enum { debugLeaks = 0 }; invokable methods of the "provider" object in the object pool. The \c{ExtensionSystem::invoke} function template encapsulates - {ExtensionSystem::Invoker} construction for the common case where + {ExtensionSystem::Invoker} construction for the common case where the success of the call is not checked. \code diff --git a/src/libs/qmldebug/qpacketprotocol.cpp b/src/libs/qmldebug/qpacketprotocol.cpp index fbbe90b251e..08c1e7f70b5 100644 --- a/src/libs/qmldebug/qpacketprotocol.cpp +++ b/src/libs/qmldebug/qpacketprotocol.cpp @@ -226,7 +226,7 @@ QPacketProtocol::~QPacketProtocol() /*! Returns the maximum packet size allowed. By default this is 2,147,483,647 bytes. - + If a packet claiming to be larger than the maximum packet size is received, the QPacketProtocol::invalidPacket() signal is emitted. diff --git a/src/libs/qmleditorwidgets/colorbox.cpp b/src/libs/qmleditorwidgets/colorbox.cpp index 340300e8a55..01c4ed504ec 100644 --- a/src/libs/qmleditorwidgets/colorbox.cpp +++ b/src/libs/qmleditorwidgets/colorbox.cpp @@ -199,7 +199,7 @@ void ColorBox::paintEvent(QPaintEvent *event) } m_cache = QPixmap::fromImage(cache); } - + p.drawPixmap(5, 5, m_cache); int x = clamp(m_color.hsvSaturationF() * 120, 0, 119) + 5; diff --git a/src/libs/qmleditorwidgets/contextpanetextwidget.cpp b/src/libs/qmleditorwidgets/contextpanetextwidget.cpp index fcf13a6d9f3..a0efaa43ee7 100644 --- a/src/libs/qmleditorwidgets/contextpanetextwidget.cpp +++ b/src/libs/qmleditorwidgets/contextpanetextwidget.cpp @@ -103,7 +103,7 @@ void ContextPaneTextWidget::setProperties(QmlJS::PropertyReader *propertyReader) if (propertyReader->hasProperty(QLatin1String("font.pointSize"))) { QVariant variant = propertyReader->readProperty(QLatin1String("font.pointSize")); bool b; - ui->fontSizeSpinBox->setValue(variant.toInt(&b)); + ui->fontSizeSpinBox->setValue(variant.toInt(&b)); ui->fontSizeSpinBox->setEnabled(b); ui->fontSizeSpinBox->setIsPointSize(true); } else if (!propertyReader->hasProperty(QLatin1String("font.pixelSize"))) { @@ -276,7 +276,7 @@ void ContextPaneTextWidget::onColorButtonToggled(bool flag) ContextPaneWidget *parentContextWidget = qobject_cast<ContextPaneWidget*>(parentWidget()); QPoint p = mapToGlobal(ui->colorButton->pos()); parentContextWidget->colorDialog()->setupColor(ui->colorButton->color().toString()); - p = parentContextWidget->colorDialog()->parentWidget()->mapFromGlobal(p); + p = parentContextWidget->colorDialog()->parentWidget()->mapFromGlobal(p); parentContextWidget->onShowColorDialog(flag, p); } @@ -301,7 +301,7 @@ void ContextPaneTextWidget::onColorDialogCancled() } void ContextPaneTextWidget::onFontSizeChanged(int) -{ +{ if (m_fontSizeTimer > 0) killTimer(m_fontSizeTimer); m_fontSizeTimer = startTimer(200); @@ -310,9 +310,9 @@ void ContextPaneTextWidget::onFontSizeChanged(int) void ContextPaneTextWidget::onFontFormatChanged() { int size = ui->fontSizeSpinBox->value(); - if (ui->fontSizeSpinBox->isPointSize()) { + if (ui->fontSizeSpinBox->isPointSize()) { emit removeAndChangeProperty(QLatin1String("font.pixelSize"), QLatin1String("font.pointSize"), size, true); - } else { + } else { emit removeAndChangeProperty(QLatin1String("font.pointSize"), QLatin1String("font.pixelSize"), size, true); } diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp index ee885078357..28d5e56ac27 100644 --- a/src/libs/qmleditorwidgets/contextpanewidget.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp @@ -411,7 +411,7 @@ void ContextPaneWidget::onTogglePane() } void ContextPaneWidget::onShowColorDialog(bool checked, const QPoint &p) -{ +{ if (checked) { colorDialog()->setParent(parentWidget()); colorDialog()->move(p); @@ -423,7 +423,7 @@ void ContextPaneWidget::onShowColorDialog(bool checked, const QPoint &p) } void ContextPaneWidget::onDisable(bool b) -{ +{ enabledChanged(b); if (!b) { hide(); @@ -448,7 +448,7 @@ void ContextPaneWidget::protectedMoved() } QWidget* ContextPaneWidget::createFontWidget() -{ +{ m_textWidget = new ContextPaneTextWidget(this); connect(m_textWidget, SIGNAL(propertyChanged(QString,QVariant)), this, SIGNAL(propertyChanged(QString,QVariant))); connect(m_textWidget, SIGNAL(removeProperty(QString)), this, SIGNAL(removeProperty(QString))); diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp index bab194ef89b..38d37413451 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp @@ -54,7 +54,7 @@ bool LabelFilter::eventFilter(QObject *obj, QEvent *event) emit doubleClicked(); event->accept(); return true; - } + } return QObject::eventFilter(obj, event); } @@ -113,7 +113,7 @@ ContextPaneWidgetImage::ContextPaneWidgetImage(QWidget *parent, bool borderImage connect(ui->horizontalStretchRadioButton, SIGNAL(toggled(bool)), this, SLOT(onStretchChanged())); connect(ui->verticalStretchRadioButton, SIGNAL(toggled(bool)), this, SLOT(onStretchChanged())); connect(ui->preserveAspectFitRadioButton, SIGNAL(toggled(bool)), this, SLOT(onStretchChanged())); - connect(ui->cropAspectFitRadioButton, SIGNAL(toggled(bool)), this, SLOT(onStretchChanged())); + connect(ui->cropAspectFitRadioButton, SIGNAL(toggled(bool)), this, SLOT(onStretchChanged())); } previewDialog(); m_fileWidget->setShowComboBox(true); @@ -205,7 +205,7 @@ void ContextPaneWidgetImage::setProperties(QmlJS::PropertyReader *propertyReader ui->cropAspectFitRadioButton->setChecked(true); } else { ui->stretchRadioButton->setChecked(true); - } + } } if (propertyReader->hasProperty(QLatin1String("source"))) { QString source = propertyReader->readProperty(QLatin1String("source")).toString(); @@ -336,7 +336,7 @@ void ContextPaneWidgetImage::onFileNameChanged() } void ContextPaneWidgetImage::onPixmapDoubleClicked() -{ +{ previewDialog()->setParent(parentWidget()->parentWidget()); previewDialog()->setMaximumSize(previewDialog()->parentWidget()->size() - QSize(150, 100)); if (m_borderImage) @@ -358,7 +358,7 @@ void ContextPaneWidgetImage::onPixmapDoubleClicked() if (previewDialog()->pos().x() < 0) previewDialog()->move(0, previewDialog()->pos().y()); if (previewDialog()->pos().y() < 0) - previewDialog()->move(previewDialog()->pos().x(), 0); + previewDialog()->move(previewDialog()->pos().x(), 0); previewDialog()->raise(); } diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.h b/src/libs/qmleditorwidgets/contextpanewidgetimage.h index 39df5fa38d7..7217d0176eb 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetimage.h +++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.h @@ -129,7 +129,7 @@ public: explicit ContextPaneWidgetImage(QWidget *parent = 0, bool borderImage = false); ~ContextPaneWidgetImage(); void setProperties(QmlJS::PropertyReader *propertyReader); - void setPath(const QString& path); + void setPath(const QString& path); PreviewDialog* previewDialog(); signals: diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp index fa73706baa1..7627a09302e 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.cpp @@ -74,7 +74,7 @@ ContextPaneWidgetRectangle::~ContextPaneWidgetRectangle() } void ContextPaneWidgetRectangle::setProperties(QmlJS::PropertyReader *propertyReader) -{ +{ m_hasGradient = propertyReader->hasProperty(QLatin1String("gradient")); m_none = false; m_hasBorder = false; diff --git a/src/libs/qmleditorwidgets/fontsizespinbox.cpp b/src/libs/qmleditorwidgets/fontsizespinbox.cpp index db7efcbbd03..7ee85469e44 100644 --- a/src/libs/qmleditorwidgets/fontsizespinbox.cpp +++ b/src/libs/qmleditorwidgets/fontsizespinbox.cpp @@ -64,7 +64,7 @@ QAbstractSpinBox::StepEnabled FontSizeSpinBox::stepEnabled() const { if (value() > 1) return (StepUpEnabled | StepDownEnabled); - else + else return StepUpEnabled; } void FontSizeSpinBox::setText() diff --git a/src/libs/qmljs/parser/qmldirparser.cpp b/src/libs/qmljs/parser/qmldirparser.cpp index a4827eded23..7a09f853478 100644 --- a/src/libs/qmljs/parser/qmldirparser.cpp +++ b/src/libs/qmljs/parser/qmldirparser.cpp @@ -220,7 +220,7 @@ bool QmlDirParser::parse(const QString &source) } } } else { - reportError(lineNumber, -1, + reportError(lineNumber, -1, QString::fromUtf8("a component declaration requires two or three arguments, but %1 were provided").arg(sectionCount)); } diff --git a/src/libs/qmljs/parser/qmlerror.cpp b/src/libs/qmljs/parser/qmlerror.cpp index 2c0ad7cd34b..82f38932f87 100644 --- a/src/libs/qmljs/parser/qmlerror.cpp +++ b/src/libs/qmljs/parser/qmlerror.cpp @@ -114,7 +114,7 @@ QmlError &QmlError::operator=(const QmlError &other) } /*! - \internal + \internal */ QmlError::~QmlError() { @@ -211,7 +211,7 @@ QString QmlError::toString() const rv = QLatin1String("<Unknown File>"); } else if (line() != -1) { rv = url().toString() + QLatin1Char(':') + QString::number(line()); - if(column() != -1) + if(column() != -1) rv += QLatin1Char(':') + QString::number(column()); } else { rv = url().toString(); @@ -253,7 +253,7 @@ QDebug operator<<(QDebug debug, const QmlError &error) if(error.column() > 0) { int column = qMax(0, error.column() - 1); - column = qMin(column, line.length()); + column = qMin(column, line.length()); QByteArray ind; ind.reserve(column); diff --git a/src/libs/qmljs/parser/qmljslexer.cpp b/src/libs/qmljs/parser/qmljslexer.cpp index 87d13e7cf03..19f3281f7a4 100644 --- a/src/libs/qmljs/parser/qmljslexer.cpp +++ b/src/libs/qmljs/parser/qmljslexer.cpp @@ -556,7 +556,7 @@ again: _validTokenText = true; _tokenText.resize(0); startCode--; - while (startCode != _codePtr - 1) + while (startCode != _codePtr - 1) _tokenText += *startCode++; while (! _char.isNull()) { diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h index 1274802b829..ae93f947b1f 100644 --- a/src/libs/qmljs/qmljsinterpreter.h +++ b/src/libs/qmljs/qmljsinterpreter.h @@ -751,7 +751,7 @@ public: AST::UiQualifiedId *qmlTypeName() const; -private: +private: virtual const Value *value(ReferenceContext *referenceContext) const; AST::UiQualifiedId *_qmlTypeName; diff --git a/src/libs/qtcomponents/styleitem/qstyleplugin.cpp b/src/libs/qtcomponents/styleitem/qstyleplugin.cpp index 2d4cea202fb..6ca2d9b1f63 100644 --- a/src/libs/qtcomponents/styleitem/qstyleplugin.cpp +++ b/src/libs/qtcomponents/styleitem/qstyleplugin.cpp @@ -36,7 +36,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ - + #include <qdeclarative.h> #include "qstyleplugin.h" #include "qstyleitem.h" diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.cpp b/src/plugins/coreplugin/progressmanager/futureprogress.cpp index c963619f8bb..df7780ff91a 100644 --- a/src/plugins/coreplugin/progressmanager/futureprogress.cpp +++ b/src/plugins/coreplugin/progressmanager/futureprogress.cpp @@ -164,7 +164,7 @@ FutureProgress::FutureProgress(QWidget *parent) : connect(&d->m_watcher, SIGNAL(progressValueChanged(int)), this, SLOT(setProgressValue(int))); connect(&d->m_watcher, SIGNAL(progressTextChanged(QString)), this, SLOT(setProgressText(QString))); - connect(d->m_progress, SIGNAL(clicked()), this, SLOT(cancel())); + connect(d->m_progress, SIGNAL(clicked()), this, SLOT(cancel())); } /*! diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp index 1e93c5d3d07..625e57bd61f 100644 --- a/src/plugins/coreplugin/versiondialog.cpp +++ b/src/plugins/coreplugin/versiondialog.cpp @@ -85,7 +85,7 @@ VersionDialog::VersionDialog(QWidget *parent) "The program is provided AS IS with NO WARRANTY OF ANY KIND, " "INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A " "PARTICULAR PURPOSE.<br/>") - .arg(version, + .arg(version, QLatin1String(QT_VERSION_STR), QString::number(QSysInfo::WordSize), QLatin1String(__DATE__), QLatin1String(__TIME__), QLatin1String(Constants::IDE_YEAR), (QLatin1String(Constants::IDE_AUTHOR)), ideVersionDescription, diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp index ecd6aa3ab3a..a8d25753fb9 100644 --- a/src/plugins/cpptools/cppcodeformatter.cpp +++ b/src/plugins/cpptools/cppcodeformatter.cpp @@ -766,7 +766,7 @@ void CodeFormatter::correctIndentation(const QTextBlock &block) } bool CodeFormatter::tryExpression(bool alsoExpression) -{ +{ int newState = -1; const int kind = m_currentToken.kind(); @@ -1027,7 +1027,7 @@ void CodeFormatter::saveCurrentState(const QTextBlock &block) void CodeFormatter::restoreCurrentState(const QTextBlock &block) { - if (block.isValid()) { + if (block.isValid()) { BlockData blockData; if (loadBlockData(block, &blockData)) { m_indentDepth = blockData.m_indentDepth; diff --git a/src/plugins/debugger/disassembleragent.cpp b/src/plugins/debugger/disassembleragent.cpp index adf5b4179ab..e86b087d496 100644 --- a/src/plugins/debugger/disassembleragent.cpp +++ b/src/plugins/debugger/disassembleragent.cpp @@ -371,7 +371,7 @@ void DisassemblerAgent::updateLocationMarker() QPlainTextEdit *plainTextEdit = qobject_cast<QPlainTextEdit *>(d->editor->widget()); - QTC_ASSERT(plainTextEdit, return); + QTC_ASSERT(plainTextEdit, return); QTextCursor tc = plainTextEdit->textCursor(); QTextBlock block = tc.document()->findBlockByNumber(lineNumber - 1); tc.setPosition(block.position()); diff --git a/src/plugins/debugger/pdb/pdbengine.h b/src/plugins/debugger/pdb/pdbengine.h index 82cdd81ac78..680603fcdff 100644 --- a/src/plugins/debugger/pdb/pdbengine.h +++ b/src/plugins/debugger/pdb/pdbengine.h @@ -162,7 +162,7 @@ private: QQueue<PdbCommand> m_commands; - QByteArray m_inbuffer; + QByteArray m_inbuffer; QString m_scriptFileName; QProcess m_pdbProc; QString m_pdb; diff --git a/src/plugins/debugger/snapshotwindow.cpp b/src/plugins/debugger/snapshotwindow.cpp index 757c65a9e77..98928947686 100644 --- a/src/plugins/debugger/snapshotwindow.cpp +++ b/src/plugins/debugger/snapshotwindow.cpp @@ -93,7 +93,7 @@ void SnapshotTreeView::contextMenuEvent(QContextMenuEvent *ev) QAction *actRemove = menu.addAction(tr("Remove Snapshot")); actRemove->setEnabled(idx.isValid()); - + addBaseContextActions(&menu); QAction *act = menu.exec(ev->globalPos()); diff --git a/src/plugins/designer/qt_private/formwindowbase_p.h b/src/plugins/designer/qt_private/formwindowbase_p.h index 8e9e086612e..db7d74f0403 100644 --- a/src/plugins/designer/qt_private/formwindowbase_p.h +++ b/src/plugins/designer/qt_private/formwindowbase_p.h @@ -183,7 +183,7 @@ private slots: private: void syncGridFeature(); - FormWindowBasePrivate *m_d; + FormWindowBasePrivate *m_d; }; } // namespace qdesigner_internal diff --git a/src/plugins/help/centralwidget.cpp b/src/plugins/help/centralwidget.cpp index 2c32384930c..f1761cf48fc 100644 --- a/src/plugins/help/centralwidget.cpp +++ b/src/plugins/help/centralwidget.cpp @@ -288,7 +288,7 @@ void CentralWidget::focusInEvent(QFocusEvent * /* event */) void CentralWidget::highlightSearchTerms() { if (HelpViewer *viewer = currentHelpViewer()) { - QHelpSearchEngine *searchEngine = + QHelpSearchEngine *searchEngine = LocalHelpManager::helpEngine().searchEngine(); QList<QHelpSearchQuery> queryList = searchEngine->query(); diff --git a/src/plugins/help/helpviewer_p.h b/src/plugins/help/helpviewer_p.h index 3e46ab87841..10e3a19a5e0 100644 --- a/src/plugins/help/helpviewer_p.h +++ b/src/plugins/help/helpviewer_p.h @@ -49,7 +49,7 @@ public: : zoomCount(zoom) , forceFont(false) , lastAnchor(QString()) - + {} bool hasAnchorAt(QTextBrowser *browser, const QPoint& pos) diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index ae2b1781407..1f07a2eb90a 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -797,7 +797,7 @@ void PerforcePlugin::updateActions(VcsBase::VcsBasePlugin::ActionState as) { if (!enableMenuAction(as, m_menuAction)) { m_commandLocator->setEnabled(false); - return; + return; } const bool hasTopLevel = currentState().hasTopLevel(); m_commandLocator->setEnabled(hasTopLevel); diff --git a/src/plugins/projectexplorer/gccparser.cpp b/src/plugins/projectexplorer/gccparser.cpp index 9b4a05bbcd4..8baccac119d 100644 --- a/src/plugins/projectexplorer/gccparser.cpp +++ b/src/plugins/projectexplorer/gccparser.cpp @@ -313,7 +313,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data() QLatin1String("unused variable 'handler'"), Utils::FileName::fromUserInput("../../../../master/src/plugins/debugger/gdb/gdbengine.cpp"), 2115, categoryCompile)) - << QString(); + << QString(); QTest::newRow("gnumakeparser.cpp errors") << QString::fromLatin1("/home/code/src/creator/src/plugins/projectexplorer/gnumakeparser.cpp: In member function 'void ProjectExplorer::ProjectExplorerPlugin::testGnuMakeParserTaskMangling_data()':\n" "/home/code/src/creator/src/plugins/projectexplorer/gnumakeparser.cpp:264: error: expected primary-expression before ':' token\n" diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp index 4444996627c..45a18c00942 100644 --- a/src/plugins/projectexplorer/projectnodes.cpp +++ b/src/plugins/projectexplorer/projectnodes.cpp @@ -756,7 +756,7 @@ void SessionNode::watcherDestroyed(QObject *watcher) by calling ProjectNode::unregisterWatcher and SessionNode::unregisterWatcher(). - The NodesWatcher is similar to the Observer in the + The NodesWatcher is similar to the Observer in the well-known Observer pattern (Booch et al). \sa ProjectExplorer::Node diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp index fc725e64b0f..a019b6fe536 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp @@ -161,7 +161,7 @@ void DragTool::createQmlItemNode(const ItemLibraryEntry &itemLibraryEntry, QmlIt Q_ASSERT(m_dragNode.modelNode().isValid()); QList<QmlItemNode> nodeList; - nodeList.append(m_dragNode); + nodeList.append(m_dragNode); m_selectionIndicator.setItems(scene()->itemsForQmlItemNodes(nodeList)); } diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.cpp index cb0db3582b1..b888f3ffaff 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.cpp @@ -32,7 +32,7 @@ namespace QmlDesigner { namespace Internal { -ItemLibraryImageProvider::ItemLibraryImageProvider() : +ItemLibraryImageProvider::ItemLibraryImageProvider() : QDeclarativeImageProvider(QDeclarativeImageProvider::Pixmap) { } @@ -44,7 +44,7 @@ QPixmap ItemLibraryImageProvider::requestPixmap(const QString &id, QSize *size, size->setWidth(pixmap.width()); size->setHeight(pixmap.height()); } - if (requestedSize.isValid()) + if (requestedSize.isValid()) return pixmap.scaled(requestedSize); return pixmap; } diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.h index e021f80376c..7c4fabbebd3 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.h @@ -39,7 +39,7 @@ namespace Internal { class ItemLibraryImageProvider : public QDeclarativeImageProvider { public: - ItemLibraryImageProvider(); + ItemLibraryImageProvider(); QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize); }; diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index 0dbab09aec6..9b37f8508f6 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -252,7 +252,7 @@ NavigatorTreeModel::ItemRow NavigatorTreeModel::createItemRow(const ModelNode &n void NavigatorTreeModel::updateItemRow(const ModelNode &node, ItemRow items) { - bool blockSignal = blockItemChangedSignal(true); + bool blockSignal = blockItemChangedSignal(true); items.idItem->setText(node.id()); items.visibilityItem->setCheckState(node.auxiliaryData("invisible").toBool() ? Qt::Unchecked : Qt::Checked); @@ -632,7 +632,7 @@ QStringList NavigatorTreeModel::visibleProperties(const ModelNode &node) const propertyList.append(propertyName); } } - } + } return propertyList; } diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp index f19115c0e50..bf74209e0ce 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp @@ -652,7 +652,7 @@ protected: QFontMetrics fm(font()); if (fm.width(text()) > (contentsRect().width() - 8) && text().length() > 4) { QPainter p(this); - QString elided_txt; + QString elided_txt; elided_txt = fm.elidedText(text(), Qt::ElideRight, contentsRect().width() - 8, Qt::TextShowMnemonic); p.drawText(contentsRect().adjusted(12, 0, 0, 0), Qt::TextSingleLine, elided_txt); } diff --git a/src/plugins/qmldesigner/components/propertyeditor/originwidget.cpp b/src/plugins/qmldesigner/components/propertyeditor/originwidget.cpp index 298e36a868c..399f20f7dcf 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/originwidget.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/originwidget.cpp @@ -108,7 +108,7 @@ void OriginWidget::mouseReleaseEvent(QMouseEvent *event) } void OriginWidget::mousePressEvent(QMouseEvent * event) -{ +{ if (event->button() == Qt::LeftButton) { m_pressed = true; for (int i = 0; i < positions.size(); i++) diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp index 3dcb4176a71..044b97a85dd 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp @@ -254,11 +254,11 @@ void PropertyEditor::NodeType::setup(const QmlObjectNode &fxObjectNode, const QS m_backendAnchorBinding.setup(QmlItemNode(fxObjectNode.modelNode())); ctxt->setContextProperty("anchorBackend", &m_backendAnchorBinding); - + ctxt->setContextProperty("transaction", m_propertyEditorTransaction.data()); - + m_contextObject->setSpecificsUrl(qmlSpecificsFile); - + m_contextObject->setStateName(stateName); if (!fxObjectNode.isValid()) return; @@ -774,7 +774,7 @@ void PropertyEditor::resetView() ctxt->setContextProperty("finishedNotify", QVariant(false)); if (specificQmlData.isEmpty()) type->m_contextObject->setSpecificQmlData(specificQmlData); - + type->m_contextObject->setGlobalBaseUrl(qmlFile); type->m_contextObject->setSpecificQmlData(specificQmlData); type->m_view->setSource(qmlFile); @@ -785,7 +785,7 @@ void PropertyEditor::resetView() fxObjectNode = QmlObjectNode(m_selectedNode); } QDeclarativeContext *ctxt = type->m_view->rootContext(); - + ctxt->setContextProperty("finishedNotify", QVariant(false)); if (specificQmlData.isEmpty()) type->m_contextObject->setSpecificQmlData(specificQmlData); diff --git a/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp b/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp index b591f91f763..ef764c18976 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp @@ -34,7 +34,7 @@ namespace QmlDesigner { void SiblingComboBox::setItemNode(const QVariant &itemNode) { - + if (!itemNode.value<ModelNode>().isValid() || !QmlItemNode(itemNode.value<ModelNode>()).hasNodeParent()) return; m_itemNode = itemNode.value<ModelNode>(); diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h index 0130877e7c4..4ea77c4316d 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h +++ b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h @@ -77,7 +77,7 @@ protected: { return m_textModifier; } bool includeSurroundingWhitespace(int &start, int &end) const; - void includeLeadingEmptyLine(int &start) const; + void includeLeadingEmptyLine(int &start) const; static QmlJS::AST::UiObjectMemberList *searchMemberToInsertAfter(QmlJS::AST::UiObjectMemberList *members, const QStringList &propertyOrder); static QmlJS::AST::UiObjectMemberList *searchMemberToInsertAfter(QmlJS::AST::UiObjectMemberList *members, const QString &propertyName, const QStringList &propertyOrder); diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index afcec786fa8..bcb4c3ba731 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -762,7 +762,7 @@ CreateSceneCommand NodeInstanceView::createCreateSceneCommand() nodeList = filterNodesForSkipItems(nodeList); QList<VariantProperty> variantPropertyList; - QList<BindingProperty> bindingPropertyList; + QList<BindingProperty> bindingPropertyList; QVector<PropertyValueContainer> auxiliaryContainerVector; foreach (const ModelNode &node, nodeList) { diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp index e88f7519b63..92573de761e 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp @@ -88,7 +88,7 @@ void SubComponentManager::addImport(int pos, const Import &import) } } else { QString url = import.url(); - + url.replace(QLatin1Char('.'), QLatin1Char('/')); foreach (const QString &path, importPaths()) { diff --git a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp index 14c257c2646..c2fb7a9b804 100644 --- a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp @@ -199,7 +199,7 @@ void ModelMerger::replaceModel(const ModelNode &modelNode) syncNodeProperties(rootNode, modelNode, idRenamingHash, view()); syncNodeListProperties(rootNode, modelNode, idRenamingHash, view()); m_view->changeRootNodeType(modelNode.type(), modelNode.majorVersion(), modelNode.minorVersion()); - } catch (RewritingException &e) { + } catch (RewritingException &e) { qWarning() << e.description(); //silent error } } diff --git a/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp index 86002b5ece5..d0b33871103 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp @@ -234,7 +234,7 @@ QmlItemNode QmlModelView::createQmlItemNode(const ItemLibraryEntry &itemLibraryE rootModelNode.variantProperty("y") = propertyPairList.at(1).second; ModelMerger merger(this); - newNode = merger.insertModel(rootModelNode); + newNode = merger.insertModel(rootModelNode); } } diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp index ee12ec69589..8c534a47d05 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp @@ -96,7 +96,7 @@ instanciated instance of this object. */ QVariant QmlObjectNode::instanceValue(const QString &name) const -{ +{ return nodeInstance().property(name); } diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index e60d4173d4d..a576028d0a3 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -139,7 +139,7 @@ static inline QString fixEscapedUnicodeChar(const QString &value) //convert "\u2 } return value; } - + static inline bool isSignalPropertyName(const QString &signalName) { // see QmlCompiler::isSignalPropertyName @@ -258,7 +258,7 @@ static bool isCustomParserType(const QString &type) static bool isPropertyChangesType(const QString &type) -{ +{ return type == QLatin1String("PropertyChanges") || type == QLatin1String("QtQuick.PropertyChanges") || type == QLatin1String("Qt.PropertyChanges"); } @@ -1567,7 +1567,7 @@ ModelNode ModelAmender::listPropertyMissingModelNode(NodeListProperty &modelProp modelProperty.reparentHere(newNode); } else { //The default property could a NodeProperty implicitly (delegate:) modelProperty.parentModelNode().removeProperty(modelProperty.name()); - modelProperty.reparentHere(newNode); + modelProperty.reparentHere(newNode); } } else { modelProperty.reparentHere(newNode); diff --git a/src/plugins/qmldesigner/designersettings.h b/src/plugins/qmldesigner/designersettings.h index 07d4290f16b..36b3e622b4c 100644 --- a/src/plugins/qmldesigner/designersettings.h +++ b/src/plugins/qmldesigner/designersettings.h @@ -49,7 +49,7 @@ public: bool equals(const DesignerSettings &other) const; bool openDesignMode; int itemSpacing; - int snapMargin; + int snapMargin; int canvasWidth; int canvasHeight; bool warningsInDesigner; diff --git a/src/plugins/qmljseditor/quicktoolbar.cpp b/src/plugins/qmljseditor/quicktoolbar.cpp index 79a53232219..0b069935821 100644 --- a/src/plugins/qmljseditor/quicktoolbar.cpp +++ b/src/plugins/qmljseditor/quicktoolbar.cpp @@ -219,7 +219,7 @@ void QuickToolBar::apply(TextEditor::BaseTextEditor *editor, Document::Ptr docum m_node = 0; PropertyReader propertyReader(document, initializer); QTextCursor tc(editor->editorWidget()->document()); - tc.setPosition(offset); + tc.setPosition(offset); QPoint p1 = editor->editorWidget()->mapToParent(editor->editorWidget()->viewport()->mapToParent(editor->editorWidget()->cursorRect(tc).topLeft()) - QPoint(0, contextWidget()->height() + 10)); tc.setPosition(end); QPoint p2 = editor->editorWidget()->mapToParent(editor->editorWidget()->viewport()->mapToParent(editor->editorWidget()->cursorRect(tc).bottomLeft()) + QPoint(0, 10)); @@ -237,7 +237,7 @@ void QuickToolBar::apply(TextEditor::BaseTextEditor *editor, Document::Ptr docum contextWidget()->rePosition(p3 , p1, p2, QuickToolBarSettings::get().pinContextPane); contextWidget()->setOptions(QuickToolBarSettings::get().enableContextPane, QuickToolBarSettings::get().pinContextPane); contextWidget()->setPath(document->path()); - contextWidget()->setProperties(&propertyReader); + contextWidget()->setProperties(&propertyReader); m_doc = document; m_node = node; } else { diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h index df331ede42e..630a522dd71 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h @@ -108,7 +108,7 @@ protected: private: void ctor(); static bool isValidVersion(QtSupport::BaseQtVersion *version); - + static QString canonicalCapsPath(const QString &filePath); Utils::Environment baseEnvironment() const; diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp index f6e136b2742..55278dab8af 100644 --- a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp +++ b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp @@ -351,7 +351,7 @@ void HighlightDefinitionHandler::keywordStarted(const QXmlAttributes &atts) } void HighlightDefinitionHandler::intStarted(const QXmlAttributes &atts) -{ +{ ruleElementStarted(atts, QSharedPointer<Rule>(new IntRule)); } @@ -361,17 +361,17 @@ void HighlightDefinitionHandler::floatStarted(const QXmlAttributes &atts) } void HighlightDefinitionHandler::hlCOctStarted(const QXmlAttributes &atts) -{ +{ ruleElementStarted(atts, QSharedPointer<Rule>(new HlCOctRule)); } void HighlightDefinitionHandler::hlCHexStarted(const QXmlAttributes &atts) -{ +{ ruleElementStarted(atts, QSharedPointer<Rule>(new HlCHexRule)); } void HighlightDefinitionHandler::hlCStringCharStarted(const QXmlAttributes &atts) -{ +{ ruleElementStarted(atts, QSharedPointer<Rule>(new HlCStringCharRule)); } @@ -389,7 +389,7 @@ void HighlightDefinitionHandler::rangeDetectStarted(const QXmlAttributes &atts) } void HighlightDefinitionHandler::lineContinue(const QXmlAttributes &atts) -{ +{ ruleElementStarted(atts, QSharedPointer<Rule>(new LineContinueRule)); } diff --git a/src/plugins/texteditor/generichighlighter/keywordlist.cpp b/src/plugins/texteditor/generichighlighter/keywordlist.cpp index 914e199d72c..e7f4323a335 100644 --- a/src/plugins/texteditor/generichighlighter/keywordlist.cpp +++ b/src/plugins/texteditor/generichighlighter/keywordlist.cpp @@ -35,7 +35,7 @@ using namespace Internal; void KeywordList::addKeyword(const QString &keyword) { if (keyword.isEmpty()) - return; + return; m_keywords.insert(keyword); } diff --git a/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp b/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp index 5adb26ced98..f78086135d0 100644 --- a/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp +++ b/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp @@ -54,7 +54,7 @@ ManageDefinitionsDialog::ManageDefinitionsDialog( m_definitionsMetaData(metaDataList), m_path(path) { - ui.setupUi(this); + ui.setupUi(this); ui.definitionsTable->setHorizontalHeaderLabels( QStringList() << tr("Name") << tr("Installed") << tr("Available")); ui.definitionsTable->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch); diff --git a/src/plugins/texteditor/generichighlighter/rule.cpp b/src/plugins/texteditor/generichighlighter/rule.cpp index bf59c9a4399..796c722cd6d 100644 --- a/src/plugins/texteditor/generichighlighter/rule.cpp +++ b/src/plugins/texteditor/generichighlighter/rule.cpp @@ -163,7 +163,7 @@ bool Rule::charPredicateMatchSucceed(const QString &text, } bool Rule::matchSucceed(const QString &text, const int length, ProgressData *progress) -{ +{ if (m_firstNonSpace && !progress->isOnlySpacesSoFar()) return false; diff --git a/src/plugins/texteditor/generichighlighter/specificrules.h b/src/plugins/texteditor/generichighlighter/specificrules.h index 562090f1642..c7ee21fab39 100644 --- a/src/plugins/texteditor/generichighlighter/specificrules.h +++ b/src/plugins/texteditor/generichighlighter/specificrules.h @@ -124,7 +124,7 @@ public: void setPattern(const QString &pattern); void setInsensitive(const QString &insensitive); - void setMinimal(const QString &minimal); + void setMinimal(const QString &minimal); private: virtual bool doMatchSucceed(const QString &text, diff --git a/src/shared/cpaster/cgi.cpp b/src/shared/cpaster/cgi.cpp index 4b26dfa7536..295bad15381 100644 --- a/src/shared/cpaster/cgi.cpp +++ b/src/shared/cpaster/cgi.cpp @@ -161,13 +161,13 @@ inline const char *unicodeToHTML(ushort unicode_char) case 0x00BD: return "frac12"; // (189 ) vulgar fraction one half = fraction one half case 0x00BE: return "frac34"; // (190 ) vulgar fraction three quarters = fraction three quarters case 0x00BF: return "iquest"; // (191 ) inverted question mark = turned question mark - case 0x00C0: return "Agrave"; // (192 ) capital letter A with grave = capital letter + case 0x00C0: return "Agrave"; // (192 ) capital letter A with grave = capital letter case 0x00C1: return "Aacute"; // (193 ) capital letter A with acute case 0x00C2: return "Acirc"; // (194 ) capital letter A with circumflex case 0x00C3: return "Atilde"; // (195 ) capital letter A with tilde case 0x00C4: return "Auml"; // (196 ) capital letter A with diaeresis - case 0x00C5: return "Aring"; // (197 ) capital letter A with ring above = capital letter - case 0x00C6: return "AElig"; // (198 ) capital letter AE = capital ligature + case 0x00C5: return "Aring"; // (197 ) capital letter A with ring above = capital letter + case 0x00C6: return "AElig"; // (198 ) capital letter AE = capital ligature case 0x00C7: return "Ccedil"; // (199 ) capital letter C with cedilla case 0x00C8: return "Egrave"; // (200 ) capital letter E with grave case 0x00C9: return "Eacute"; // (201 ) capital letter E with acute @@ -185,7 +185,7 @@ inline const char *unicodeToHTML(ushort unicode_char) case 0x00D5: return "Otilde"; // (213 ) capital letter O with tilde case 0x00D6: return "Ouml"; // (214 ) capital letter O with diaeresis case 0x00D7: return "times"; // (215 ) multiplication sign - case 0x00D8: return "Oslash"; // (216 ) capital letter O with stroke = capital letter + case 0x00D8: return "Oslash"; // (216 ) capital letter O with stroke = capital letter case 0x00D9: return "Ugrave"; // (217 ) capital letter U with grave case 0x00DA: return "Uacute"; // (218 ) capital letter U with acute case 0x00DB: return "Ucirc"; // (219 ) capital letter U with circumflex @@ -193,13 +193,13 @@ inline const char *unicodeToHTML(ushort unicode_char) case 0x00DD: return "Yacute"; // (221 ) capital letter Y with acute case 0x00DE: return "THORN"; // (222 ) capital letter THORN case 0x00DF: return "szlig"; // (223 ) small letter sharp s = ess-zed - case 0x00E0: return "agrave"; // (224 ) small letter a with grave = small letter + case 0x00E0: return "agrave"; // (224 ) small letter a with grave = small letter case 0x00E1: return "aacute"; // (225 ) small letter a with acute case 0x00E2: return "acirc"; // (226 ) small letter a with circumflex case 0x00E3: return "atilde"; // (227 ) small letter a with tilde case 0x00E4: return "auml"; // (228 ) small letter a with diaeresis - case 0x00E5: return "aring"; // (229 ) small letter a with ring above = small letter - case 0x00E6: return "aelig"; // (230 ) small letter ae = small letter + case 0x00E5: return "aring"; // (229 ) small letter a with ring above = small letter + case 0x00E6: return "aelig"; // (230 ) small letter ae = small letter case 0x00E7: return "ccedil"; // (231 ) small letter c with cedilla case 0x00E8: return "egrave"; // (232 ) small letter e with grave case 0x00E9: return "eacute"; // (233 ) small letter e with acute @@ -217,7 +217,7 @@ inline const char *unicodeToHTML(ushort unicode_char) case 0x00F5: return "otilde"; // (245 ) small letter o with tilde case 0x00F6: return "ouml"; // (246 ) small letter o with diaeresis case 0x00F7: return "divide"; // (247 ) division sign - case 0x00F8: return "oslash"; // (248 ) small letter o with stroke = small letter + case 0x00F8: return "oslash"; // (248 ) small letter o with stroke = small letter case 0x00F9: return "ugrave"; // (249 ) small letter u with grave case 0x00FA: return "uacute"; // (250 ) small letter u with acute case 0x00FB: return "ucirc"; // (251 ) small letter u with circumflex -- GitLab