[QGIS Commit] r13331 - trunk/qgis/src/gui

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2010-04-20 05:07:51 -0400 (Tue, 20 Apr 2010)
New Revision: 13331

Modified:
   trunk/qgis/src/gui/qgscomposerview.cpp
Log:
Simplified composerView function

Modified: trunk/qgis/src/gui/qgscomposerview.cpp
===================================================================
--- trunk/qgis/src/gui/qgscomposerview.cpp	2010-04-20 08:08:18 UTC (rev 13330)
+++ trunk/qgis/src/gui/qgscomposerview.cpp	2010-04-20 09:07:51 UTC (rev 13331)
@@ -607,7 +607,7 @@
 
 QMainWindow* QgsComposerView::composerWindow()
 {
-  QObject* composerObject = 0;
+  QMainWindow* composerObject = 0;
   QObject* currentObject = parent();
   if ( !currentObject )
   {
@@ -616,14 +616,14 @@
 
   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;
 }