feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: Modernize

Browse Source 
override, auto, nullptr, member initializers.

Change-Id: I04c6ebb683849568973bd7782fb5a3279267141e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Orgad Shaneh
2018-09-20 01:16:01 +03:00
committed by Orgad Shaneh
parent 439bc225e1
commit 41dee83bec
63 changed files with 261 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/texteditor/outlinefactory.cpp
View File

@@ -134,7 +134,7 @@ void OutlineWidgetStack::restoreSettings(QSettings *settings, int position)
}
toggleSyncButton()->setChecked(syncWithEditor);
if (IOutlineWidget *outlineWidget = qobject_cast<IOutlineWidget*>(currentWidget()))
if (auto outlineWidget = qobject_cast<IOutlineWidget*>(currentWidget()))
outlineWidget->restoreSettings(m_widgetSettings);
}
@@ -146,14 +146,14 @@ bool OutlineWidgetStack::isCursorSynchronized() const
void OutlineWidgetStack::toggleCursorSynchronization()
{
m_syncWithEditor = !m_syncWithEditor;
if (IOutlineWidget *outlineWidget = qobject_cast<IOutlineWidget*>(currentWidget()))
if (auto outlineWidget = qobject_cast<IOutlineWidget*>(currentWidget()))
outlineWidget->setCursorSynchronization(m_syncWithEditor);
}
void OutlineWidgetStack::updateFilterMenu()
{
m_filterMenu->clear();
if (IOutlineWidget *outlineWidget = qobject_cast<IOutlineWidget*>(currentWidget())) {
if (auto outlineWidget = qobject_cast<IOutlineWidget*>(currentWidget())) {
foreach (QAction *filterAction, outlineWidget->filterMenuActions()) {
m_filterMenu->addAction(filterAction);
}
@@ -163,7 +163,7 @@ void OutlineWidgetStack::updateFilterMenu()
void OutlineWidgetStack::updateCurrentEditor(Core::IEditor *editor)
{
IOutlineWidget *newWidget = 0;
IOutlineWidget *newWidget = nullptr;
if (editor) {
for (IOutlineWidgetFactory *widgetFactory : g_outlineWidgetFactories) {
@@ -176,7 +176,7 @@ void OutlineWidgetStack::updateCurrentEditor(Core::IEditor *editor)
if (newWidget != currentWidget()) {
// delete old widget
if (IOutlineWidget *outlineWidget = qobject_cast<IOutlineWidget*>(currentWidget())) {
if (auto outlineWidget = qobject_cast<IOutlineWidget*>(currentWidget())) {
QVariantMap widgetSettings = outlineWidget->settings();
for (auto iter = widgetSettings.constBegin(); iter != widgetSettings.constEnd(); ++iter)
m_widgetSettings.insert(iter.key(), iter.value());
@@ -205,7 +205,7 @@ OutlineFactory::OutlineFactory()
Core::NavigationView OutlineFactory::createWidget()
{
Core::NavigationView n;
OutlineWidgetStack *placeHolder = new OutlineWidgetStack(this);
auto placeHolder = new OutlineWidgetStack(this);
n.widget = placeHolder;
n.dockToolBarWidgets.append(placeHolder->filterButton());
n.dockToolBarWidgets.append(placeHolder->toggleSyncButton());
@@ -214,14 +214,14 @@ Core::NavigationView OutlineFactory::createWidget()
void OutlineFactory::saveSettings(QSettings *settings, int position, QWidget *widget)
{
OutlineWidgetStack *widgetStack = qobject_cast<OutlineWidgetStack *>(widget);
auto widgetStack = qobject_cast<OutlineWidgetStack *>(widget);
Q_ASSERT(widgetStack);
widgetStack->saveSettings(settings, position);
}
void OutlineFactory::restoreSettings(QSettings *settings, int position, QWidget *widget)
{
OutlineWidgetStack *widgetStack = qobject_cast<OutlineWidgetStack *>(widget);
auto widgetStack = qobject_cast<OutlineWidgetStack *>(widget);
Q_ASSERT(widgetStack);
widgetStack->restoreSettings(settings, position);
}