[Uml-devel] KDE/kdesdk/umbrello/umbrello
Ralf Habacker
ralf.habacker at gmail.com
Thu Jan 12 13:00:20 UTC 2012
SVN commit 1273300 by habacker:
Renamed getFillColor() to fillColor().
M +1 -1 cmds/widget/cmd_changeFillColor.cpp
M +1 -1 dialogs/umlwidgetstylepage.cpp
M +1 -1 umlview.cpp
M +1 -1 umlview.h
M +4 -4 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 +3 -3 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 +3 -3 widgets/umlwidget.cpp
M +1 -1 widgets/umlwidget.h
M +1 -1 widgets/usecasewidget.cpp
--- trunk/KDE/kdesdk/umbrello/umbrello/cmds/widget/cmd_changeFillColor.cpp #1273299:1273300
@@ -24,7 +24,7 @@
m_color(col)
{
setText(i18n("Change fill color : %1", w->name()));
- m_oldColor = w->getFillColor();
+ m_oldColor = w->fillColor();
}
CmdChangeFillColor::~CmdChangeFillColor()
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlwidgetstylepage.cpp #1273299:1273300
@@ -38,7 +38,7 @@
init();
m_pTextColorB->setColor( pWidget->textColor() );
m_pLineColorB->setColor( pWidget->lineColor() );
- m_pFillColorB->setColor( pWidget->getFillColor() );
+ m_pFillColorB->setColor( pWidget->fillColor() );
m_pUseFillColorCB->setChecked( pWidget->getUseFillColor() );
m_lineWidthB->setValue( pWidget->lineWidth() );
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.cpp #1273299:1273300
@@ -914,7 +914,7 @@
m_Options.uiState.useFillColor = ufc;
}
-QColor UMLView::getFillColor() const
+QColor UMLView::fillColor() const
{
return m_Options.uiState.fillColor;
}
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.h #1273299:1273300
@@ -131,7 +131,7 @@
/**
* Returns the fill color to use.
*/
- QColor getFillColor() const;
+ QColor fillColor() const;
/**
* Set the background color.
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/activitywidget.cpp #1273299:1273300
@@ -172,7 +172,7 @@
case Normal :
UMLWidget::setPenFromSettings(p);
if ( UMLWidget::getUseFillColor() ) {
- p.setBrush( UMLWidget::getFillColor() );
+ p.setBrush( UMLWidget::fillColor() );
}
{
const QFontMetrics &fm = getFontMetrics(FT_NORMAL);
@@ -221,7 +221,7 @@
case Branch :
UMLWidget::setPenFromSettings(p);
- p.setBrush( UMLWidget::getFillColor() );
+ p.setBrush( UMLWidget::fillColor() );
{
QPolygon array( 4 );
array[ 0 ] = QPoint( offsetX + w / 2, offsetY );
@@ -236,7 +236,7 @@
case Invok :
UMLWidget::setPenFromSettings(p);
if ( UMLWidget::getUseFillColor() ) {
- p.setBrush( UMLWidget::getFillColor() );
+ p.setBrush( UMLWidget::fillColor() );
}
{
const QFontMetrics &fm = getFontMetrics(FT_NORMAL);
@@ -261,7 +261,7 @@
case Param :
UMLWidget::setPenFromSettings(p);
if ( UMLWidget::getUseFillColor() ) {
- p.setBrush( UMLWidget::getFillColor() );
+ p.setBrush( UMLWidget::fillColor() );
}
{
const QFontMetrics &fm = getFontMetrics(FT_NORMAL);
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/actorwidget.cpp #1273299:1273300
@@ -41,7 +41,7 @@
{
UMLWidget::setPenFromSettings(p);
if( UMLWidget::getUseFillColor() )
- p.setBrush( UMLWidget::getFillColor() );
+ p.setBrush( UMLWidget::fillColor() );
const int w = width();
const int h = height();
p.setFont( UMLWidget::font() );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/artifactwidget.cpp #1273299:1273300
@@ -44,7 +44,7 @@
{
UMLWidget::setPenFromSettings(p);
if ( UMLWidget::getUseFillColor() ) {
- p.setBrush( UMLWidget::getFillColor() );
+ p.setBrush( UMLWidget::fillColor() );
} else {
p.setBrush( m_scene->viewport()->palette().color(QPalette::Background) );
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/categorywidget.cpp #1273299:1273300
@@ -35,7 +35,7 @@
{
UMLWidget::setPenFromSettings(p);
if ( UMLWidget::getUseFillColor() )
- p.setBrush( UMLWidget::getFillColor() );
+ p.setBrush( UMLWidget::fillColor() );
QFont font = UMLWidget::font();
font.setUnderline(false);
font.setBold(false);
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/classifierwidget.cpp #1273299:1273300
@@ -551,7 +551,7 @@
{
setPenFromSettings(p);
if ( UMLWidget::getUseFillColor() )
- p.setBrush( UMLWidget::getFillColor() );
+ p.setBrush( UMLWidget::fillColor() );
else
p.setBrush( m_scene->viewport()->palette().color(QPalette::Background) );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/combinedfragmentwidget.cpp #1273299:1273300
@@ -53,7 +53,7 @@
if ( m_CombinedFragment == Ref ) {
if ( UMLWidget::getUseFillColor() ) {
- p.setBrush( UMLWidget::getFillColor() );
+ p.setBrush( UMLWidget::fillColor() );
}
}
const QFontMetrics &fm = getFontMetrics(FT_NORMAL);
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/componentwidget.cpp #1273299:1273300
@@ -62,7 +62,7 @@
p.setPen(thickerPen);
}
if ( UMLWidget::getUseFillColor() ) {
- p.setBrush( UMLWidget::getFillColor() );
+ p.setBrush( UMLWidget::fillColor() );
} else {
p.setBrush( m_scene->viewport()->palette().color(QPalette::Background) );
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/datatypewidget.cpp #1273299:1273300
@@ -51,7 +51,7 @@
{
setPenFromSettings(p);
if (UMLWidget::getUseFillColor()) {
- p.setBrush(UMLWidget::getFillColor());
+ p.setBrush(UMLWidget::fillColor());
} else {
p.setBrush( m_scene->viewport()->palette().color(QPalette::Background) );
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/entitywidget.cpp #1273299:1273300
@@ -61,7 +61,7 @@
{
setPenFromSettings(p);
if(UMLWidget::getUseFillColor())
- p.setBrush(UMLWidget::getFillColor());
+ p.setBrush(UMLWidget::fillColor());
else
p.setBrush( m_scene->viewport()->palette().color(QPalette::Background) );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/enumwidget.cpp #1273299:1273300
@@ -96,7 +96,7 @@
{
setPenFromSettings(p);
if(UMLWidget::getUseFillColor())
- p.setBrush(UMLWidget::getFillColor());
+ p.setBrush(UMLWidget::fillColor());
else
p.setBrush( m_scene->viewport()->palette().color(QPalette::Background) );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/nodewidget.cpp #1273299:1273300
@@ -39,7 +39,7 @@
{
setPenFromSettings(p);
if ( UMLWidget::getUseFillColor() ) {
- p.setBrush( UMLWidget::getFillColor() );
+ p.setBrush( UMLWidget::fillColor() );
} else {
p.setBrush( m_scene->viewport()->palette().color(QPalette::Background) );
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/notewidget.cpp #1273299:1273300
@@ -72,7 +72,7 @@
setPenFromSettings(p);
if ( UMLWidget::getUseFillColor() ) {
- QBrush brush( UMLWidget::getFillColor() );
+ QBrush brush( UMLWidget::fillColor() );
p.setBrush(brush);
p.drawPolygon(poly);
} else
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectnodewidget.cpp #1273299:1273300
@@ -57,7 +57,7 @@
setPenFromSettings(p);
if ( UMLWidget::getUseFillColor() ) {
- p.setBrush( UMLWidget::getFillColor() );
+ p.setBrush( UMLWidget::fillColor() );
}
p.drawRect(offsetX, offsetY, w, h);
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectwidget.cpp #1273299:1273300
@@ -204,7 +204,7 @@
void ObjectWidget::slotColorChanged(Uml::IDType /*viewID*/)
{
- UMLWidget::setFillColor( m_scene->getFillColor() );
+ UMLWidget::setFillColor( m_scene->fillColor() );
UMLWidget::setLineColor( m_scene->getLineColor() );
if( m_pLine)
@@ -242,7 +242,7 @@
setPenFromSettings(p);
if(UMLWidget::getUseFillColor())
- p.setBrush(UMLWidget::getFillColor());
+ p.setBrush(UMLWidget::fillColor());
else
p.setBrush( m_scene->viewport()->palette().color(QPalette::Background) );
const int w = width();
@@ -270,7 +270,7 @@
setPenFromSettings(p);
if ( UMLWidget::getUseFillColor() )
- p.setBrush( UMLWidget::getFillColor() );
+ p.setBrush( UMLWidget::fillColor() );
const int w = width();
const int textStartY = A_HEIGHT + A_MARGIN;
const int fontHeight = fm.lineSpacing();
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/packagewidget.cpp #1273299:1273300
@@ -46,7 +46,7 @@
{
setPenFromSettings(p);
if ( UMLWidget::getUseFillColor() )
- p.setBrush( UMLWidget::getFillColor() );
+ p.setBrush( UMLWidget::fillColor() );
else
p.setBrush( m_scene->viewport()->palette().color(QPalette::Background) );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/pinwidget.cpp #1273299:1273300
@@ -132,7 +132,7 @@
setPenFromSettings(p);
if ( UMLWidget::getUseFillColor() ) {
- p.setBrush( UMLWidget::getFillColor() );
+ p.setBrush( UMLWidget::fillColor() );
}
p.drawRect(x,y,w, h);
//make sure it's always above the other
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/preconditionwidget.cpp #1273299:1273300
@@ -79,7 +79,7 @@
setY(y);
setPenFromSettings(p);
if ( UMLWidget::getUseFillColor() ) {
- p.setBrush( UMLWidget::getFillColor() );
+ p.setBrush( UMLWidget::fillColor() );
}
{
const QFontMetrics &fm = getFontMetrics(FT_NORMAL);
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/signalwidget.cpp #1273299:1273300
@@ -74,7 +74,7 @@
{
case Send :
if(UMLWidget::getUseFillColor())
- p.setBrush(UMLWidget::getFillColor());
+ p.setBrush(UMLWidget::fillColor());
{
a.setPoints( 5, offsetX ,offsetY,
@@ -99,7 +99,7 @@
break;
case Accept :
if(UMLWidget::getUseFillColor())
- p.setBrush(UMLWidget::getFillColor());
+ p.setBrush(UMLWidget::fillColor());
{
a.setPoints( 5, offsetX , offsetY,
offsetX + w/3, (h/2)+offsetY,
@@ -124,7 +124,7 @@
break;
case Time :
if(UMLWidget::getUseFillColor())
- p.setBrush(UMLWidget::getFillColor());
+ p.setBrush(UMLWidget::fillColor());
{
a.setPoints( 4, offsetX , offsetY,
offsetX + w, offsetY+h,
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/statewidget.cpp #1273299:1273300
@@ -63,7 +63,7 @@
{
case Normal :
if(UMLWidget::getUseFillColor())
- p.setBrush(UMLWidget::getFillColor());
+ p.setBrush(UMLWidget::fillColor());
{
const QFontMetrics &fm = getFontMetrics(FT_NORMAL);
const int fontHeight = fm.lineSpacing();
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.cpp #1273299:1273300
@@ -389,7 +389,7 @@
case ListPopupMenu::mt_Fill_Color:
widget = m_scene->getFirstMultiSelectedWidget();
if (widget) {
- newColor = widget->getFillColor();
+ newColor = widget->fillColor();
}
if (KColorDialog::getColor(newColor)) {
m_scene->selectionSetFillColor(newColor);
@@ -500,7 +500,7 @@
return;
}
if (m_usesDiagramFillColor) {
- m_FillColor = m_scene->getFillColor();
+ m_FillColor = m_scene->fillColor();
}
if (m_usesDiagramLineColor) {
m_LineColor = m_scene->getLineColor();
@@ -620,7 +620,7 @@
/**
* Read property m_FillColor.
*/
-QColor UMLWidget::getFillColor() const
+QColor UMLWidget::fillColor() const
{
return m_FillColor;
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.h #1273299:1273300
@@ -73,7 +73,7 @@
void setLineWidth(uint width);
- QColor getFillColor() const;
+ QColor fillColor() const;
void setFillColor(const QColor &color);
void setFillColorcmd(const QColor &color);
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/usecasewidget.cpp #1273299:1273300
@@ -41,7 +41,7 @@
{
setPenFromSettings(p);
if ( UMLWidget::getUseFillColor() )
- p.setBrush( UMLWidget::getFillColor() );
+ p.setBrush( UMLWidget::fillColor() );
QFont font = UMLWidget::font();
font.setUnderline(false);
font.setBold(false);
More information about the umbrello-devel
mailing list