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

[Oliver Kellogg]

SVN commit 454025 by okellogg:

addObject(): Return true if the object was actually added.

 M  +7 -13     package.cpp  
 M  +3 -2      package.h  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/package.cpp #454024:454025
@@ -1,5 +1,5 @@
 /*
- *  copyright (C) 2003-2004
+ *  copyright (C) 2003-2005
  *  Umbrello UML Modeller Authors <uml-devel@ uml.sf.net>
  */
 
@@ -54,20 +54,14 @@
     return clone;
 }
 
-void UMLPackage::addObject(const UMLObject *pObject) {
-    Uml::IDType id = pObject->getID();
-    for (UMLObjectListIt oit(m_objects); oit.current(); ++oit) {
-        UMLObject *o = oit.current();
-        if (o->getID() == id) {
-#ifdef VERBOSE_DEBUGGING
-            kdDebug() << "UMLPackage::addObject: "
-            << pObject->getName()
-            << " is already there" << endl;
-#endif
-            return;
-        }
+bool UMLPackage::addObject(const UMLObject *pObject) {
+    if (m_objects.find(pObject) != -1) {
+        kdDebug() << "UMLPackage::addObject: " << pObject->getName()
+                  << " is already there" << endl;
+        return false;
     }
     m_objects.append( pObject );
+    return true;
 }
 
 void UMLPackage::removeObject(const UMLObject *pObject) {
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/package.h #454024:454025
@@ -1,5 +1,5 @@
 /*
- *  copyright (C) 2003-2004
+ *  copyright (C) 2003-2005
  *  Umbrello UML Modeller Authors <uml-devel@ uml.sf.net>
  */
 
@@ -71,8 +71,9 @@
      * Adds an object in this package.
      *
      * @param pObject	Pointer to the UMLObject to add.
+     * @return    True if the object was actually added.
      */
-    void addObject(const UMLObject *pObject);
+    bool addObject(const UMLObject *pObject);
 
     /**
      * Removes an object from this package.