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

ScxmlEditor: Fix compile with Qt5.6

Browse Source 
Change-Id: I07ed1737b9a72338aa74aab0c6277df414d95cb5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Christian Stenger
2016-09-19 07:48:42 +02:00
parent 055c940ea9
commit 950b665741
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/scxmleditor/common/navigator.cpp
View File

@@ -53,13 +53,13 @@ void Navigator::setCurrentView(GraphicsView *view)
m_currentView = view; m_currentView = view;
if (m_currentView) { if (m_currentView) {
connect(m_currentView, &GraphicsView::viewChanged, m_ui.m_navigatorView, &NavigatorGraphicsView::setMainViewPolygon); connect(m_currentView.data(), &GraphicsView::viewChanged, m_ui.m_navigatorView, &NavigatorGraphicsView::setMainViewPolygon);
connect(m_currentView, &GraphicsView::zoomPercentChanged, m_ui.m_navigatorSlider, &NavigatorSlider::setSliderValue); connect(m_currentView.data(), &GraphicsView::zoomPercentChanged, m_ui.m_navigatorSlider, &NavigatorSlider::setSliderValue);
connect(m_ui.m_navigatorSlider, &NavigatorSlider::valueChanged, m_currentView, &GraphicsView::zoomTo); connect(m_ui.m_navigatorSlider, &NavigatorSlider::valueChanged, m_currentView.data(), &GraphicsView::zoomTo);
connect(m_ui.m_navigatorView, &NavigatorGraphicsView::moveMainViewTo, m_currentView, &GraphicsView::moveToPoint); connect(m_ui.m_navigatorView, &NavigatorGraphicsView::moveMainViewTo, m_currentView.data(), &GraphicsView::moveToPoint);
connect(m_ui.m_navigatorView, &NavigatorGraphicsView::zoomIn, m_currentView, &GraphicsView::zoomIn); connect(m_ui.m_navigatorView, &NavigatorGraphicsView::zoomIn, m_currentView.data(), &GraphicsView::zoomIn);
connect(m_ui.m_navigatorView, &NavigatorGraphicsView::zoomOut, m_currentView, &GraphicsView::zoomOut); connect(m_ui.m_navigatorView, &NavigatorGraphicsView::zoomOut, m_currentView.data(), &GraphicsView::zoomOut);
} }
} }

2
src/plugins/scxmleditor/common/search.cpp
View File

@@ -75,7 +75,7 @@ void Search::setDocument(ScxmlDocument *document)
void Search::setGraphicsScene(GraphicsScene *scene) void Search::setGraphicsScene(GraphicsScene *scene)
{ {
m_scene = scene; m_scene = scene;
connect(m_ui.m_searchView, &ScxmlEditor::OutputPane::TableView::mouseExited, m_scene, &GraphicsScene::unhighlightAll); connect(m_ui.m_searchView, &ScxmlEditor::OutputPane::TableView::mouseExited, m_scene.data(), &GraphicsScene::unhighlightAll);
} }
void Search::rowEntered(const QModelIndex &index) void Search::rowEntered(const QModelIndex &index)

2
src/plugins/scxmleditor/common/shapestoolbox.cpp
View File

@@ -49,7 +49,7 @@ void ShapesToolbox::setUIFactory(ScxmlEditor::PluginInterface::ScxmlUiFactory *f
QTC_ASSERT(factory, return); QTC_ASSERT(factory, return);
m_shapeProvider = static_cast<PluginInterface::ShapeProvider*>(factory->object("shapeProvider")); m_shapeProvider = static_cast<PluginInterface::ShapeProvider*>(factory->object("shapeProvider"));
connect(m_shapeProvider, &PluginInterface::ShapeProvider::changed, this, &ShapesToolbox::initView); connect(m_shapeProvider.data(), &PluginInterface::ShapeProvider::changed, this, &ShapesToolbox::initView);
initView(); initView();
} }

4
src/plugins/scxmleditor/common/structuremodel.cpp
View File

@@ -50,8 +50,8 @@ void StructureModel::setDocument(ScxmlDocument *document)
m_document = document; m_document = document;
if (m_document) { if (m_document) {
connect(m_document, &ScxmlDocument::beginTagChange, this, &StructureModel::beginTagChange); connect(m_document.data(), &ScxmlDocument::beginTagChange, this, &StructureModel::beginTagChange);
connect(m_document, &ScxmlDocument::endTagChange, this, &StructureModel::endTagChange); connect(m_document.data(), &ScxmlDocument::endTagChange, this, &StructureModel::endTagChange);
} }
endResetModel(); endResetModel();
} }

4
src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp
View File

@@ -313,8 +313,8 @@ void GraphicsScene::setDocument(ScxmlDocument *document)
void GraphicsScene::connectDocument() void GraphicsScene::connectDocument()
{ {
if (m_document) { if (m_document) {
connect(m_document, &ScxmlDocument::beginTagChange, this, &GraphicsScene::beginTagChange); connect(m_document.data(), &ScxmlDocument::beginTagChange, this, &GraphicsScene::beginTagChange);
connect(m_document, &ScxmlDocument::endTagChange, this, &GraphicsScene::endTagChange); connect(m_document.data(), &ScxmlDocument::endTagChange, this, &GraphicsScene::endTagChange);
} }
} }

6
src/plugins/scxmleditor/plugin_interface/warningitem.cpp
View File

@@ -44,7 +44,7 @@ WarningItem::WarningItem(QGraphicsItem *parent)
if (sc) { if (sc) {
sc->addWarningItem(this); sc->addWarningItem(this);
m_warningModel = sc->warningModel(); m_warningModel = sc->warningModel();
connect(m_warningModel, &OutputPane::WarningModel::modelCleared, this, &WarningItem::check); connect(m_warningModel.data(), &OutputPane::WarningModel::modelCleared, this, &WarningItem::check);
} }
setWarningActive(false); setWarningActive(false);
} }
@@ -82,7 +82,7 @@ QVariant WarningItem::itemChange(GraphicsItemChange change, const QVariant &valu
if (sc) { if (sc) {
sc->addWarningItem(this); sc->addWarningItem(this);
m_warningModel = sc->warningModel(); m_warningModel = sc->warningModel();
connect(m_warningModel, &OutputPane::WarningModel::modelCleared, this, &WarningItem::check); connect(m_warningModel.data(), &OutputPane::WarningModel::modelCleared, this, &WarningItem::check);
} }
break; break;
} }
@@ -141,7 +141,7 @@ void WarningItem::setWarningActive(bool active)
{ {
if (active && !m_warning && m_warningModel) { if (active && !m_warning && m_warningModel) {
m_warning = m_warningModel->createWarning(m_severity, m_typeName, m_reason, m_description); m_warning = m_warningModel->createWarning(m_severity, m_typeName, m_reason, m_description);
connect(m_warning, &OutputPane::Warning::dataChanged, this, &WarningItem::checkVisibility); connect(m_warning.data(), &OutputPane::Warning::dataChanged, this, &WarningItem::checkVisibility);
} else if (!active && m_warning) { } else if (!active && m_warning) {
m_warning->deleteLater(); m_warning->deleteLater();
m_warning = nullptr; m_warning = nullptr;

2
src/plugins/scxmleditor/scxmleditordocument.cpp
View File

@@ -52,7 +52,7 @@ ScxmlEditorDocument::ScxmlEditorDocument(MainWidget *designWidget, QObject *pare
// Designer needs UTF-8 regardless of settings. // Designer needs UTF-8 regardless of settings.
setCodec(QTextCodec::codecForName("UTF-8")); setCodec(QTextCodec::codecForName("UTF-8"));
connect(m_designWidget, &Common::MainWidget::dirtyChanged, this, [this]{ connect(m_designWidget.data(), &Common::MainWidget::dirtyChanged, this, [this]{
emit changed(); emit changed();
}); });
} }