diff --git a/core/probe.cpp b/core/probe.cpp index 69b6e6e744..115c11e4e5 100644 --- a/core/probe.cpp +++ b/core/probe.cpp @@ -687,7 +687,7 @@ void Probe::objectRemoved(QObject *obj) EXPENSIVE_ASSERT(!instance()->isObjectCreationQueued(obj)); if (instance()->thread() == QThread::currentThread()) - emit instance()->objectDestroyed(obj); + emit instance() -> objectDestroyed(obj); else instance()->queueDestroyedObject(obj); } diff --git a/core/tools/objectinspector/connectionsextension.cpp b/core/tools/objectinspector/connectionsextension.cpp index e7a7dc9f9a..ad3c82d58c 100644 --- a/core/tools/objectinspector/connectionsextension.cpp +++ b/core/tools/objectinspector/connectionsextension.cpp @@ -26,7 +26,7 @@ using namespace GammaRay; ConnectionsExtension::ConnectionsExtension(PropertyController *controller) : ConnectionsExtensionInterface( - controller->objectBaseName() + ".connectionsExtension", controller) + controller->objectBaseName() + ".connectionsExtension", controller) , PropertyControllerExtension(controller->objectBaseName() + ".connections") { m_inboundModel = new InboundConnectionsModel(controller); diff --git a/plugins/codecbrowser/codecbrowserwidget.cpp b/plugins/codecbrowser/codecbrowserwidget.cpp index dde0fb69ae..3940a83898 100644 --- a/plugins/codecbrowser/codecbrowserwidget.cpp +++ b/plugins/codecbrowser/codecbrowserwidget.cpp @@ -38,8 +38,7 @@ CodecBrowserWidget::CodecBrowserWidget(QWidget *parent) connect(ui->codecText, &QLineEdit::textChanged, this, &CodecBrowserWidget::textChanged); - m_stateManager.setDefaultSizes(ui->mainSplitter, UISizeVector() << "50%" - << "50%"); + m_stateManager.setDefaultSizes(ui->mainSplitter, UISizeVector() << "50%" << "50%"); } CodecBrowserWidget::~CodecBrowserWidget() = default; diff --git a/plugins/fontbrowser/fontbrowserwidget.cpp b/plugins/fontbrowser/fontbrowserwidget.cpp index 2227f31867..50a4e34cd6 100644 --- a/plugins/fontbrowser/fontbrowserwidget.cpp +++ b/plugins/fontbrowser/fontbrowserwidget.cpp @@ -84,8 +84,7 @@ FontBrowserWidget::FontBrowserWidget(QWidget *parent) m_fontBrowser->toggleUnderlineFont(ui->underlineBox->isChecked()); m_fontBrowser->setPointSize(ui->pointSize->value()); - m_stateManager.setDefaultSizes(ui->mainSplitter, UISizeVector() << "50%" - << "50%"); + m_stateManager.setDefaultSizes(ui->mainSplitter, UISizeVector() << "50%" << "50%"); QMetaObject::invokeMethod(this, "delayedInit", Qt::QueuedConnection); } diff --git a/plugins/localeinspector/localedataaccessor.cpp b/plugins/localeinspector/localedataaccessor.cpp index f3d9e5fc9d..5c6e4644dd 100644 --- a/plugins/localeinspector/localedataaccessor.cpp +++ b/plugins/localeinspector/localedataaccessor.cpp @@ -101,7 +101,7 @@ void LocaleDataAccessorRegistry::init() LOCALE_SIMPLE_ACCESSOR(TextDirection, return locale.textDirection() == Qt::LeftToRight ? QStringLiteral( - "LTR") + "LTR") : QStringLiteral("RTL");) LOCALE_SIMPLE_DEFAULT_ACCESSOR(TimeFormatLong, @@ -213,7 +213,7 @@ void LocaleDataAccessorRegistry::init() return locale.measurementSystem() == QLocale::ImperialSystem ? QStringLiteral( - "Imperial") + "Imperial") : QStringLiteral("Metric");) LOCALE_SIMPLE_DEFAULT_ACCESSOR(FloatFormat, diff --git a/plugins/localeinspector/localedataaccessor.h b/plugins/localeinspector/localedataaccessor.h index 02424a24ee..99fb915831 100644 --- a/plugins/localeinspector/localedataaccessor.h +++ b/plugins/localeinspector/localedataaccessor.h @@ -80,7 +80,7 @@ struct LocaleDataAccessor { \ explicit Locale##NAME##Accessor(LocaleDataAccessorRegistry *registry) \ : LocaleDataAccessor( \ - registry) \ + registry) \ { \ } \ QString accessorName() override \ @@ -95,7 +95,7 @@ struct LocaleDataAccessor { \ explicit Locale##NAME##Accessor(LocaleDataAccessorRegistry *registry) \ : LocaleDataAccessor( \ - registry, true) \ + registry, true) \ { \ } \ \ diff --git a/plugins/modelinspector/modelinspectorwidget.cpp b/plugins/modelinspector/modelinspectorwidget.cpp index 7bad420800..22cf3f8250 100644 --- a/plugins/modelinspector/modelinspectorwidget.cpp +++ b/plugins/modelinspector/modelinspectorwidget.cpp @@ -83,9 +83,7 @@ ModelInspectorWidget::ModelInspectorWidget(QWidget *parent) ui->modelCellView->setModel(ObjectBroker::model(QStringLiteral( "com.kdab.GammaRay.ModelCellModel"))); - m_stateManager.setDefaultSizes(ui->mainSplitter, UISizeVector() << "33%" - << "33%" - << "33%"); + m_stateManager.setDefaultSizes(ui->mainSplitter, UISizeVector() << "33%" << "33%" << "33%"); cellDataChanged(); } diff --git a/plugins/network/networkreplywidget.cpp b/plugins/network/networkreplywidget.cpp index a7968802d1..244c1fdc8c 100644 --- a/plugins/network/networkreplywidget.cpp +++ b/plugins/network/networkreplywidget.cpp @@ -121,14 +121,14 @@ NetworkReplyWidget::NetworkReplyWidget(QWidget *parent) } #else - QTextCodec::ConverterState state; - QTextCodec *codec = QTextCodec::codecForName("UTF-8"); - const QString text = codec->toUnicode(response.constData(), response.size(), &state); - if (state.invalidChars > 0) { - ui->responseTextEdit->setPlainText(tr("%1: Unable to show response preview").arg(qApp->applicationName())); - } else { - ui->responseTextEdit->setPlainText(text); - } + QTextCodec::ConverterState state; + QTextCodec *codec = QTextCodec::codecForName("UTF-8"); + const QString text = codec->toUnicode(response.constData(), response.size(), &state); + if (state.invalidChars > 0) { + ui->responseTextEdit->setPlainText(tr("%1: Unable to show response preview").arg(qApp->applicationName())); + } else { + ui->responseTextEdit->setPlainText(text); + } #endif }); ui->responseTextEdit->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont)); diff --git a/plugins/positioning/geopositioninfosourcefactory.cpp b/plugins/positioning/geopositioninfosourcefactory.cpp index 6a56a9cc9f..53bc9ea74a 100644 --- a/plugins/positioning/geopositioninfosourcefactory.cpp +++ b/plugins/positioning/geopositioninfosourcefactory.cpp @@ -69,9 +69,9 @@ QGeoPositionInfoSource *GeoPositionInfoSourceFactory::positionInfoSource(QObject const auto rData = metaData.at(rhs).toCbor(); return lData.value(QStringLiteral("Priority")).toInteger() > rData.value(QStringLiteral("Priority")).toInteger(); #else - const auto lData = metaData.at(lhs).value(QStringLiteral("MetaData")).toObject(); - const auto rData = metaData.at(rhs).value(QStringLiteral("MetaData")).toObject(); - return lData.value(QStringLiteral("Priority")).toInt() > rData.value(QStringLiteral("Priority")).toInt(); + const auto lData = metaData.at(lhs).value(QStringLiteral("MetaData")).toObject(); + const auto rData = metaData.at(rhs).value(QStringLiteral("MetaData")).toObject(); + return lData.value(QStringLiteral("Priority")).toInt() > rData.value(QStringLiteral("Priority")).toInt(); #endif }); diff --git a/plugins/quickinspector/quickinspector.cpp b/plugins/quickinspector/quickinspector.cpp index e765ea2275..f578f941c7 100644 --- a/plugins/quickinspector/quickinspector.cpp +++ b/plugins/quickinspector/quickinspector.cpp @@ -718,14 +718,11 @@ void QuickInspector::setSlowMode(bool slow) auto it = connections.find(window); if (it == connections.end()) { - connections.insert(window, connect( - window, &QQuickWindow::beforeRendering, this, [this, window]() { + connections.insert(window, connect(window, &QQuickWindow::beforeRendering, this, [this, window]() { auto it = connections.find(window); QUnifiedTimer::instance()->setSlowModeEnabled(m_slowDownEnabled); QObject::disconnect(it.value()); - connections.erase(it); - }, - Qt::DirectConnection)); + connections.erase(it); }, Qt::DirectConnection)); } } diff --git a/plugins/quickinspector/quickinspectorwidget.cpp b/plugins/quickinspector/quickinspectorwidget.cpp index 110f082120..897096addf 100644 --- a/plugins/quickinspector/quickinspectorwidget.cpp +++ b/plugins/quickinspector/quickinspectorwidget.cpp @@ -157,10 +157,8 @@ QuickInspectorWidget::QuickInspectorWidget(QWidget *parent) addAction(createSeparator(this)); addAction(ui->actionSlowDownMode); - m_stateManager.setDefaultSizes(ui->mainSplitter, UISizeVector() << "50%" - << "50%"); - m_stateManager.setDefaultSizes(ui->previewTreeSplitter, UISizeVector() << "50%" - << "50%"); + m_stateManager.setDefaultSizes(ui->mainSplitter, UISizeVector() << "50%" << "50%"); + m_stateManager.setDefaultSizes(ui->previewTreeSplitter, UISizeVector() << "50%" << "50%"); connect(ui->actionSaveAsImage, &QAction::triggered, this, &QuickInspectorWidget::saveAsImage); connect(ui->actionSaveAsImageWithDecoration, &QAction::triggered, this, &QuickInspectorWidget::saveAsImage); diff --git a/plugins/sceneinspector/sceneinspectorwidget.cpp b/plugins/sceneinspector/sceneinspectorwidget.cpp index 2c93f273ea..fe6df1ae27 100644 --- a/plugins/sceneinspector/sceneinspectorwidget.cpp +++ b/plugins/sceneinspector/sceneinspectorwidget.cpp @@ -107,10 +107,8 @@ SceneInspectorWidget::SceneInspectorWidget(QWidget *parent) else if (ui->sceneComboBox->currentIndex() >= 0) // no server-side selection yet, but there's data available sceneSelected(ui->sceneComboBox->currentIndex()); - m_stateManager.setDefaultSizes(ui->mainSplitter, UISizeVector() << "50%" - << "50%"); - m_stateManager.setDefaultSizes(ui->previewSplitter, UISizeVector() << "50%" - << "50%"); + m_stateManager.setDefaultSizes(ui->mainSplitter, UISizeVector() << "50%" << "50%"); + m_stateManager.setDefaultSizes(ui->previewSplitter, UISizeVector() << "50%" << "50%"); connect(ui->scenePropertyWidget, &PropertyWidget::tabsUpdated, this, &SceneInspectorWidget::propertyWidgetTabsChanged); diff --git a/plugins/statemachineviewer/statemachineviewerwidget.cpp b/plugins/statemachineviewer/statemachineviewerwidget.cpp index d9d6e08940..41c7abeb5b 100644 --- a/plugins/statemachineviewer/statemachineviewerwidget.cpp +++ b/plugins/statemachineviewer/statemachineviewerwidget.cpp @@ -219,10 +219,8 @@ StateMachineViewerWidget::StateMachineViewerWidget(QWidget *parent, Qt::WindowFl // share selection model new SelectionModelSyncer(this); - m_stateManager.setDefaultSizes(m_ui->verticalSplitter, UISizeVector() << "50%" - << "50%"); - m_stateManager.setDefaultSizes(m_ui->horizontalSplitter, UISizeVector() << "30%" - << "70%"); + m_stateManager.setDefaultSizes(m_ui->verticalSplitter, UISizeVector() << "50%" << "50%"); + m_stateManager.setDefaultSizes(m_ui->horizontalSplitter, UISizeVector() << "30%" << "70%"); loadSettings(); } diff --git a/plugins/textdocumentinspector/textdocumentinspectorwidget.cpp b/plugins/textdocumentinspector/textdocumentinspectorwidget.cpp index 74ade77f4f..b0f2f70958 100644 --- a/plugins/textdocumentinspector/textdocumentinspectorwidget.cpp +++ b/plugins/textdocumentinspector/textdocumentinspectorwidget.cpp @@ -65,8 +65,7 @@ TextDocumentInspectorWidget::TextDocumentInspectorWidget(QWidget *parent) ui->tabWidget->hide(); m_stateManager.setDefaultSizes(ui->mainSplitter, UISizeVector() << 280 << -1 << -1); - m_stateManager.setDefaultSizes(ui->structureSplitter, UISizeVector() << "50%" - << "50%"); + m_stateManager.setDefaultSizes(ui->structureSplitter, UISizeVector() << "50%" << "50%"); } TextDocumentInspectorWidget::~TextDocumentInspectorWidget() = default; diff --git a/plugins/translatorinspector/translatorinspectorwidget.cpp b/plugins/translatorinspector/translatorinspectorwidget.cpp index d4cf457d1b..5cca90ea21 100644 --- a/plugins/translatorinspector/translatorinspectorwidget.cpp +++ b/plugins/translatorinspector/translatorinspectorwidget.cpp @@ -78,8 +78,7 @@ TranslatorInspectorWidget::TranslatorInspectorWidget(QWidget *parent) new SearchLineController(ui->translationsSearchLine, ui->translationsView->model()); } - m_stateManager.setDefaultSizes(ui->mainSplitter, UISizeVector() << "50%" - << "50%"); + m_stateManager.setDefaultSizes(ui->mainSplitter, UISizeVector() << "50%" << "50%"); connect(ui->actionSendLanguageChange, &QAction::triggered, m_inspector, &TranslatorInspectorInterface::sendLanguageChangeEvent); connect(ui->actionReset, &QAction::triggered, m_inspector, &TranslatorInspectorInterface::resetTranslations); diff --git a/plugins/widgetinspector/widgetinspectorwidget.cpp b/plugins/widgetinspector/widgetinspectorwidget.cpp index 7302b391c9..370d5ecd01 100644 --- a/plugins/widgetinspector/widgetinspectorwidget.cpp +++ b/plugins/widgetinspector/widgetinspectorwidget.cpp @@ -134,10 +134,8 @@ WidgetInspectorWidget::WidgetInspectorWidget(QWidget *parent) updateActions(); - m_stateManager.setDefaultSizes(ui->mainSplitter, UISizeVector() << "50%" - << "50%"); - m_stateManager.setDefaultSizes(ui->previewSplitter, UISizeVector() << "50%" - << "50%"); + m_stateManager.setDefaultSizes(ui->mainSplitter, UISizeVector() << "50%" << "50%"); + m_stateManager.setDefaultSizes(ui->previewSplitter, UISizeVector() << "50%" << "50%"); ui->tabWidget->findChild()->hide(); connect(ui->widgetPropertyWidget, &PropertyWidget::tabsUpdated, this, &WidgetInspectorWidget::propertyWidgetTabsChanged); diff --git a/ui/codeeditor/codeeditor.cpp b/ui/codeeditor/codeeditor.cpp index 90b1cf98ae..e6435cf2e5 100644 --- a/ui/codeeditor/codeeditor.cpp +++ b/ui/codeeditor/codeeditor.cpp @@ -321,7 +321,7 @@ void CodeEditor::toggleFold(const QTextBlock &startBlock) // redraw document document()->markContentsDirty(startBlock.position(), endBlock.position() - startBlock.position() + 1); // update scrollbars - emit document()->documentLayout()->documentSizeChanged(document()->documentLayout()->documentSize()); + emit document() -> documentLayout()->documentSizeChanged(document()->documentLayout()->documentSize()); #else Q_UNUSED(startBlock); #endif diff --git a/ui/tools/messagehandler/messagehandlerwidget.cpp b/ui/tools/messagehandler/messagehandlerwidget.cpp index 044014bf7b..131775ead7 100644 --- a/ui/tools/messagehandler/messagehandlerwidget.cpp +++ b/ui/tools/messagehandler/messagehandlerwidget.cpp @@ -95,8 +95,7 @@ MessageHandlerWidget::MessageHandlerWidget(QWidget *parent) ui->categoriesView->setModel(ObjectBroker::model(QStringLiteral("com.kdab.GammaRay.LoggingCategoryModel"))); - m_stateManager.setDefaultSizes(ui->mainSplitter, UISizeVector() << "50%" - << "50%"); + m_stateManager.setDefaultSizes(ui->mainSplitter, UISizeVector() << "50%" << "50%"); m_stateManager.setDefaultSizes(ui->messageView->header(), UISizeVector() << -1 << 300 << -1 << -1 << -1); } diff --git a/ui/tools/objectinspector/objectinspectorwidget.cpp b/ui/tools/objectinspector/objectinspectorwidget.cpp index 9d4ba8d667..d6d7d11ea1 100644 --- a/ui/tools/objectinspector/objectinspectorwidget.cpp +++ b/ui/tools/objectinspector/objectinspectorwidget.cpp @@ -61,8 +61,7 @@ ObjectInspectorWidget::ObjectInspectorWidget(QWidget *parent) connect(ui->objectTreeView, &QWidget::customContextMenuRequested, this, &ObjectInspectorWidget::objectContextMenuRequested); - m_stateManager.setDefaultSizes(ui->mainSplitter, UISizeVector() << "60%" - << "40%"); + m_stateManager.setDefaultSizes(ui->mainSplitter, UISizeVector() << "60%" << "40%"); connect(ui->objectPropertyWidget, &PropertyWidget::tabsUpdated, this, &ObjectInspectorWidget::propertyWidgetTabsChanged); diff --git a/ui/uiintegration.cpp b/ui/uiintegration.cpp index 8e7066377d..714018c373 100644 --- a/ui/uiintegration.cpp +++ b/ui/uiintegration.cpp @@ -41,7 +41,7 @@ UiIntegration *UiIntegration::instance() void UiIntegration::requestNavigateToCode(const QUrl &url, int lineNumber, int columnNumber) { if (UiIntegration::instance()) - emit UiIntegration::instance()->navigateToCode(url, lineNumber, columnNumber); + emit UiIntegration::instance() -> navigateToCode(url, lineNumber, columnNumber); } bool UiIntegration::hasDarkUI()