[Uml-devel] KDE/kdesdk/umbrello/umbrello/widgets

[Andi Fischer]

SVN commit 1296774 by fischer:

Dependency to docwindow.h reduced.

 M  +13 -18    objectnodewidget.cpp  
 M  +15 -15    objectwidget.cpp  
 M  +26 -28    umlwidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectnodewidget.cpp #1296773:1296774
@@ -11,28 +11,24 @@
 // own header
 #include "objectnodewidget.h"
 
-// qt includes
-#include <QtCore/QPointer>
-#include <QtGui/QPainter>
-
-// kde includes
-#include <klocale.h>
-#include <kinputdialog.h>
-#include <kdialog.h>
-#include <kcombobox.h>
-
-#include <cmath>
-
 // app includes
 #include "debug_utils.h"
 #include "dialog_utils.h"
+#include "listpopupmenu.h"
+#include "objectnodedialog.h"
 #include "uml.h"
 #include "umldoc.h"
-#include "docwindow.h"
 #include "umlview.h"
-#include "listpopupmenu.h"
-#include "objectnodedialog.h"
 
+// kde includes
+#include <klocale.h>
+#include <kinputdialog.h>
+#include <kdialog.h>
+
+// qt includes
+#include <QtCore/QPointer>
+#include <QtGui/QPainter>
+
 ObjectNodeWidget::ObjectNodeWidget(UMLScene * scene, ObjectNodeType objectNodeType, Uml::IDType id )
   : UMLWidget(scene, WidgetBase::wt_ObjectNode, id)
 {
@@ -211,12 +207,11 @@
 
 void ObjectNodeWidget::showPropertiesDialog()
 {
-    DocWindow *docwindow = UMLApp::app()->docWindow();
-    docwindow->updateDocumentation(false);
+    umlScene()->updateDocumentation(false);
 
     QPointer<ObjectNodeDialog> dialog = new ObjectNodeDialog(UMLApp::app()->currentView(), this);
     if (dialog->exec() && dialog->getChangesMade()) {
-        docwindow->showDocumentation(this, true);
+        umlScene()->showDocumentation(this, true);
         UMLApp::app()->document()->setModified(true);
     }
     delete dialog;
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectwidget.cpp #1296773:1296774
@@ -11,25 +11,26 @@
 // own header file
 #include "objectwidget.h"
 
-// system includes
-#include <QtCore/QPointer>
-#include <QtGui/QPainter>
-#include <QtGui/QValidator>
-#include <klocale.h>
-#include <kinputdialog.h>
-
 // local includes
+#include "classpropdlg.h"
 #include "debug_utils.h"
+#include "listpopupmenu.h"
 #include "objectwidgetcontroller.h"
 #include "seqlinewidget.h"
-#include "umlview.h"
+#include "uml.h"
 #include "umldoc.h"
-#include "uml.h"
 #include "umlobject.h"
-#include "listpopupmenu.h"
-#include "docwindow.h"
-#include "classpropdlg.h"
+#include "umlview.h"
 
+// kde includes
+#include <klocale.h>
+#include <kinputdialog.h>
+
+// qt includes
+#include <QtCore/QPointer>
+#include <QtGui/QPainter>
+#include <QtGui/QValidator>
+
 /**
  * The number of pixels margin between the lowest message
  * and the bottom of the vertical line
@@ -215,11 +216,10 @@
 
 void ObjectWidget::showPropertiesDialog()
 {
-    DocWindow *docwindow = UMLApp::app()->docWindow();
-    docwindow->updateDocumentation(false);
+    umlScene()->updateDocumentation(false);
     QPointer<ClassPropDlg> dlg = new ClassPropDlg((QWidget*)UMLApp::app(), this);
     if (dlg->exec()) {
-        docwindow->showDocumentation(this, true);
+        umlScene()->showDocumentation(this, true);
         UMLApp::app()->document()->setModified(true);
     }
     dlg->close();
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.cpp #1296773:1296774
@@ -8,38 +8,37 @@
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
-// own header file
 #include "umlwidget.h"
-// qt includes
-#include <QtCore/QPointer>
-#include <QtGui/QPainter>
-#include <QtGui/QColor>
-#include <QtGui/QMouseEvent>
-// kde includes
-#include <kcolordialog.h>
-#include <kfontdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+
 // local includes
-#include "debug_utils.h"
-#include "umlwidgetcontroller.h"
-#include "umlobject.h"
+#include "associationwidget.h"
 #include "classifier.h"
-#include "uniqueid.h"
+#include "classpropdlg.h"
+#include "cmds.h"
+#include "debug_utils.h"
+#include "floatingtextwidget.h"
+#include "idchangelog.h"
+#include "listpopupmenu.h"
+#include "settingsdlg.h"
 #include "uml.h"
 #include "umldoc.h"
+#include "umlobject.h"
 #include "umlview.h"
-#include "umlclassifierlistitemlist.h"
-#include "listpopupmenu.h"
-#include "associationwidget.h"
-#include "settingsdlg.h"
-#include "codedocument.h"
-#include "floatingtextwidget.h"
-#include "docwindow.h"
-#include "classpropdlg.h"
-#include "idchangelog.h"
-#include "cmds.h"
+#include "umlwidgetcontroller.h"
+#include "uniqueid.h"
 
+// kde includes
+#include <kcolordialog.h>
+#include <kfontdialog.h>
+#include <klocale.h>
+#include <kmessagebox.h>
+
+// qt includes
+#include <QtCore/QPointer>
+#include <QtGui/QPainter>
+#include <QtGui/QColor>
+#include <QtGui/QMouseEvent>
+
 using namespace Uml;
 
 const UMLSceneSize UMLWidget::DefaultMinimumSize(50, 20);
@@ -856,12 +855,11 @@
 {
     // will already be selected so make sure docWindow updates the doc
     // back it the widget
-    DocWindow *docwindow = UMLApp::app()->docWindow();
-    docwindow->updateDocumentation(false);
+    umlScene()->updateDocumentation(false);
     QPointer<ClassPropDlg> dlg = new ClassPropDlg((QWidget*)UMLApp::app(), this);
 
     if (dlg->exec()) {
-        docwindow->showDocumentation(umlObject() , true);
+        umlScene()->showDocumentation(umlObject() , true);
         m_doc->setModified(true);
     }
     dlg->close(); //wipe from memory