[Uml-devel] branches/work/soc-umbrello/umbrello
Andi Fischer
andi.fischer at hispeed.ch
Thu Apr 21 11:15:47 UTC 2011
SVN commit 1228656 by fischer:
Some Krazy issues fixed.
M +1 -1 association.cpp
M +1 -1 association.h
M +1 -1 attribute.cpp
M +1 -1 attribute.h
M +1 -1 checkconstraint.cpp
M +1 -1 checkconstraint.h
M +1 -1 classifier.cpp
M +1 -1 classifier.h
M +0 -1 classifierlistitem.cpp
M +1 -1 entity.cpp
M +1 -1 entity.h
M +1 -1 entityattribute.cpp
M +1 -1 entityattribute.h
M +2 -3 entityconstraint.cpp
M +1 -1 entityconstraint.h
M +1 -1 enum.cpp
M +2 -2 enum.h
M +1 -3 enumliteral.cpp
M +2 -2 enumliteral.h
M +1 -1 foreignkeyconstraint.cpp
M +1 -1 foreignkeyconstraint.h
M +1 -1 operation.cpp
M +1 -1 operation.h
M +1 -1 stereotype.cpp
M +2 -2 stereotype.h
M +1 -1 template.cpp
M +1 -1 template.h
M +3 -3 uml.cpp
M +1 -1 umlcanvasobject.cpp
M +1 -1 umlcanvasobject.h
M +1 -1 umlrole.cpp
M +1 -1 uniqueconstraint.cpp
M +1 -1 uniqueconstraint.h
--- branches/work/soc-umbrello/umbrello/association.cpp #1228655:1228656
@@ -82,7 +82,7 @@
/**
* Overloaded '==' operator
*/
-bool UMLAssociation::operator==(const UMLAssociation &rhs)
+bool UMLAssociation::operator==(const UMLAssociation &rhs) const
{
if (this == &rhs) {
return true;
--- branches/work/soc-umbrello/umbrello/association.h #1228655:1228656
@@ -40,7 +40,7 @@
virtual ~UMLAssociation();
- bool operator==(const UMLAssociation &rhs);
+ bool operator==(const UMLAssociation &rhs) const;
QString toString() const;
--- branches/work/soc-umbrello/umbrello/attribute.cpp #1228655:1228656
@@ -207,7 +207,7 @@
/**
* Overloaded '==' operator
*/
-bool UMLAttribute::operator==(const UMLAttribute &rhs)
+bool UMLAttribute::operator==(const UMLAttribute &rhs) const
{
if( this == &rhs )
return true;
--- branches/work/soc-umbrello/umbrello/attribute.h #1228655:1228656
@@ -35,7 +35,7 @@
UMLObject *type = 0, const QString& iv = QString());
UMLAttribute(UMLObject *parent);
- bool operator==(const UMLAttribute &rhs);
+ bool operator==(const UMLAttribute &rhs) const;
virtual ~UMLAttribute();
--- branches/work/soc-umbrello/umbrello/checkconstraint.cpp #1228655:1228656
@@ -43,7 +43,7 @@
/**
* Overloaded '==' operator.
*/
-bool UMLCheckConstraint::operator==(const UMLCheckConstraint &rhs)
+bool UMLCheckConstraint::operator==(const UMLCheckConstraint &rhs) const
{
if ( this == &rhs )
return true;
--- branches/work/soc-umbrello/umbrello/checkconstraint.h #1228655:1228656
@@ -31,7 +31,7 @@
Uml::IDType id = Uml::id_None );
UMLCheckConstraint(UMLObject *parent);
- bool operator==(const UMLCheckConstraint &rhs);
+ bool operator==(const UMLCheckConstraint &rhs) const;
virtual ~UMLCheckConstraint();
--- branches/work/soc-umbrello/umbrello/classifier.cpp #1228655:1228656
@@ -632,7 +632,7 @@
/**
* Overloaded '==' operator.
*/
-bool UMLClassifier::operator==(const UMLClassifier & rhs )
+bool UMLClassifier::operator==(const UMLClassifier & rhs) const
{
/*
if ( m_List.count() != rhs.m_List.count() ) {
--- branches/work/soc-umbrello/umbrello/classifier.h #1228655:1228656
@@ -48,7 +48,7 @@
explicit UMLClassifier(const QString & name = QString(), Uml::IDType id = Uml::id_None);
virtual ~UMLClassifier();
- bool operator==(const UMLClassifier & rhs );
+ bool operator==(const UMLClassifier & rhs) const;
virtual void copyInto(UMLObject *lhs) const;
--- branches/work/soc-umbrello/umbrello/classifierlistitem.cpp #1228655:1228656
@@ -157,5 +157,4 @@
UMLObject::emitModified();
}
-
#include "classifierlistitem.moc"
--- branches/work/soc-umbrello/umbrello/entity.cpp #1228655:1228656
@@ -58,7 +58,7 @@
/**
* Overloaded '==' operator.
*/
-bool UMLEntity::operator==(const UMLEntity& rhs )
+bool UMLEntity::operator==(const UMLEntity& rhs) const
{
return UMLClassifier::operator==(rhs);
}
--- branches/work/soc-umbrello/umbrello/entity.h #1228655:1228656
@@ -38,7 +38,7 @@
explicit UMLEntity(const QString& name = QString(), Uml::IDType id = Uml::id_None);
virtual ~UMLEntity();
- bool operator==(const UMLEntity& rhs);
+ bool operator==(const UMLEntity& rhs) const;
virtual void copyInto(UMLObject *lhs) const;
--- branches/work/soc-umbrello/umbrello/entityattribute.cpp #1228655:1228656
@@ -187,7 +187,7 @@
/**
* Overloaded '==' operator
*/
-bool UMLEntityAttribute::operator==(const UMLEntityAttribute &rhs)
+bool UMLEntityAttribute::operator==(const UMLEntityAttribute &rhs) const
{
if( this == &rhs )
return true;
--- branches/work/soc-umbrello/umbrello/entityattribute.h #1228655:1228656
@@ -42,7 +42,7 @@
UMLEntityAttribute(UMLObject* parent);
virtual ~UMLEntityAttribute();
- bool operator==(const UMLEntityAttribute& rhs);
+ bool operator==(const UMLEntityAttribute& rhs) const;
virtual void copyInto(UMLObject *lhs) const;
--- branches/work/soc-umbrello/umbrello/entityconstraint.cpp #1228655:1228656
@@ -16,8 +16,7 @@
#include "umldoc.h"
#include "uml.h"
-// qt/kde includes
-#include <kdebug.h>
+// qt includes
#include <QtCore/QRegExp>
/**
@@ -46,7 +45,7 @@
/**
* Overloaded '==' operator
*/
-bool UMLEntityConstraint::operator==( const UMLEntityConstraint &rhs)
+bool UMLEntityConstraint::operator==( const UMLEntityConstraint &rhs) const
{
if( this == &rhs )
return true;
--- branches/work/soc-umbrello/umbrello/entityconstraint.h #1228655:1228656
@@ -33,7 +33,7 @@
UMLEntityConstraint(UMLObject *parent);
- bool operator==( const UMLEntityConstraint &rhs);
+ bool operator==( const UMLEntityConstraint &rhs) const;
virtual ~UMLEntityConstraint();
--- branches/work/soc-umbrello/umbrello/enum.cpp #1228655:1228656
@@ -44,7 +44,7 @@
/**
* Overloaded '==' operator.
*/
-bool UMLEnum::operator==(const UMLEnum & rhs )
+bool UMLEnum::operator==(const UMLEnum & rhs) const
{
return UMLClassifier::operator==(rhs);
}
--- branches/work/soc-umbrello/umbrello/enum.h #1228655:1228656
@@ -4,7 +4,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * copyright (C) 2003-2009 *
+ * copyright (C) 2003-2011 *
* Umbrello UML Modeller Authors <uml-devel at uml.sf.net> *
***************************************************************************/
@@ -33,7 +33,7 @@
virtual ~UMLEnum();
- bool operator==(const UMLEnum& rhs);
+ bool operator==(const UMLEnum& rhs) const;
virtual void copyInto(UMLObject *lhs) const;
--- branches/work/soc-umbrello/umbrello/enumliteral.cpp #1228655:1228656
@@ -11,7 +11,6 @@
#include "enumliteral.h"
#include <kinputdialog.h>
-#include <kdebug.h>
#include <klocale.h>
/**
@@ -47,7 +46,7 @@
/**
* Overloaded '==' operator
*/
-bool UMLEnumLiteral::operator==(const UMLEnumLiteral& rhs)
+bool UMLEnumLiteral::operator==(const UMLEnumLiteral& rhs) const
{
if ( this == &rhs ) {
return true;
@@ -110,4 +109,3 @@
return false;
}
}
-
--- branches/work/soc-umbrello/umbrello/enumliteral.h #1228655:1228656
@@ -4,7 +4,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * copyright (C) 2003-2009 *
+ * copyright (C) 2003-2011 *
* Umbrello UML Modeller Authors <uml-devel at uml.sf.net> *
***************************************************************************/
@@ -29,7 +29,7 @@
const QString& name, Uml::IDType id = Uml::id_None);
UMLEnumLiteral(UMLObject* parent);
- bool operator==(const UMLEnumLiteral &rhs);
+ bool operator==(const UMLEnumLiteral &rhs) const;
virtual void copyInto(UMLObject *lhs) const;
--- branches/work/soc-umbrello/umbrello/foreignkeyconstraint.cpp #1228655:1228656
@@ -66,7 +66,7 @@
/**
* Overloaded '==' operator
*/
-bool UMLForeignKeyConstraint::operator==( const UMLForeignKeyConstraint &rhs)
+bool UMLForeignKeyConstraint::operator==( const UMLForeignKeyConstraint &rhs) const
{
if( this == &rhs )
return true;
--- branches/work/soc-umbrello/umbrello/foreignkeyconstraint.h #1228655:1228656
@@ -49,7 +49,7 @@
Uml::IDType id = Uml::id_None );
UMLForeignKeyConstraint(UMLObject *parent);
- bool operator==( const UMLForeignKeyConstraint &rhs);
+ bool operator==( const UMLForeignKeyConstraint &rhs) const;
virtual ~UMLForeignKeyConstraint();
--- branches/work/soc-umbrello/umbrello/operation.cpp #1228655:1228656
@@ -282,7 +282,7 @@
/**
* Overloaded '==' operator.
*/
-bool UMLOperation::operator==(const UMLOperation & rhs )
+bool UMLOperation::operator==(const UMLOperation & rhs) const
{
if ( this == &rhs )
return true;
--- branches/work/soc-umbrello/umbrello/operation.h #1228655:1228656
@@ -34,7 +34,7 @@
virtual ~UMLOperation();
- bool operator==( const UMLOperation & rhs );
+ bool operator==( const UMLOperation & rhs ) const;
virtual void copyInto(UMLObject *lhs) const;
--- branches/work/soc-umbrello/umbrello/stereotype.cpp #1228655:1228656
@@ -59,7 +59,7 @@
/**
* Overloaded '==' operator.
*/
-bool UMLStereotype::operator==( const UMLStereotype &rhs)
+bool UMLStereotype::operator==( const UMLStereotype &rhs) const
{
if (this == &rhs) {
return true;
--- branches/work/soc-umbrello/umbrello/stereotype.h #1228655:1228656
@@ -4,7 +4,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * copyright (C) 2003-2010 *
+ * copyright (C) 2003-2011 *
* Umbrello UML Modeller Authors <uml-devel at uml.sf.net> *
***************************************************************************/
@@ -39,7 +39,7 @@
virtual ~UMLStereotype();
- bool operator==(const UMLStereotype &rhs);
+ bool operator==(const UMLStereotype &rhs) const;
virtual void copyInto(UMLObject *lhs) const;
--- branches/work/soc-umbrello/umbrello/template.cpp #1228655:1228656
@@ -60,7 +60,7 @@
return m_pSecondary->name();
}
-bool UMLTemplate::operator==(const UMLTemplate &rhs)
+bool UMLTemplate::operator==(const UMLTemplate &rhs) const
{
if (this == &rhs) {
return true;
--- branches/work/soc-umbrello/umbrello/template.h #1228655:1228656
@@ -48,7 +48,7 @@
/**
* Overloaded '==' operator
*/
- bool operator==(const UMLTemplate &rhs);
+ bool operator==(const UMLTemplate &rhs) const;
virtual void copyInto(UMLObject *lhs) const;
--- branches/work/soc-umbrello/umbrello/uml.cpp #1228655:1228656
@@ -43,13 +43,13 @@
#include "importprojectdlg.h"
#include "settingsdlg.h"
#include "classimport.h"
-#include "refactoring/refactoringassistant.h"
+#include "refactoringassistant.h"
// clipboard
#include "umlclipboard.h"
#include "umldragdata.h"
// docgenerators
-#include "docgenerators/docbookgenerator.h"
-#include "docgenerators/xhtmlgenerator.h"
+#include "docbookgenerator.h"
+#include "xhtmlgenerator.h"
#include "umlscene.h"
// kde includes
--- branches/work/soc-umbrello/umbrello/umlcanvasobject.cpp #1228655:1228656
@@ -277,7 +277,7 @@
/**
* Overloaded '==' operator
*/
-bool UMLCanvasObject::operator==(const UMLCanvasObject& rhs)
+bool UMLCanvasObject::operator==(const UMLCanvasObject& rhs) const
{
if (this == &rhs) {
return true;
--- branches/work/soc-umbrello/umbrello/umlcanvasobject.h #1228655:1228656
@@ -38,7 +38,7 @@
explicit UMLCanvasObject(const QString & name = QString(), Uml::IDType id = Uml::id_None);
virtual ~UMLCanvasObject();
- bool operator==(const UMLCanvasObject& rhs);
+ bool operator==(const UMLCanvasObject& rhs) const;
virtual void copyInto(UMLObject *lhs) const;
--- branches/work/soc-umbrello/umbrello/umlrole.cpp #1228655:1228656
@@ -36,7 +36,7 @@
m_Changeability(Uml::Changeability::Changeable)
{
m_BaseType = UMLObject::ot_Role;
- m_name = QString();
+ m_name.clear();
m_pSecondary = parentObj;
// connect this up to parent
--- branches/work/soc-umbrello/umbrello/uniqueconstraint.cpp #1228655:1228656
@@ -48,7 +48,7 @@
/**
* Overloaded '==' operator
*/
-bool UMLUniqueConstraint::operator==(const UMLUniqueConstraint &rhs)
+bool UMLUniqueConstraint::operator==(const UMLUniqueConstraint &rhs) const
{
if( this == &rhs )
return true;
--- branches/work/soc-umbrello/umbrello/uniqueconstraint.h #1228655:1228656
@@ -34,7 +34,7 @@
UMLUniqueConstraint(UMLObject *parent);
virtual ~UMLUniqueConstraint();
- bool operator==(const UMLUniqueConstraint &rhs);
+ bool operator==(const UMLUniqueConstraint &rhs) const;
virtual void copyInto(UMLObject *lhs) const;
More information about the umbrello-devel
mailing list