[Uml-devel] branches/work/soc-umbrello (silent)

[Gopala Krishna A]

SVN commit 988264 by gopala:

SVN_SILENT: Manually merged actually. For completion sake marking it as
            "only recorded svn merge".
Recorded merge of revisions 972572,972879 via svnmerge from 
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r972572 | fischer | 2009-05-25 15:55:54 +0530 (Mon, 25 May 2009) | 1 line
  
  Some Kryzy complaints about crashy code (check 5)fixed.
........
  r972879 | fischer | 2009-05-26 03:15:14 +0530 (Tue, 26 May 2009) | 1 line
  
  Some Kryzy complaints about crashy code (check 5)fixed.
........


 _M            . (directory)  
 M  +6 -4      umbrello/umlscene.cpp  
 M  +6 -3      umbrello/widgets/statewidget.cpp  


** branches/work/soc-umbrello #property svnmerge-integrated
   - /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119,911086,911706-911805,912902,913652,914852-917492,918579-919414,920540-921357,922431,922854-927155,928929-928936,931178-937536,937636,937969-941130,941971,942048-942637,943412,945536-946356,948572-948599,949430,951335-951484,952053-952131,952436-953088,956010-956619,957386,958937,961888,962900,963206-963898,964692,971486
   + /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119,911086,911706-911805,912902,913652,914852-917492,918579-919414,920540-921357,922431,922854-927155,928929-928936,931178-937536,937636,937969-941130,941971,942048-942637,943412,945536-946356,948572-948599,949430,951335-951484,952053-952131,952436-953088,956010-956619,957386,958937,961888,962900,963206-963898,964692,971486,972572-972879
--- branches/work/soc-umbrello/umbrello/umlscene.cpp #988263:988264
@@ -3113,11 +3113,13 @@
 {
     // Be explict to avoid confusion
     QWidget *parent = activeView();
-    UMLViewDialog dlg(parent, this);
-    if (dlg.exec()) {
-        return true;
+    bool success = false;
+    QPointer<UMLViewDialog> dlg = new UMLViewDialog(parent, this);
+    if (dlg->exec() == QDialog::Accepted) {
+        success = true;
     }
-    return false;
+    delete dlg;
+    return success;
 }
 
 
--- branches/work/soc-umbrello/umbrello/widgets/statewidget.cpp #988263:988264
@@ -23,7 +23,10 @@
 #include "umlview.h"
 #include "model_utils.h"  // for ENUM_NAME only
 
-// kde includes
+// qt includes
+#include <QtCore/QPointer>
+
+#// kde includes
 #include <klocale.h>
 #include <kinputdialog.h>
 
@@ -313,8 +316,8 @@
     DocWindow *docwindow = UMLApp::app()->getDocWindow();
     docwindow->updateDocumentation(false);
 
-    StateDialog dialog(umlScene()->activeView(), this);
-    if (dialog.exec() && dialog.getChangesMade()) {
+    QPointer<StateDialog> dialog = new StateDialog(umlScene()->activeView(), this);
+    if (dialog->exec() && dialog->getChangesMade()) {
         docwindow->showDocumentation(this, true);
         UMLApp::app()->getDocument()->setModified(true);
     }