[Uml-devel] KDE/kdesdk/umbrello/umbrello
Andi Fischer
andi.fischer at hispeed.ch
Sun Mar 22 10:47:35 UTC 2009
SVN commit 942637 by fischer:
Some comments fixed reported by Krazy.
M +13 -12 codegenerators/codeblock.h
M +9 -1 dialogs/diagramprintpage.cpp
M +8 -18 dialogs/diagramprintpage.h
M +12 -14 widgets/usecasewidget.h
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/codeblock.h #942636:942637
@@ -23,30 +23,31 @@
/**
* Describes the creation of the content.
- * @enum AutoGenerated the content was generated by code generation itself
- * @enum UserGenerated the content was entered by the user
*/
- enum ContentType {AutoGenerated=0, UserGenerated };
+ enum ContentType {
+ AutoGenerated=0, //< the content was generated by code generation itself
+ UserGenerated //< the content was entered by the user
+ };
- explicit CodeBlock ( CodeDocument * parent, const QString & body = "");
- virtual ~CodeBlock ( );
+ explicit CodeBlock(CodeDocument * parent, const QString & body = "");
+ virtual ~CodeBlock();
- void setContentType ( ContentType new_var );
+ void setContentType(ContentType new_var);
- ContentType getContentType ( ) const;
+ ContentType getContentType() const;
static QString enumToString(const ContentType& val);
- virtual void saveToXMI ( QDomDocument & doc, QDomElement & root );
- virtual void loadFromXMI ( QDomElement & root );
+ virtual void saveToXMI(QDomDocument & doc, QDomElement & root);
+ virtual void loadFromXMI(QDomElement & root);
- virtual void setAttributesFromObject (TextBlock * obj);
+ virtual void setAttributesFromObject(TextBlock * obj);
protected:
- virtual void setAttributesOnNode ( QDomDocument & doc, QDomElement & blockElement);
+ virtual void setAttributesOnNode(QDomDocument & doc, QDomElement & blockElement);
- virtual void setAttributesFromNode ( QDomElement & element);
+ virtual void setAttributesFromNode(QDomElement & element);
friend QTextStream& operator<<(QTextStream& str, const CodeBlock& obj);
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/diagramprintpage.cpp #942636:942637
@@ -4,7 +4,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * copyright (C) 2002-2008 *
+ * copyright (C) 2002-2009 *
* Umbrello UML Modeller Authors <uml-devel at uml.sf.net> *
***************************************************************************/
@@ -31,6 +31,11 @@
#include <QtGui/QRadioButton>
#include <QtGui/QGroupBox>
+/**
+ * Constructs the diagram print page.
+ * @param parent The parent to the page.
+ * @param doc The @ref UMLDoc class instance being used.
+ */
DiagramPrintPage::DiagramPrintPage(QWidget * parent, UMLDoc * m_pDoc) : QWidget(parent), m_pDoc(m_pDoc)
{
int margin = fontMetrics().height();
@@ -97,6 +102,9 @@
m_pTypeCB->insertItems(0, types);
}
+/**
+ * Standard destructor.
+ */
DiagramPrintPage::~DiagramPrintPage()
{
}
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/diagramprintpage.h #942636:942637
@@ -4,7 +4,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * copyright (C) 2002-2008 *
+ * copyright (C) 2002-2009 *
* Umbrello UML Modeller Authors <uml-devel at uml.sf.net> *
***************************************************************************/
@@ -23,9 +23,9 @@
/**
* This is a page on the print dialog to select what diagram(s)
- * you wish to print. You add it to the @ref KPrinter instance.
+ * you wish to print. You add it to the @ref QPrinter instance.
*
- * You will then need to get the options as shown in @ref KPrinter.
+ * You will then need to get the options as shown in @ref QPrinter.
*
* @short A print dialog page.
* @author Paul Hensgen <phensgen at techie.com>
@@ -37,16 +37,7 @@
Q_OBJECT
public:
- /**
- * Constructs the diagram print page.
- * @param parent The parent to the page.
- * @param doc The @ref UMLDoc class instance being used.
- */
DiagramPrintPage(QWidget * parent, UMLDoc *doc);
-
- /**
- * Standard deconstructor.
- */
~DiagramPrintPage();
int printUmlCount();
@@ -60,23 +51,22 @@
QGroupBox * m_pFilterGB;
QGroupBox * m_pSelectGB;
QListWidget * m_pSelectLW;
- QRadioButton * m_pAllRB, * m_pCurrentRB, * m_pSelectRB, * m_pTypeRB;
+ QRadioButton * m_pAllRB;
+ QRadioButton * m_pCurrentRB;
+ QRadioButton * m_pSelectRB;
+ QRadioButton * m_pTypeRB;
KComboBox * m_pTypeCB;
UMLDoc * m_pDoc;
Uml::Diagram_Type m_ViewType;
- /**
- * list containing the IDs of diagrams to print
- */
- QList<Uml::IDType> m_nIdList;
+ QList<Uml::IDType> m_nIdList; //< list containing the IDs of diagrams to print
enum FilterType{Current = 0, All, Select, Type};
public slots:
void slotClicked();
-
void slotActivated(int index);
};
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/usecasewidget.h #942636:942637
@@ -1,23 +1,22 @@
/***************************************************************************
- * *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * copyright (C) 2002-2006 *
+ * copyright (C) 2002-2009 *
* Umbrello UML Modeller Authors <uml-devel at uml.sf.net> *
***************************************************************************/
#ifndef USECASEWIDGET_H
#define USECASEWIDGET_H
+
#include "umlwidget.h"
#define UC_MARGIN 5
#define UC_WIDTH 60
#define UC_HEIGHT 30
-
class UMLUseCase;
/**
@@ -25,7 +24,7 @@
* by a @ref UMLView. An UseCaseWidget belongs to only one @ref UMLView instance.
* When the @ref UMLView instance that this class belongs to, it will be automatically deleted.
*
- * If the @ref UseCase class that this UseCaseWidget is displaying is deleted, the @ref UMLView will
+ * If the @ref UMLUseCase class that this UseCaseWidget is displaying is deleted, the @ref UMLView will
* make sure that this instance is also deleted.
*
* The UseCaseWidget class inherits from the @ref UMLWidget class which adds most of the functionality
@@ -35,31 +34,30 @@
* @author Paul Hensgen <phensgen at techie.com>
* Bugs and comments to uml-devel at lists.sf.net or http://bugs.kde.org
*/
-class UseCaseWidget : public UMLWidget {
+class UseCaseWidget : public UMLWidget
+{
public:
/**
* Creates a UseCase widget.
- *
- * @param view The parent of the widget.
- * @param o The UMLObject to represent.
+ * @param view The parent of the widget.
+ * @param o The UMLObject to represent.
*/
UseCaseWidget(UMLView * view, UMLUseCase *o);
-
/**
- * destructor
+ * Destructor.
*/
virtual ~UseCaseWidget();
/**
- * Overrides the standard paint event.
- */
+ * Overrides the standard paint event.
+ */
void draw(QPainter & p, int offsetX, int offsetY);
/**
- * Saves this UseCase to file.
- */
+ * Saves this UseCase to file.
+ */
void saveToXMI( QDomDocument & qDoc, QDomElement & qElement );
// For loading we can use the loadFromXMI() inherited from UMLWidget.
More information about the umbrello-devel
mailing list