[Uml-devel] KDE/kdesdk/umbrello/umbrello
Andi Fischer
andi.fischer at hispeed.ch
Thu Jul 7 16:18:16 UTC 2011
SVN commit 1240341 by fischer:
Icon_Type renamed to IconType.
M +1 -1 classifier.cpp
M +1 -1 dialogs/classpropdlg.cpp
M +1 -1 dialogs/classpropdlg.h
M +7 -7 icon_utils.cpp
M +8 -8 icon_utils.h
M +6 -6 model_utils.cpp
M +2 -2 model_utils.h
M +1 -1 refactoring/refactoringassistant.cpp
M +2 -4 refactoring/refactoringassistant.h
M +3 -3 umllistview.cpp
M +1 -1 umllistview.h
M +5 -5 umllistviewitem.cpp
M +1 -1 umllistviewitem.h
M +1 -1 worktoolbar.cpp
--- trunk/KDE/kdesdk/umbrello/umbrello/classifier.cpp #1240340:1240341
@@ -71,7 +71,7 @@
void UMLClassifier::setBaseType(UMLObject::ObjectType ot)
{
m_BaseType = ot;
- Icon_Utils::Icon_Type newIcon;
+ Icon_Utils::IconType newIcon;
switch (ot) {
case ot_Interface:
UMLObject::setStereotype("interface");
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/classpropdlg.cpp #1240340:1240341
@@ -231,7 +231,7 @@
}
}
-QFrame* ClassPropDlg::createPage(const QString& name, const QString& header, Icon_Utils::Icon_Type icon)
+QFrame* ClassPropDlg::createPage(const QString& name, const QString& header, Icon_Utils::IconType icon)
{
QFrame* page = new QFrame();
KPageWidgetItem *pageItem = new KPageWidgetItem( page, name );
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/classpropdlg.h #1240340:1240341
@@ -101,7 +101,7 @@
private:
void init();
- QFrame* createPage(const QString& name, const QString& header, Icon_Utils::Icon_Type icon);
+ QFrame* createPage(const QString& name, const QString& header, Icon_Utils::IconType icon);
};
--- trunk/KDE/kdesdk/umbrello/umbrello/icon_utils.cpp #1240340:1240341
@@ -33,7 +33,7 @@
* @param type the identification of the icon
* @return the wanted pixmap
*/
-QPixmap SmallIcon(Icon_Type type)
+QPixmap SmallIcon(IconType type)
{
return SmallIcon(toString(type));
}
@@ -43,7 +43,7 @@
* @param type the identification of the icon
* @return the wanted pixmap
*/
-QPixmap BarIcon(Icon_Type type)
+QPixmap BarIcon(IconType type)
{
return BarIcon(toString(type));
}
@@ -53,7 +53,7 @@
* @param type the identification of the icon
* @return the wanted pixmap
*/
-QPixmap MainBarIcon(Icon_Type type)
+QPixmap MainBarIcon(IconType type)
{
return MainBarIcon(toString(type));
}
@@ -63,7 +63,7 @@
* @param type the identification of the icon
* @return the wanted pixmap
*/
-QPixmap UserIcon(Icon_Type type)
+QPixmap UserIcon(IconType type)
{
return UserIcon(toString(type));
}
@@ -73,7 +73,7 @@
* @param type the identification of the icon
* @return the wanted icon
*/
-KIcon DesktopIcon(Icon_Type type)
+KIcon DesktopIcon(IconType type)
{
return KIcon(DesktopIcon(toString(type)));
}
@@ -84,7 +84,7 @@
* @param type the identification of the icon
* @return the wanted cursor
*/
-QCursor Cursor(Icon_Type type)
+QCursor Cursor(IconType type)
{
return QCursor(UserIcon("cursor-" + toString(type)), 9, 9);
}
@@ -126,7 +126,7 @@
* @param type the identification of the icon
* @return the string representation of the type
*/
-QString toString(Icon_Type type)
+QString toString(IconType type)
{
switch (type) {
case it_Home:
--- trunk/KDE/kdesdk/umbrello/umbrello/icon_utils.h #1240340:1240341
@@ -35,7 +35,7 @@
*/
namespace Icon_Utils {
- enum Icon_Type
+ enum IconType
{
it_Home = 0,
it_Arrow,
@@ -214,16 +214,16 @@
N_ICONTYPES // must remain last
};
- QPixmap SmallIcon(Icon_Type type);
- QPixmap BarIcon(Icon_Type type);
- QPixmap MainBarIcon(Icon_Type type);
- QPixmap UserIcon(Icon_Type type);
+ QPixmap SmallIcon(IconType type);
+ QPixmap BarIcon(IconType type);
+ QPixmap MainBarIcon(IconType type);
+ QPixmap UserIcon(IconType type);
- KIcon DesktopIcon(Icon_Type type);
+ KIcon DesktopIcon(IconType type);
- QCursor Cursor(Icon_Type type);
+ QCursor Cursor(IconType type);
- QString toString(Icon_Type type);
+ QString toString(IconType type);
KIcon iconSet(Uml::DiagramType dt);
--- trunk/KDE/kdesdk/umbrello/umbrello/model_utils.cpp #1240340:1240341
@@ -291,7 +291,7 @@
* @param object the object in the treeViewAddViews
* @param to the new icon type for the given object
*/
-void treeViewChangeIcon(UMLObject* object, Icon_Utils::Icon_Type to)
+void treeViewChangeIcon(UMLObject* object, Icon_Utils::IconType to)
{
UMLListView* tree = UMLApp::app()->listView();
tree->changeIconOf(object, to);
@@ -1364,15 +1364,15 @@
}
/**
- * Return the Icon_Type which corresponds to the given listview type.
+ * Return the IconType which corresponds to the given listview type.
*
* @param lvt ListViewType to convert.
- * @return The Icon_Utils::Icon_Type corresponding to the lvt.
- * Returns it_Home in case no mapping to Uml::Icon_Type exists.
+ * @return The Icon_Utils::IconType corresponding to the lvt.
+ * Returns it_Home in case no mapping to IconType exists.
*/
-Icon_Utils::Icon_Type convert_LVT_IT(UMLListViewItem::ListViewType lvt)
+Icon_Utils::IconType convert_LVT_IT(UMLListViewItem::ListViewType lvt)
{
- Icon_Utils::Icon_Type icon = Icon_Utils::it_Home;
+ Icon_Utils::IconType icon = Icon_Utils::it_Home;
switch (lvt) {
case UMLListViewItem::lvt_UseCase_View:
case UMLListViewItem::lvt_UseCase_Folder:
--- trunk/KDE/kdesdk/umbrello/umbrello/model_utils.h #1240340:1240341
@@ -44,7 +44,7 @@
UMLObject *currentObj = 0);
void treeViewAddViews(const UMLViewList& viewList);
-void treeViewChangeIcon(UMLObject* object, Icon_Utils::Icon_Type to);
+void treeViewChangeIcon(UMLObject* object, Icon_Utils::IconType to);
void treeViewSetCurrentItem(UMLObject* object);
void treeViewMoveObjectTo(UMLObject* container, UMLObject* object);
UMLObject* treeViewGetCurrentObject();
@@ -73,7 +73,7 @@
UMLListViewItem::ListViewType convert_DT_LVT(Uml::DiagramType dt);
UMLObject::ObjectType convert_LVT_OT(UMLListViewItem::ListViewType lvt);
UMLListViewItem::ListViewType convert_OT_LVT(UMLObject *o);
-Icon_Utils::Icon_Type convert_LVT_IT(UMLListViewItem::ListViewType lvt);
+Icon_Utils::IconType convert_LVT_IT(UMLListViewItem::ListViewType lvt);
Uml::DiagramType convert_LVT_DT(UMLListViewItem::ListViewType lvt);
Uml::ModelType convert_OT_MT(UMLObject::ObjectType ot);
--- trunk/KDE/kdesdk/umbrello/umbrello/refactoring/refactoringassistant.cpp #1240340:1240341
@@ -408,7 +408,7 @@
* @param icon the shown icon
* @return the created action
*/
-QAction* RefactoringAssistant::createAction(const QString& text, const char * method, const Icon_Utils::Icon_Type icon)
+QAction* RefactoringAssistant::createAction(const QString& text, const char * method, const Icon_Utils::IconType icon)
{
QAction* action = new QAction(this);
action->setText(text);
--- trunk/KDE/kdesdk/umbrello/umbrello/refactoring/refactoringassistant.h #1240340:1240341
@@ -5,7 +5,7 @@
* (at your option) any later version. *
* *
* copyright (C) 2003 Luis De la Parra <lparrab at gmx.net> *
- * copyright (C) 2004-2010 *
+ * copyright (C) 2004-2011 *
* Umbrello UML Modeller Authors <uml-devel at uml.sf.net> *
***************************************************************************/
@@ -86,10 +86,8 @@
private:
- QAction* createAction(const QString& text, const char * method, const Icon_Utils::Icon_Type icon = Icon_Utils::N_ICONTYPES);
+ QAction* createAction(const QString& text, const char * method, const Icon_Utils::IconType icon = Icon_Utils::N_ICONTYPES);
};
-
#endif
-
--- trunk/KDE/kdesdk/umbrello/umbrello/umllistview.cpp #1240340:1240341
@@ -807,7 +807,7 @@
DEBUG(DBG_SRC) << newItem->type();
DEBUG(DBG_SRC) << object->name() << ", id= " << ID2STR(object->id())
<< ": item already exists.";
- Icon_Utils::Icon_Type icon = Model_Utils::convert_LVT_IT(newItem->type());
+ Icon_Utils::IconType icon = Model_Utils::convert_LVT_IT(newItem->type());
newItem->setIcon(icon);
return;
}
@@ -1139,7 +1139,7 @@
/**
* Changes the icon for the given UMLObject to the given icon.
*/
-void UMLListView::changeIconOf(UMLObject *o, Icon_Utils::Icon_Type to)
+void UMLListView::changeIconOf(UMLObject *o, Icon_Utils::IconType to)
{
UMLListViewItem *item = findUMLObject(o);
if (item)
@@ -2131,7 +2131,7 @@
UMLListViewItem * newItem = 0;
parentItem->setOpen(true);
- Icon_Utils::Icon_Type icon = Model_Utils::convert_LVT_IT(type);
+ Icon_Utils::IconType icon = Model_Utils::convert_LVT_IT(type);
QString name;
if (Model_Utils::typeIsDiagram(type)) {
--- trunk/KDE/kdesdk/umbrello/umbrello/umllistview.h #1240340:1240341
@@ -86,7 +86,7 @@
UMLListViewItem *rootView(UMLListViewItem::ListViewType type);
- void changeIconOf(UMLObject *o, Icon_Utils::Icon_Type to);
+ void changeIconOf(UMLObject *o, Icon_Utils::IconType to);
UMLObject *createUMLObject(UMLListViewItem * item, UMLObject::ObjectType type);
bool createChildUMLObject(UMLListViewItem * item, UMLObject::ObjectType type);
--- trunk/KDE/kdesdk/umbrello/umbrello/umllistviewitem.cpp #1240340:1240341
@@ -307,7 +307,7 @@
}
setText(modelObjText);
- Icon_Utils::Icon_Type icon = Icon_Utils::it_Home;
+ Icon_Utils::IconType icon = Icon_Utils::it_Home;
switch (ot) {
case UMLObject::ot_Package:
if (m_object->stereotype() == "subsystem")
@@ -363,10 +363,10 @@
*/
void UMLListViewItem::updateFolder()
{
- Icon_Utils::Icon_Type icon = Model_Utils::convert_LVT_IT(m_type);
+ Icon_Utils::IconType icon = Model_Utils::convert_LVT_IT(m_type);
if (icon) {
if (Model_Utils::typeIsFolder(m_type))
- icon = (Icon_Utils::Icon_Type)((int)icon + (int)isOpen());
+ icon = (Icon_Utils::IconType)((int)icon + (int)isOpen());
setIcon(icon);
}
}
@@ -415,9 +415,9 @@
}
/**
- * Set the pixmap corresponding to the given Icon_Type.
+ * Set the pixmap corresponding to the given IconType.
*/
-void UMLListViewItem::setIcon(Icon_Utils::Icon_Type iconType)
+void UMLListViewItem::setIcon(Icon_Utils::IconType iconType)
{
setPixmap(0, Icon_Utils::SmallIcon(iconType));
}
--- trunk/KDE/kdesdk/umbrello/umbrello/umllistviewitem.h #1240340:1240341
@@ -119,7 +119,7 @@
void setCreating(bool creating);
- void setIcon(Icon_Utils::Icon_Type iconType);
+ void setIcon(Icon_Utils::IconType iconType);
void cancelRename( int col );
--- trunk/KDE/kdesdk/umbrello/umbrello/worktoolbar.cpp #1240340:1240341
@@ -293,7 +293,7 @@
const struct ButtonInfo {
const ToolBar_Buttons tbb;
const QString btnName;
- const Icon_Utils::Icon_Type icon;
+ const Icon_Utils::IconType icon;
const char *slotName;
} buttonInfo[] = {
More information about the umbrello-devel
mailing list