[Uml-devel] KDE/kdesdk/umbrello/umbrello
Ralf Habacker
ralf.habacker at gmail.com
Thu Jan 12 13:00:31 UTC 2012
SVN commit 1273301 by habacker:
Renamed getUseFillColor() to useFillColor().
M +1 -1 dialogs/umlwidgetstylepage.cpp
M +14 -14 listpopupmenu.cpp
M +1 -1 umlview.cpp
M +1 -1 umlview.h
M +3 -3 widgets/activitywidget.cpp
M +1 -1 widgets/actorwidget.cpp
M +1 -1 widgets/artifactwidget.cpp
M +1 -1 widgets/categorywidget.cpp
M +1 -1 widgets/classifierwidget.cpp
M +1 -1 widgets/combinedfragmentwidget.cpp
M +1 -1 widgets/componentwidget.cpp
M +1 -1 widgets/datatypewidget.cpp
M +1 -1 widgets/entitywidget.cpp
M +1 -1 widgets/enumwidget.cpp
M +1 -1 widgets/nodewidget.cpp
M +1 -1 widgets/notewidget.cpp
M +1 -1 widgets/objectnodewidget.cpp
M +2 -2 widgets/objectwidget.cpp
M +1 -1 widgets/packagewidget.cpp
M +1 -1 widgets/pinwidget.cpp
M +1 -1 widgets/preconditionwidget.cpp
M +3 -3 widgets/signalwidget.cpp
M +1 -1 widgets/statewidget.cpp
M +1 -1 widgets/umlwidget.cpp
M +1 -1 widgets/umlwidget.h
M +1 -1 widgets/usecasewidget.cpp
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlwidgetstylepage.cpp #1273300:1273301
@@ -39,7 +39,7 @@
m_pTextColorB->setColor( pWidget->textColor() );
m_pLineColorB->setColor( pWidget->lineColor() );
m_pFillColorB->setColor( pWidget->fillColor() );
- m_pUseFillColorCB->setChecked( pWidget->getUseFillColor() );
+ m_pUseFillColorCB->setChecked( pWidget->useFillColor() );
m_lineWidthB->setValue( pWidget->lineWidth() );
if (!m_pUMLWidget) { // when we are on the diagram
--- trunk/KDE/kdesdk/umbrello/umbrello/listpopupmenu.cpp #1273300:1273301
@@ -276,7 +276,7 @@
c = static_cast<ClassifierWidget *>( object );
makeMultiClassifierPopup(c);
}
- insertSubMenuColor(object->getUseFillColor());
+ insertSubMenuColor(object->useFillColor());
addSeparator();
insert(mt_Cut);
insert(mt_Copy);
@@ -305,7 +305,7 @@
switch (type) {
case WidgetBase::wt_Actor:
case WidgetBase::wt_UseCase:
- insertSubMenuColor(object->getUseFillColor());
+ insertSubMenuColor(object->useFillColor());
insertStdItems(true, type);
insert(mt_Rename);
insert(mt_Change_Font);
@@ -318,7 +318,7 @@
static_cast<UMLCategory*>(object->umlObject()));
m->setTitle(i18n("Category Type"));
addMenu(m);
- insertSubMenuColor(object->getUseFillColor());
+ insertSubMenuColor(object->useFillColor());
insertStdItems(true, type);
insert(mt_Rename);
insert(mt_Change_Font);
@@ -331,7 +331,7 @@
case WidgetBase::wt_Enum:
insertSubMenuNew(mt_Enum);
- insertSubMenuColor(object->getUseFillColor());
+ insertSubMenuColor(object->useFillColor());
insertStdItems(true, type);
insert(mt_Rename);
insert(mt_Change_Font);
@@ -340,7 +340,7 @@
case WidgetBase::wt_Entity:
insertSubMenuNew(mt_Entity);
- insertSubMenuColor(object->getUseFillColor());
+ insertSubMenuColor(object->useFillColor());
insertStdItems(true, type);
insert(mt_Rename);
insert(mt_Change_Font);
@@ -352,7 +352,7 @@
case WidgetBase::wt_Component:
case WidgetBase::wt_Node:
case WidgetBase::wt_Artifact:
- insertSubMenuColor(object->getUseFillColor());
+ insertSubMenuColor(object->useFillColor());
insertStdItems(false, type);
insert(mt_Rename);
insert(mt_Change_Font);
@@ -363,7 +363,7 @@
{
UMLView * pView = static_cast<UMLView *>(parent);
//Used for sequence diagram and collaboration diagram widgets
- insertSubMenuColor( object->getUseFillColor() );
+ insertSubMenuColor( object->useFillColor() );
if( pView->type() == Uml::DiagramType::Sequence ) {
addSeparator();
MenuType tabUp = mt_Up;
@@ -389,7 +389,7 @@
break;
case WidgetBase::wt_Note:
- insertSubMenuColor(object->getUseFillColor());
+ insertSubMenuColor(object->useFillColor());
addSeparator();
insert(mt_Cut);
insert(mt_Copy);
@@ -412,7 +412,7 @@
if (pState->stateType() == StateWidget::Normal) {
insertSubMenuNew(mt_New_Activity);
}
- insertSubMenuColor( object->getUseFillColor() );
+ insertSubMenuColor( object->useFillColor() );
insertStdItems(false, type);
if (pState->stateType() == StateWidget::Normal) {
insert(mt_Rename, i18n("Change State Name..."));
@@ -440,7 +440,7 @@
if( pActivity->activityType() == ActivityWidget::Normal
|| pActivity->activityType() == ActivityWidget::Invok
|| pActivity->activityType() == ActivityWidget::Param) {
- insertSubMenuColor( object->getUseFillColor() );
+ insertSubMenuColor( object->useFillColor() );
}
insertStdItems(false, type);
if( pActivity->activityType() == ActivityWidget::Normal
@@ -459,7 +459,7 @@
if (objWidget->objectNodeType() == ObjectNodeWidget::Buffer
|| objWidget->objectNodeType() == ObjectNodeWidget::Data
|| objWidget->objectNodeType() == ObjectNodeWidget::Flow) {
- insertSubMenuColor( object->getUseFillColor() );
+ insertSubMenuColor( object->useFillColor() );
}
insertStdItems(false, type);
if (objWidget->objectNodeType() == ObjectNodeWidget::Buffer
@@ -476,7 +476,7 @@
case WidgetBase::wt_Signal:
case WidgetBase::wt_FloatingDashLine:
case WidgetBase::wt_Precondition:
- insertSubMenuColor(object->getUseFillColor());
+ insertSubMenuColor(object->useFillColor());
addSeparator();
insert(mt_Cut);
insert(mt_Copy);
@@ -495,7 +495,7 @@
insert(mt_AddInteractionOperand, i18n("Add Interaction Operand"));
addSeparator();
}
- insertSubMenuColor(object->getUseFillColor());
+ insertSubMenuColor(object->useFillColor());
addSeparator();
insert(mt_Cut);
insert(mt_Copy);
@@ -943,7 +943,7 @@
makeMultiClassifierPopup(c);
- insertSubMenuColor(c->getUseFillColor());
+ insertSubMenuColor(c->useFillColor());
insertStdItems(true, type);
insert(mt_Rename);
insert(mt_Change_Font);
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.cpp #1273300:1273301
@@ -904,7 +904,7 @@
m_pDoc->setModified();
}
-bool UMLView::getUseFillColor() const
+bool UMLView::useFillColor() const
{
return m_Options.uiState.useFillColor;
}
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.h #1273300:1273301
@@ -291,7 +291,7 @@
/**
* Returns whether to use the fill/background color
*/
- bool getUseFillColor() const;
+ bool useFillColor() const;
/**
* Sets whether to use the fill/background color
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/activitywidget.cpp #1273300:1273301
@@ -171,7 +171,7 @@
{
case Normal :
UMLWidget::setPenFromSettings(p);
- if ( UMLWidget::getUseFillColor() ) {
+ if ( UMLWidget::useFillColor() ) {
p.setBrush( UMLWidget::fillColor() );
}
{
@@ -235,7 +235,7 @@
case Invok :
UMLWidget::setPenFromSettings(p);
- if ( UMLWidget::getUseFillColor() ) {
+ if ( UMLWidget::useFillColor() ) {
p.setBrush( UMLWidget::fillColor() );
}
{
@@ -260,7 +260,7 @@
case Param :
UMLWidget::setPenFromSettings(p);
- if ( UMLWidget::getUseFillColor() ) {
+ if ( UMLWidget::useFillColor() ) {
p.setBrush( UMLWidget::fillColor() );
}
{
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/actorwidget.cpp #1273300:1273301
@@ -40,7 +40,7 @@
void ActorWidget::paint(QPainter & p, int offsetX, int offsetY)
{
UMLWidget::setPenFromSettings(p);
- if( UMLWidget::getUseFillColor() )
+ if( UMLWidget::useFillColor() )
p.setBrush( UMLWidget::fillColor() );
const int w = width();
const int h = height();
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/artifactwidget.cpp #1273300:1273301
@@ -43,7 +43,7 @@
void ArtifactWidget::paint(QPainter& p, int offsetX, int offsetY)
{
UMLWidget::setPenFromSettings(p);
- if ( UMLWidget::getUseFillColor() ) {
+ if ( UMLWidget::useFillColor() ) {
p.setBrush( UMLWidget::fillColor() );
} else {
p.setBrush( m_scene->viewport()->palette().color(QPalette::Background) );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/categorywidget.cpp #1273300:1273301
@@ -34,7 +34,7 @@
void CategoryWidget::paint(QPainter & p, int offsetX, int offsetY)
{
UMLWidget::setPenFromSettings(p);
- if ( UMLWidget::getUseFillColor() )
+ if ( UMLWidget::useFillColor() )
p.setBrush( UMLWidget::fillColor() );
QFont font = UMLWidget::font();
font.setUnderline(false);
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/classifierwidget.cpp #1273300:1273301
@@ -550,7 +550,7 @@
void ClassifierWidget::paint(QPainter & p, int offsetX, int offsetY)
{
setPenFromSettings(p);
- if ( UMLWidget::getUseFillColor() )
+ if ( UMLWidget::useFillColor() )
p.setBrush( UMLWidget::fillColor() );
else
p.setBrush( m_scene->viewport()->palette().color(QPalette::Background) );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/combinedfragmentwidget.cpp #1273300:1273301
@@ -52,7 +52,7 @@
setPenFromSettings(p);
if ( m_CombinedFragment == Ref ) {
- if ( UMLWidget::getUseFillColor() ) {
+ if ( UMLWidget::useFillColor() ) {
p.setBrush( UMLWidget::fillColor() );
}
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/componentwidget.cpp #1273300:1273301
@@ -61,7 +61,7 @@
thickerPen.setWidth(2);
p.setPen(thickerPen);
}
- if ( UMLWidget::getUseFillColor() ) {
+ if ( UMLWidget::useFillColor() ) {
p.setBrush( UMLWidget::fillColor() );
} else {
p.setBrush( m_scene->viewport()->palette().color(QPalette::Background) );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/datatypewidget.cpp #1273300:1273301
@@ -50,7 +50,7 @@
void DatatypeWidget::paint(QPainter& p, int offsetX, int offsetY)
{
setPenFromSettings(p);
- if (UMLWidget::getUseFillColor()) {
+ if (UMLWidget::useFillColor()) {
p.setBrush(UMLWidget::fillColor());
} else {
p.setBrush( m_scene->viewport()->palette().color(QPalette::Background) );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/entitywidget.cpp #1273300:1273301
@@ -60,7 +60,7 @@
void EntityWidget::paint(QPainter& p, int offsetX, int offsetY)
{
setPenFromSettings(p);
- if(UMLWidget::getUseFillColor())
+ if(UMLWidget::useFillColor())
p.setBrush(UMLWidget::fillColor());
else
p.setBrush( m_scene->viewport()->palette().color(QPalette::Background) );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/enumwidget.cpp #1273300:1273301
@@ -95,7 +95,7 @@
void EnumWidget::paint(QPainter& p, int offsetX, int offsetY)
{
setPenFromSettings(p);
- if(UMLWidget::getUseFillColor())
+ if(UMLWidget::useFillColor())
p.setBrush(UMLWidget::fillColor());
else
p.setBrush( m_scene->viewport()->palette().color(QPalette::Background) );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/nodewidget.cpp #1273300:1273301
@@ -38,7 +38,7 @@
void NodeWidget::paint(QPainter & p, int offsetX, int offsetY)
{
setPenFromSettings(p);
- if ( UMLWidget::getUseFillColor() ) {
+ if ( UMLWidget::useFillColor() ) {
p.setBrush( UMLWidget::fillColor() );
} else {
p.setBrush( m_scene->viewport()->palette().color(QPalette::Background) );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/notewidget.cpp #1273300:1273301
@@ -71,7 +71,7 @@
poly.setPoint(5, offsetX, offsetY);
setPenFromSettings(p);
- if ( UMLWidget::getUseFillColor() ) {
+ if ( UMLWidget::useFillColor() ) {
QBrush brush( UMLWidget::fillColor() );
p.setBrush(brush);
p.drawPolygon(poly);
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectnodewidget.cpp #1273300:1273301
@@ -56,7 +56,7 @@
setPenFromSettings(p);
- if ( UMLWidget::getUseFillColor() ) {
+ if ( UMLWidget::useFillColor() ) {
p.setBrush( UMLWidget::fillColor() );
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectwidget.cpp #1273300:1273301
@@ -241,7 +241,7 @@
p.setFont( font );
setPenFromSettings(p);
- if(UMLWidget::getUseFillColor())
+ if(UMLWidget::useFillColor())
p.setBrush(UMLWidget::fillColor());
else
p.setBrush( m_scene->viewport()->palette().color(QPalette::Background) );
@@ -269,7 +269,7 @@
const QFontMetrics &fm = getFontMetrics(FT_UNDERLINE);
setPenFromSettings(p);
- if ( UMLWidget::getUseFillColor() )
+ if ( UMLWidget::useFillColor() )
p.setBrush( UMLWidget::fillColor() );
const int w = width();
const int textStartY = A_HEIGHT + A_MARGIN;
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/packagewidget.cpp #1273300:1273301
@@ -45,7 +45,7 @@
void PackageWidget::paint(QPainter & p, int offsetX, int offsetY)
{
setPenFromSettings(p);
- if ( UMLWidget::getUseFillColor() )
+ if ( UMLWidget::useFillColor() )
p.setBrush( UMLWidget::fillColor() );
else
p.setBrush( m_scene->viewport()->palette().color(QPalette::Background) );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/pinwidget.cpp #1273300:1273301
@@ -131,7 +131,7 @@
// }
setPenFromSettings(p);
- if ( UMLWidget::getUseFillColor() ) {
+ if ( UMLWidget::useFillColor() ) {
p.setBrush( UMLWidget::fillColor() );
}
p.drawRect(x,y,w, h);
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/preconditionwidget.cpp #1273300:1273301
@@ -78,7 +78,7 @@
}
setY(y);
setPenFromSettings(p);
- if ( UMLWidget::getUseFillColor() ) {
+ if ( UMLWidget::useFillColor() ) {
p.setBrush( UMLWidget::fillColor() );
}
{
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/signalwidget.cpp #1273300:1273301
@@ -73,7 +73,7 @@
switch (m_signalType)
{
case Send :
- if(UMLWidget::getUseFillColor())
+ if(UMLWidget::useFillColor())
p.setBrush(UMLWidget::fillColor());
{
@@ -98,7 +98,7 @@
}
break;
case Accept :
- if(UMLWidget::getUseFillColor())
+ if(UMLWidget::useFillColor())
p.setBrush(UMLWidget::fillColor());
{
a.setPoints( 5, offsetX , offsetY,
@@ -123,7 +123,7 @@
}
break;
case Time :
- if(UMLWidget::getUseFillColor())
+ if(UMLWidget::useFillColor())
p.setBrush(UMLWidget::fillColor());
{
a.setPoints( 4, offsetX , offsetY,
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/statewidget.cpp #1273300:1273301
@@ -62,7 +62,7 @@
switch (m_StateType)
{
case Normal :
- if(UMLWidget::getUseFillColor())
+ if(UMLWidget::useFillColor())
p.setBrush(UMLWidget::fillColor());
{
const QFontMetrics &fm = getFontMetrics(FT_NORMAL);
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.cpp #1273300:1273301
@@ -506,7 +506,7 @@
m_LineColor = m_scene->getLineColor();
}
if (m_usesDiagramUseFillColor) {
- m_useFillColor = m_scene->getUseFillColor();
+ m_useFillColor = m_scene->useFillColor();
}
update();
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.h #1273300:1273301
@@ -61,7 +61,7 @@
/**
* Read property of bool m_useFillColor.
*/
- bool getUseFillColor() const {
+ bool useFillColor() const {
return m_useFillColor;
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/usecasewidget.cpp #1273300:1273301
@@ -40,7 +40,7 @@
void UseCaseWidget::paint(QPainter & p, int offsetX, int offsetY)
{
setPenFromSettings(p);
- if ( UMLWidget::getUseFillColor() )
+ if ( UMLWidget::useFillColor() )
p.setBrush( UMLWidget::fillColor() );
QFont font = UMLWidget::font();
font.setUnderline(false);
More information about the umbrello-devel
mailing list