[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

Minor #include cleanup.


  M +1 -0      umldoc.cpp   1.181
  M +13 -8     umllistview.h   1.41
  M +2 -0      umllistviewitem.h   1.14
  M +1 -1      umllistviewitemlist.h   1.6


--- kdesdk/umbrello/umbrello/umldoc.cpp  #1.180:1.181
@@ -58,4 +58,5 @@
 #include "uml.h"
 #include "umllistview.h"
+#include "umllistviewitem.h"
 #include "umlview.h"
 #include "usecase.h"

--- kdesdk/umbrello/umbrello/umllistview.h  #1.40:1.41
@@ -11,7 +11,9 @@
 #define UMLLISTVIEW_H
 
-#include "umllistviewitemlist.h"
-#include "umllistviewitem.h"
+#include <qdom.h>
+#include <qpixmap.h>
 #include <klistview.h>
+#include "umlnamespace.h"
+#include "umllistviewitemlist.h"
 
 /**
@@ -26,4 +28,6 @@
  */
  
+class QPoint;
+class QMouseEvent;
 class IDChangeLog;
 class ListPopupMenu;
@@ -32,5 +36,5 @@ class UMLDoc;
 class UMLListViewItem;
 class UMLView;
-
+class UMLObject;
 
 class UMLListView : public KListView {
@@ -180,20 +184,20 @@ class UMLListView : public KListView {
          * Returns true if the listview type also has a widget representation in diagrams.
          */
-        static bool typeIsCanvasWidget(ListView_Type type);
+        static bool typeIsCanvasWidget(Uml::ListView_Type type);
 
         /**
          * Returns true if the listview type is a logical, usecase or component folder.
          */
-        static bool typeIsFolder(ListView_Type type);
+        static bool typeIsFolder(Uml::ListView_Type type);
 
         /**
          * Returns true if the listview type is a diagram.
          */
-        static bool typeIsDiagram(ListView_Type type);
+        static bool typeIsDiagram(Uml::ListView_Type type);
 
         /**
          * Returns true if the listview type is an attribute, operation, or template.
          */
-        static bool typeIsClassifierList(ListView_Type type);
+        static bool typeIsClassifierList(Uml::ListView_Type type);
 
         /**
@@ -503,5 +507,6 @@ public slots:
          * Used by findView().
          */
-        UMLListViewItem* recursiveSearchForView(UMLListViewItem* folder, ListView_Type type, int id);
+        UMLListViewItem* recursiveSearchForView(UMLListViewItem* folder,
+                                                Uml::ListView_Type type, int id);
 
 };

--- kdesdk/umbrello/umbrello/umllistviewitem.h  #1.13:1.14
@@ -15,5 +15,7 @@
 #include "umlnamespace.h"
 
+// forward declarations
 class UMLListView;
+class UMLObject;
 
 /**

--- kdesdk/umbrello/umbrello/umllistviewitemlist.h  #1.5:1.6
@@ -20,5 +20,5 @@
 #define UMLLISTVIEWITEMLIST_H
 
-//#include "umllistviewitem.h"
+#include <qptrlist.h>
 
 class UMLListViewItem;