[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/libs
From:       Thomas Zander <zander () kde ! org>
Date:       2010-05-07 15:00:53
Message-ID: 20100507150053.3BF90AC8B9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1124023 by zander:

Rename KoChildrenData to KoShapeContainerDefaultModel

We decided this some months ago, only now got to it after trunk reopened.

 M  +2 -2      flake/CMakeLists.txt  
 D             flake/KoChildrenData.cpp  
 D             flake/KoChildrenData.h  
 M  +2 -2      flake/KoShapeContainer.cpp  
 A             flake/KoShapeContainerDefaultModel.cpp   \
flake/KoChildrenData.cpp#1124022 [License: LGPL (v2+)]  A             \
flake/KoShapeContainerDefaultModel.h   flake/KoChildrenData.h#1124022 [License: LGPL \
(v2+)]  M  +2 -2      kopageapp/KoPAPageContainerModel.h  


--- trunk/koffice/libs/flake/CMakeLists.txt #1124022:1124023
@@ -33,7 +33,7 @@
     KoShapeApplicationData.cpp
     KoShapeContainer.cpp
     KoShapeContainerModel.cpp
-    KoChildrenData.cpp
+    KoShapeContainerDefaultModel.cpp
     KoShapeGroup.cpp
     KoShapeManagerPaintingStrategy.cpp
     KoShapeManager.cpp
@@ -238,7 +238,7 @@
     KoToolSelection.h
     KoShapeContainer.h
     KoShapeContainerModel.h
-    KoChildrenData.h
+    KoShapeContainerDefaultModel.h
     KoShapeController.h
     KoShapeControllerBase.h
     KoShapeFactoryBase.h
--- trunk/koffice/libs/flake/KoShapeContainer.cpp #1124022:1124023
@@ -21,7 +21,7 @@
 #include "KoShapeContainer_p.h"
 #include "KoShapeContainerModel.h"
 #include "KoShapeBorderModel.h"
-#include "KoChildrenData.h"
+#include "KoShapeContainerDefaultModel.h"
 
 #include <QPointF>
 #include <QPainter>
@@ -71,7 +71,7 @@
     if (shape->parent() == this && childShapes().contains(shape))
         return;
     if (d->children == 0)
-        d->children = new KoChildrenData();
+        d->children = new KoShapeContainerDefaultModel();
     if (shape->parent() && shape->parent() != this)
         shape->parent()->removeChild(shape);
     d->children->add(shape);
--- trunk/koffice/libs/kopageapp/KoPAPageContainerModel.h #1124022:1124023
@@ -20,9 +20,9 @@
 #ifndef KOPAPAGECONTAINERMODEL_H
 #define KOPAPAGECONTAINERMODEL_H
 
-#include <KoChildrenData.h>
+#include <KoShapeContainerDefaultModel.h>
 
-class KoPAPageContainerModel : public KoChildrenData
+class KoPAPageContainerModel : public KoShapeContainerDefaultModel
 {
 public:
     KoPAPageContainerModel();


[prev in list] [next in list] [prev in thread] [next in thread]