[Uml-devel] branches/work/soc-umbrello/umbrello
Andi Fischer
andi.fischer at hispeed.ch
Tue Jul 13 22:10:35 UTC 2010
SVN commit 1149639 by fischer:
Getter in UMLFolder without get.
M +17 -28 folder.cpp
M +3 -6 folder.h
M +1 -1 listpopupmenu.cpp
M +3 -3 umllistview.cpp
M +1 -1 umllistviewitem.cpp
M +1 -1 umlscene.cpp
--- branches/work/soc-umbrello/umbrello/folder.cpp #1149638:1149639
@@ -37,7 +37,10 @@
UMLFolder::UMLFolder(const QString & name, Uml::IDType id)
: UMLPackage(name, id)
{
- init();
+ m_BaseType = Uml::ot_Folder;
+ // Porting to QList. No autodelete supported. TODO: check if all elements of m_diagrams are properly disposed
+ //m_diagrams.setAutoDelete(true);
+ UMLObject::setStereotype("folder");
}
/**
@@ -45,24 +48,11 @@
*/
UMLFolder::~UMLFolder()
{
- // TODO : check if safe
- while ( !m_diagrams.isEmpty() ) {
- delete m_diagrams.takeFirst();
+ qDeleteAll(m_diagrams);
+ m_diagrams.clear();
}
-}
/**
- * Initializes key variables of the class.
- */
-void UMLFolder::init()
-{
- m_BaseType = Uml::ot_Folder;
- // Porting to QList. No autodelete supported. TODO: check if all elements of m_diagrams are properly disposed
- //m_diagrams.setAutoDelete(true);
- UMLObject::setStereotype("folder");
-}
-
-/**
* Make a clone of this object.
*/
UMLObject* UMLFolder::clone() const
@@ -87,7 +77,7 @@
* Return the localized name of this folder.
* Only useful for the predefined root folders.
*/
-QString UMLFolder::getLocalName()
+QString UMLFolder::localName() const
{
return m_localName;
}
@@ -126,9 +116,10 @@
}
}
}
- foreach (UMLView* v, m_diagrams )
+ foreach (UMLView* v, m_diagrams) {
viewList.append(v);
}
+}
/**
* Acivate the views in this folder.
@@ -169,7 +160,7 @@
}
}
- UMLView* v = NULL;
+ UMLView* v = 0;
foreach (UMLObject* o, m_objects ) {
if (o->getBaseType() != Uml::ot_Folder) {
continue;
@@ -198,7 +189,7 @@
}
}
- UMLView* v = NULL;
+ UMLView* v = 0;
if (searchAllScopes) {
foreach (UMLObject* o, m_objects ) {
if (o->getBaseType() != Uml::ot_Folder) {
@@ -246,11 +237,9 @@
UMLApp::app()->document()->removeView(v, false);
}
- // m_diagrams.clear()
- while ( !m_diagrams.empty() ) {
- delete m_diagrams.takeFirst();
+ qDeleteAll(m_diagrams);
+ m_diagrams.clear();
}
-}
/**
* Set the folder file name for a separate submodel.
@@ -263,7 +252,7 @@
/**
* Get the folder file name for a separate submodel.
*/
-QString UMLFolder::getFolderFile()
+QString UMLFolder::folderFile() const
{
return m_folderFile;
}
@@ -276,7 +265,7 @@
void UMLFolder::saveContents(QDomDocument& qDoc, QDomElement& qElement)
{
QDomElement ownedElement = qDoc.createElement("UML:Namespace.ownedElement");
- UMLObject *obj = NULL;
+ UMLObject *obj = 0;
// Save contained objects if any.
for (UMLObjectListIt oit(m_objects); oit.hasNext(); ) {
obj = oit.next();
@@ -511,7 +500,7 @@
continue;
}
}
- UMLObject *pObject = NULL;
+ UMLObject *pObject = 0;
// Avoid duplicate creation of forward declared object
QString idStr = tempElement.attribute("xmi.id", "");
if (!idStr.isEmpty()) {
@@ -521,7 +510,7 @@
uDebug() << "object " << idStr << "already exists";
}
}
- if (pObject == NULL) {
+ if (pObject == 0) {
QString stereoID = tempElement.attribute("stereotype", "");
pObject = Object_Factory::makeObjectFromXMI(type, stereoID);
if (!pObject) {
--- branches/work/soc-umbrello/umbrello/folder.h #1149638:1149639
@@ -4,7 +4,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * copyright (C) 2006-2009 *
+ * copyright (C) 2006-2010 *
* Umbrello UML Modeller Authors <uml-devel at uml.sf.net> *
***************************************************************************/
@@ -35,15 +35,12 @@
Q_OBJECT
public:
explicit UMLFolder(const QString & name = QString(), Uml::IDType id = Uml::id_None);
-
virtual ~UMLFolder();
- virtual void init();
-
virtual UMLObject* clone() const;
void setLocalName(const QString& localName);
- QString getLocalName();
+ QString localName() const;
void addView(UMLView *view);
@@ -61,7 +58,7 @@
void removeAllViews();
void setFolderFile(const QString& fileName);
- QString getFolderFile();
+ QString folderFile() const;
void saveToXMI( QDomDocument & qDoc, QDomElement & qElement );
--- branches/work/soc-umbrello/umbrello/listpopupmenu.cpp #1149638:1149639
@@ -906,7 +906,7 @@
uError() << o->getName() << " is not a Folder";
return;
}
- QString submodelFile = f->getFolderFile();
+ QString submodelFile = f->folderFile();
if (submodelFile.isEmpty()) {
insert(mt_Externalize_Folder);
}
--- branches/work/soc-umbrello/umbrello/umllistview.cpp #1149638:1149639
@@ -872,7 +872,7 @@
QString name = object->getName();
if (type == Uml::ot_Folder) {
UMLFolder *f = static_cast<UMLFolder*>(object);
- QString folderFile = f->getFolderFile();
+ QString folderFile = f->folderFile();
if (!folderFile.isEmpty())
name.append(" (" + folderFile + ')');
}
@@ -1294,12 +1294,12 @@
Uml::Model_Type mt = (Uml::Model_Type)i;
UMLFolder *sysFolder = m_doc->rootFolder(mt);
Uml::ListView_Type lvt = Model_Utils::convert_MT_LVT(mt);
- m_lv[i] = new UMLListViewItem(m_rv, sysFolder->getLocalName(), lvt, sysFolder);
+ m_lv[i] = new UMLListViewItem(m_rv, sysFolder->localName(), lvt, sysFolder);
}
}
UMLFolder *datatypeFolder = m_doc->datatypeFolder();
if (!m_datatypeFolder)
- m_datatypeFolder = new UMLListViewItem(m_lv[Uml::mt_Logical], datatypeFolder->getLocalName(),
+ m_datatypeFolder = new UMLListViewItem(m_lv[Uml::mt_Logical], datatypeFolder->localName(),
Uml::lvt_Datatype_Folder, datatypeFolder);
m_rv->setOpen(true);
--- branches/work/soc-umbrello/umbrello/umllistviewitem.cpp #1149638:1149639
@@ -917,7 +917,7 @@
itemElement.setAttribute("label", m_Label);
} else if (m_pObject->getBaseType() == Uml::ot_Folder) {
extFolder = static_cast<UMLFolder*>(m_pObject);
- if (!extFolder->getFolderFile().isEmpty()) {
+ if (!extFolder->folderFile().isEmpty()) {
itemElement.setAttribute("open", "0");
qElement.appendChild(itemElement);
return;
--- branches/work/soc-umbrello/umbrello/umlscene.cpp #1149638:1149639
@@ -1455,7 +1455,7 @@
<< "parent model object is not a UMLFolder (?)";
return false;
}
- QString folderFile = modelFolder->getFolderFile();
+ QString folderFile = modelFolder->folderFile();
return !folderFile.isEmpty();
}
More information about the umbrello-devel
mailing list