Simplified composerView function

mhugent · mhugent · commit 03855f5edbf4 · 2010-04-20T09:07:51.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@13331 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp
@@ -607,7 +607,7 @@ void QgsComposerView::sendItemRemovedSignal( QgsComposerItem* item )
 
 QMainWindow* QgsComposerView::composerWindow()
 {
-  QObject* composerObject = 0;
+  QMainWindow* composerObject = 0;
   QObject* currentObject = parent();
   if ( !currentObject )
   {
@@ -616,14 +616,14 @@ QMainWindow* QgsComposerView::composerWindow()
 
   while ( true )
   {
-    if ( currentObject->parent() == 0 )
+    composerObject = qobject_cast<QMainWindow*>( currentObject );
+    if ( composerObject || currentObject->parent() == 0 )
     {
-      composerObject = currentObject;
-      break;
+      return composerObject;
     }
     currentObject = currentObject->parent();
   }
 
-  return qobject_cast<QMainWindow *>( composerObject );
+  return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -607,7 +607,7 @@ void QgsComposerView::sendItemRemovedSignal( QgsComposerItem* item )`
`607`	`607`
`608`	`608`	`QMainWindow* QgsComposerView::composerWindow()`
`609`	`609`	`{`
`610`		`- QObject* composerObject = 0;`
	`610`	`+ QMainWindow* composerObject = 0;`
`611`	`611`	`QObject* currentObject = parent();`
`612`	`612`	`if ( !currentObject )`
`613`	`613`	`{`
`@@ -616,14 +616,14 @@ QMainWindow* QgsComposerView::composerWindow()`
`616`	`616`
`617`	`617`	`while ( true )`
`618`	`618`	`{`
`619`		`- if ( currentObject->parent() == 0 )`
	`619`	`+ composerObject = qobject_cast<QMainWindow*>( currentObject );`
	`620`	`+ if ( composerObject \|\| currentObject->parent() == 0 )`
`620`	`621`	`{`
`621`		`- composerObject = currentObject;`
`622`		`- break;`
	`622`	`+ return composerObject;`
`623`	`623`	`}`
`624`	`624`	`currentObject = currentObject->parent();`
`625`	`625`	`}`
`626`	`626`
`627`		`- return qobject_cast<QMainWindow *>( composerObject );`
	`627`	`+ return 0;`
`628`	`628`	`}`
`629`	`629`