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

QmlDesigner: modernize code

Browse Source 
- no behavior changes
 - moved a slot to a lambda
 - Using QPointer instead of raw pointer to trigger
   assert if dangling pointer is accessed.
   Refactoring the code might accidentally trigger a
   delete of the QWidget.

Change-Id: Idf711da92e13cf81dd718ae9e034bca7f6d26220
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Tim Jenssen
2016-05-10 11:45:26 +02:00
parent cacdcf7160
commit 221f59e152
2 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/qmldesigner/designmodewidget.cpp
View File

@@ -123,20 +123,17 @@ QList<QToolButton *> DesignerSideBarItem::createToolBarWidgets()
}
// ---------- DesignModeWidget
DesignModeWidget::DesignModeWidget(QWidget *parent) :
QWidget(parent),
m_mainSplitter(0),
m_toolBar(new Core::EditorToolBar(this)),
m_crumbleBar(new CrumbleBar(this)),
m_isDisabled(false),
m_showSidebars(true),
m_initStatus(NotInitialized),
m_warningWidget(0),
m_navigatorHistoryCounter(-1),
m_keepNavigatorHistory(false)
DesignModeWidget::DesignModeWidget(QWidget *parent)
: QWidget(parent)
, m_toolBar(new Core::EditorToolBar(this))
, m_crumbleBar(new CrumbleBar(this))
{
connect(viewManager().nodeInstanceView(), &NodeInstanceView::qmlPuppetCrashed,
this, &DesignModeWidget::showQmlPuppetCrashedError);
[=]() {
RewriterError error(tr("Qt Quick emulation layer crashed"));
updateErrorStatus(QList<RewriterError>() << error);
}
);
}
DesignModeWidget::~DesignModeWidget()
@@ -275,9 +272,9 @@ void DesignModeWidget::setup()
QList<Core::INavigationWidgetFactory *> factories =
ExtensionSystem::PluginManager::getObjects<Core::INavigationWidgetFactory>();
QWidget *openDocumentsWidget = 0;
QWidget *projectsExplorer = 0;
QWidget *fileSystemExplorer = 0;
QWidget *openDocumentsWidget = nullptr;
QWidget *projectsExplorer = nullptr;
QWidget *fileSystemExplorer = nullptr;
foreach (Core::INavigationWidgetFactory *factory, factories) {
Core::NavigationView navigationView;
@@ -414,16 +411,6 @@ void DesignModeWidget::setup()
show();
}
void DesignModeWidget::showQmlPuppetCrashedError()
{
QList<RewriterError> errorList;
RewriterError error(tr("Qt Quick emulation layer crashed"));
errorList.append(error);
disableWidgets();
showMessageBox(errorList);
}
void DesignModeWidget::toolBarOnGoBackClicked()
{
if (m_navigatorHistoryCounter > 0) {