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

[Andi Fischer]

SVN commit 1292316 by fischer:

Differences to gsoc-branch reduced.

 M  +3 -3      cmds/widget/cmd_changeFontSelection.h  
 M  +5 -5      cmds/widget/cmd_create_widget.cpp  
 M  +4 -4      cmds/widget/cmd_create_widget.h  
 M  +1 -1      umlscene.cpp  
 M  +1 -1      widgets/umlwidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/cmds/widget/cmd_changeFontSelection.h #1292315:1292316
@@ -15,21 +15,21 @@
 #include <QtGui/QFont>
 
 class UMLDoc;
-class UMLView;
+class UMLScene;
 
 namespace Uml
 {
     class CmdChangeFontSelection: public QUndoCommand
     {
         public:
-            CmdChangeFontSelection(UMLDoc* doc, UMLView* view, QFont fon);
+            CmdChangeFontSelection(UMLDoc* doc, UMLScene* scene, QFont fon);
 
             void undo();
             void redo();
 
         private:
             UMLDoc*  m_doc;
-            UMLView* m_view;
+            UMLScene* m_scene;
             QFont    m_newFont;
             QFont    m_oldFont;
     };
--- trunk/KDE/kdesdk/umbrello/umbrello/cmds/widget/cmd_create_widget.cpp #1292315:1292316
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2002-2011                                               *
+ *   copyright (C) 2002-2012                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -12,7 +12,7 @@
 
 // app includes
 #include "umlwidget.h"
-#include "umlview.h"
+#include "umlscene.h"
 
 // kde includes
 #include <klocale.h>
@@ -20,8 +20,8 @@
 namespace Uml
 {
 
-    CmdCreateWidget::CmdCreateWidget(UMLView* view, UMLWidget* widget)
-      : m_view(view),
+    CmdCreateWidget::CmdCreateWidget(UMLScene* scene, UMLWidget* widget)
+      : m_scene(scene),
         m_widget(widget)
     {
         setText(i18n("Create widget : %1", widget->name()));
@@ -29,7 +29,7 @@
 
     CmdCreateWidget::~CmdCreateWidget()
     {
-        //m_view->removeWidget(m_widget);
+        //m_scene->removeWidget(m_widget);
     }
 
     /**
--- trunk/KDE/kdesdk/umbrello/umbrello/cmds/widget/cmd_create_widget.h #1292315:1292316
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2002-2011                                               *
+ *   copyright (C) 2002-2012                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -14,21 +14,21 @@
 #include <QtGui/QUndoCommand>
 
 class UMLWidget;
-class UMLView;
+class UMLScene;
 
 namespace Uml
 {
     class CmdCreateWidget : public QUndoCommand
     {
         public:
-            CmdCreateWidget(UMLView* view, UMLWidget* widget);
+            CmdCreateWidget(UMLScene* scene, UMLWidget* widget);
             ~CmdCreateWidget();
 
             void redo();
             void undo();
 
         private:
-            UMLView*    m_view;
+            UMLScene*   m_scene;
             UMLWidget*  m_widget;
     };
 }
--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.cpp #1292315:1292316
@@ -667,7 +667,7 @@
     m_WidgetList.append(w);
     m_doc->setModified();
 
-    UMLApp::app()->executeCommand(new CmdCreateWidget(this->view(), w));
+    UMLApp::app()->executeCommand(new CmdCreateWidget(this, w));
 }
 
 /**
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.cpp #1292315:1292316
@@ -440,7 +440,7 @@
     case ListPopupMenu::mt_Change_Font_Selection: {
         QFont font = UMLWidget::font();
         if (KFontDialog::getFont(font, KFontChooser::NoDisplayFlags, m_scene->view())) {
-            UMLApp::app()->executeCommand(new CmdChangeFontSelection(m_doc, m_scene->view(), font));
+            UMLApp::app()->executeCommand(new CmdChangeFontSelection(m_doc, m_scene, font));
         }
     }
     break;