[Uml-devel] kdesdk/umbrello/umbrello

[Brian Thomas]

CVS commit by thomas: 

Fix compile time errors from changes to umlwidget. Problems either involved
call to now-missing getData() method OR to change in spelling of "Color" in
the accessor methods such as getFillColour(). 


  M +2 -2      umlwidget.h   1.17
  M +2 -2      dialogs/classgenpage.cpp   1.19
  M +3 -3      dialogs/umlwidgetcolorpage.cpp   1.10


--- kdesdk/umbrello/umbrello/dialogs/classgenpage.cpp  #1.18:1.19
@@ -287,5 +287,5 @@ ClassGenPage::ClassGenPage(UMLDoc* d, QW
 
         m_pInstanceLE = new QLineEdit(this);
-        m_pInstanceLE->setText(widget->getData()->getInstanceName());
+        m_pInstanceLE->setText(widget->getInstanceName());
         m_pNameLayout->addWidget(m_pInstanceLE, 2, 1);
 
@@ -373,5 +373,5 @@ void ClassGenPage::updateObject() {
                         o -> setName(name);
         } else if (m_pInstanceWidget) {
-                m_pInstanceWidget->getData()->setInstanceName(m_pInstanceLE->text());
+                m_pInstanceWidget->setInstanceName(m_pInstanceLE->text());
                 QString name = m_pClassNameLE->text();
                 m_pInstanceWidget->setDoc(m_pDoc->text());

--- kdesdk/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp  #1.9:1.10
@@ -37,5 +37,5 @@ UMLWidgetColorPage::UMLWidgetColorPage( 
         colorLayout -> addWidget( m_pLineColorL, 0, 0 );
 
-        m_pLineColorB = new KColorButton( pWidget -> getLineColor(), m_pColorGB );
+        m_pLineColorB = new KColorButton( pWidget -> getLineColour(), m_pColorGB );
         colorLayout -> addWidget( m_pLineColorB, 0, 1 );
         m_pLineColorL->setBuddy(m_pLineColorB);
@@ -57,5 +57,5 @@ UMLWidgetColorPage::UMLWidgetColorPage( 
         colorLayout -> setRowStretch( 2, 2 );
         colorLayout -> addWidget( m_pUseFillColorCB, 2, 0 );
-        m_pUseFillColorCB -> setChecked( pWidget -> getUseFillColor() );
+        m_pUseFillColorCB -> setChecked( pWidget -> getUseFillColour() );
 
         //connect button signals up
@@ -77,5 +77,5 @@ void UMLWidgetColorPage::slotFillButtonC
 
 void UMLWidgetColorPage::updateUMLWidget() {
-        m_pUMLWidget->setUseFillColor( m_pUseFillColorCB -> isChecked() );
+        m_pUMLWidget->setUseFillColour( m_pUseFillColorCB -> isChecked() );
         m_pUMLWidget->setLineColour( m_pLineColorB -> color() );
         m_pUMLWidget->setFillColour( m_pFillColorB -> color() );

--- kdesdk/umbrello/umbrello/umlwidget.h  #1.16:1.17
@@ -644,10 +644,10 @@ protected:
 
         /**
-         * Colour of the lines of the widget
+         * Color of the lines of the widget
          */
         QColor m_LineColour;
 
         /**
-         * Colour of the background of the widget
+         * Color of the background of the widget
          */
         QColor m_FillColour;