From 2f79b60fd7c537309dd7c22864a8529b32653866 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Wed, 24 Mar 2010 17:25:00 +0100
Subject: [PATCH] QmlDesigner: fix warnings
---
src/plugins/qmldesigner/designmodewidget.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp
index ffdf74c35db..ba77b5c5786 100644
--- a/src/plugins/qmldesigner/designmodewidget.cpp
+++ b/src/plugins/qmldesigner/designmodewidget.cpp
@@ -446,12 +446,14 @@ void DesignModeWidget::setCurrentDocument(DesignDocumentController *newDesignDoc
saveSettings();
}
- disconnect(currentDesignDocumentController(), SIGNAL(undoAvailable(bool)),
- this, SLOT(undoAvailable(bool)));
- disconnect(currentDesignDocumentController(), SIGNAL(redoAvailable(bool)),
- this, SLOT(redoAvailable(bool)));
- disconnect(currentDesignDocumentController(), SIGNAL(deleteAvailable(bool)),
- this, SLOT(deleteAvailable(bool)));
+ if (currentDesignDocumentController()) {
+ disconnect(currentDesignDocumentController(), SIGNAL(undoAvailable(bool)),
+ this, SLOT(undoAvailable(bool)));
+ disconnect(currentDesignDocumentController(), SIGNAL(redoAvailable(bool)),
+ this, SLOT(redoAvailable(bool)));
+ disconnect(currentDesignDocumentController(), SIGNAL(deleteAvailable(bool)),
+ this, SLOT(deleteAvailable(bool)));
+ }
m_currentDesignDocumentController = newDesignDocumentController;
@@ -459,8 +461,6 @@ void DesignModeWidget::setCurrentDocument(DesignDocumentController *newDesignDoc
this, SLOT(undoAvailable(bool)));
connect(currentDesignDocumentController(), SIGNAL(redoAvailable(bool)),
this, SLOT(redoAvailable(bool)));
- connect(currentDesignDocumentController(), SIGNAL(deleteAvailable(bool)),
- this, SLOT(deleteAvailable(bool)));
if (m_currentDesignDocumentController) {
--
GitLab