[Uml-devel] KDE/kdesdk/umbrello/umbrello
Andi Fischer
andi.fischer at hispeed.ch
Thu Nov 8 22:56:42 UTC 2007
SVN commit 734469 by fischer:
some cosmetics
M +37 -26 package.cpp
M +2 -6 package.h
M +5 -5 umlobjectlist.cpp
M +1 -1 umlobjectlist.h
--- trunk/KDE/kdesdk/umbrello/umbrello/package.cpp #734468:734469
@@ -26,23 +26,18 @@
#include "entity.h"
#include "object_factory.h"
#include "model_utils.h"
-#include "umllistview.h"
-#include "umllistviewitem.h"
using namespace Uml;
UMLPackage::UMLPackage(const QString & name, Uml::IDType id)
- : UMLCanvasObject(name, id) {
- init();
+ : UMLCanvasObject(name, id)
+{
+ m_BaseType = ot_Package;
}
-UMLPackage::~UMLPackage() {
-}
+UMLPackage::~UMLPackage()
+{}
-void UMLPackage::init() {
- m_BaseType = ot_Package;
-}
-
void UMLPackage::copyInto(UMLPackage *rhs) const
{
UMLCanvasObject::copyInto(rhs);
@@ -58,7 +53,8 @@
return clone;
}
-void UMLPackage::addAssocToConcepts(UMLAssociation* a) {
+void UMLPackage::addAssocToConcepts(UMLAssociation* a)
+{
if (! UMLAssociation::assocTypeHasUMLRepresentation(a->getAssocType()) )
return;
Uml::IDType AId = a->getObjectId(Uml::A);
@@ -98,7 +94,8 @@
}
}
-bool UMLPackage::addObject(UMLObject *pObject) {
+bool UMLPackage::addObject(UMLObject *pObject)
+{
if (pObject == NULL) {
uError() << "is called with a NULL object" << endl;
return false;
@@ -146,7 +143,8 @@
return true;
}
-void UMLPackage::removeObject(UMLObject *pObject) {
+void UMLPackage::removeObject(UMLObject *pObject)
+{
if (pObject->getBaseType() == Uml::ot_Association) {
UMLObject *o = const_cast<UMLObject*>(pObject);
UMLAssociation *assoc = static_cast<UMLAssociation*>(o);
@@ -159,7 +157,8 @@
m_objects.removeAll(pObject);
}
-void UMLPackage::removeAllObjects() {
+void UMLPackage::removeAllObjects()
+{
UMLCanvasObject::removeAllChildObjects();
UMLObject *o = NULL;
@@ -174,11 +173,13 @@
}
}
-UMLObjectList UMLPackage::containedObjects() {
+UMLObjectList UMLPackage::containedObjects()
+{
return m_objects;
}
-UMLObject * UMLPackage::findObject(const QString &name) {
+UMLObject * UMLPackage::findObject(const QString &name)
+{
const bool caseSensitive = UMLApp::app()->activeLanguageIsCaseSensitive();
for (UMLObjectListIt oit(m_objects); oit.hasNext(); ) {
UMLObject *obj = oit.next();
@@ -192,12 +193,14 @@
return NULL;
}
-UMLObject * UMLPackage::findObjectById(Uml::IDType id) {
+UMLObject * UMLPackage::findObjectById(Uml::IDType id)
+{
return Model_Utils::findObjectInList(id, m_objects);
}
-void UMLPackage::appendPackages(UMLPackageList& packages, bool includeNested ) {
+void UMLPackage::appendPackages(UMLPackageList& packages, bool includeNested )
+{
for (UMLObjectListIt oit(m_objects); oit.hasNext(); ) {
UMLObject *o = oit.next();
Object_Type ot = o->getBaseType();
@@ -213,7 +216,8 @@
void UMLPackage::appendClassifiers(UMLClassifierList& classifiers,
- bool includeNested /* = true */) {
+ bool includeNested /* = true */)
+{
for (UMLObjectListIt oit(m_objects); oit.hasNext(); ) {
UMLObject *o = oit.next();
Object_Type ot = o->getBaseType();
@@ -228,7 +232,8 @@
}
void UMLPackage::appendClasses(UMLClassifierList& classes,
- bool includeNested /* = true */) {
+ bool includeNested /* = true */)
+{
for (UMLObjectListIt oit(m_objects); oit.hasNext(); ) {
UMLObject *o = oit.next();
Object_Type ot = o->getBaseType();
@@ -243,7 +248,8 @@
}
void UMLPackage::appendEntities( UMLEntityList& entities,
- bool includeNested /* = true */ ) {
+ bool includeNested /* = true */ )
+{
for (UMLObjectListIt oit(m_objects); oit.hasNext(); ) {
UMLObject *o = oit.next();
Object_Type ot = o->getBaseType();
@@ -258,7 +264,8 @@
}
void UMLPackage::appendClassesAndInterfaces(UMLClassifierList& classifiers,
- bool includeNested /* = true */) {
+ bool includeNested /* = true */)
+{
for (UMLObjectListIt oit(m_objects); oit.hasNext(); ) {
UMLObject *o = oit.next();
Object_Type ot = o->getBaseType();
@@ -273,7 +280,8 @@
}
void UMLPackage::appendInterfaces( UMLClassifierList& interfaces,
- bool includeNested /* = true */) {
+ bool includeNested /* = true */)
+{
for (UMLObjectListIt oit(m_objects); oit.hasNext(); ) {
UMLObject *o = oit.next();
Object_Type ot = o->getBaseType();
@@ -287,7 +295,8 @@
}
}
-bool UMLPackage::resolveRef() {
+bool UMLPackage::resolveRef()
+{
bool overallSuccess = UMLCanvasObject::resolveRef();
for (UMLObjectListIt oit(m_objects); oit.hasNext(); ) {
UMLObject *obj = oit.next();
@@ -301,7 +310,8 @@
return overallSuccess;
}
-void UMLPackage::saveToXMI(QDomDocument& qDoc, QDomElement& qElement) {
+void UMLPackage::saveToXMI(QDomDocument& qDoc, QDomElement& qElement)
+{
QDomElement packageElement = UMLObject::save("UML:Package", qDoc);
QDomElement ownedElement = qDoc.createElement("UML:Namespace.ownedElement");
UMLObject *obj = NULL;
@@ -320,7 +330,8 @@
qElement.appendChild(packageElement);
}
-bool UMLPackage::load(QDomElement& element) {
+bool UMLPackage::load(QDomElement& element)
+{
for (QDomNode node = element.firstChild(); !node.isNull();
node = node.nextSibling()) {
if (node.isComment())
--- trunk/KDE/kdesdk/umbrello/umbrello/package.h #734468:734469
@@ -32,7 +32,8 @@
* Bugs and comments to uml-devel at lists.sf.net or http://bugs.kde.org
*/
-class UMLPackage : public UMLCanvasObject {
+class UMLPackage : public UMLCanvasObject
+{
Q_OBJECT
public:
/**
@@ -60,11 +61,6 @@
virtual UMLObject* clone() const;
/**
- * Initializes key variables of the class.
- */
- void init();
-
- /**
* Adds an object in this package.
*
* @param pObject Pointer to the UMLObject to add.
--- trunk/KDE/kdesdk/umbrello/umbrello/umlobjectlist.cpp #734468:734469
@@ -5,14 +5,12 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * copyright (C) 2002-2006 *
+ * copyright (C) 2002-2007 *
* Umbrello UML Modeller Authors <uml-devel at uml.sf.net> *
***************************************************************************/
#include "umlobjectlist.h"
#include "umlobject.h"
-#include <kdebug.h>
-#include <klocale.h>
UMLObjectList::UMLObjectList()
{}
@@ -20,7 +18,8 @@
UMLObjectList::~UMLObjectList()
{}
-void UMLObjectList::copyInto(UMLObjectList *rhs) const {
+void UMLObjectList::copyInto(UMLObjectList *rhs) const
+{
// Don't copy yourself.
if (rhs == this) return;
@@ -39,7 +38,8 @@
}
-UMLObjectList* UMLObjectList::clone() const {
+UMLObjectList* UMLObjectList::clone() const
+{
UMLObjectList *clone = new UMLObjectList();
copyInto(clone);
return clone;
--- trunk/KDE/kdesdk/umbrello/umbrello/umlobjectlist.h #734468:734469
@@ -19,7 +19,7 @@
#ifndef UMLOBJECTLIST_H
#define UMLOBJECTLIST_H
-#include <qlist.h>
+#include <QtCore/QList>
// forward declarations
class UMLObject;
More information about the umbrello-devel
mailing list