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

[Andi Fischer]

SVN commit 1318432 by fischer:

Smale changes to include statements.

 M  +7 -7      dialogs/umlwidgetstylepage.cpp  
 M  +1 -1      toolbarstate.cpp  
 M  +1 -2      toolbarstatearrow.cpp  
 M  +4 -3      toolbarstatearrow.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlwidgetstylepage.cpp #1318431:1318432
@@ -21,13 +21,13 @@
 #include <kcolorbutton.h>
 #include <KIntSpinBox>
 
-#include <QtGui/QLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QCheckBox>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QGridLayout>
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QLabel>
+#include <QLayout>
+#include <QPushButton>
+#include <QVBoxLayout>
 
 /**
  *   Constructor - Observe a UMLWidget.
--- trunk/KDE/kdesdk/umbrello/umbrello/toolbarstate.cpp #1318431:1318432
@@ -479,7 +479,7 @@
 {
     delete m_pMouseEvent;
 
-    uDebug() << "[PORT] Check if scenePos works like view->inverseWorldMatrix().map()";
+    //:TODO: uDebug() << "[PORT] Check if scenePos works like view->inverseWorldMatrix().map()";
     // Using copy constructor here.
     m_pMouseEvent = new UMLSceneMouseEvent(type);
     m_pMouseEvent->setPos(ome->pos());
--- trunk/KDE/kdesdk/umbrello/umbrello/toolbarstatearrow.cpp #1318431:1318432
@@ -13,8 +13,7 @@
 
 // app includes
 #include "associationwidget.h"
-#include "uml.h"
-#include "umlview.h"
+#include "umlscene.h"
 #include "umlwidget.h"
 
 /**
--- trunk/KDE/kdesdk/umbrello/umbrello/toolbarstatearrow.h #1318431:1318432
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2004-2009                                               *
+ *   copyright (C) 2004-2012                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -12,10 +12,11 @@
 #define TOOLBARSTATEARROW_H
 
 #include "toolbarstate.h"
-#include "umlscene.h"
 
-#include <QtCore/QList>
+#include <QList>
 
+class UMLScene;
+
 /**
  * Arrow tool for select, move and resize widgets and associations.
  * Arrow tool delegates the event handling in the widgets and associations. When