[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Andi Fischer]

SVN commit 1169675 by fischer:

BUG 247466 fixed.

 M  +2 -2      umlview.cpp  
 M  +9 -7      widgets/umlwidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.cpp #1169674:1169675
@@ -1047,7 +1047,7 @@
 
 void UMLView::selectionSetLineColor(const QColor &color)
 {
-    UMLApp::app()->beginMacro("Change Line Color");
+    UMLApp::app()->beginMacro(i18n("Change Line Color"));
     UMLWidget * temp = 0;
     foreach(temp ,  m_SelectedList) {
         temp->setLineColor(color);
@@ -1076,7 +1076,7 @@
 
 void UMLView::selectionSetFillColor(const QColor &color)
 {
-    UMLApp::app()->beginMacro("Change Fill Color");
+    UMLApp::app()->beginMacro(i18n("Change Fill Color"));
 
     foreach(UMLWidget* temp ,  m_SelectedList) {
         temp->setFillColour(color);
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.cpp #1169674:1169675
@@ -10,14 +10,16 @@
 
 // own header file
 #include "umlwidget.h"
-// system includes
+// qt includes
 #include <QtCore/QPointer>
 #include <QtGui/QPainter>
 #include <QtGui/QColor>
 #include <QtGui/QMouseEvent>
+// kde includes
 #include <kdebug.h>
 #include <kcolordialog.h>
 #include <kfontdialog.h>
+#include <klocale.h>
 #include <kmessagebox.h>
 // local includes
 #include "umlwidgetcontroller.h"
@@ -231,7 +233,7 @@
         m_Font       = optionState.uiState.font;
         m_bShowStereotype = optionState.classState.showStereoType;
     } else {
-        uError() << "SERIOUS PROBLEM - m_pView is NULL" << endl;
+        uError() << "SERIOUS PROBLEM - m_pView is NULL";
         m_bUseFillColour = false;
         m_bUsesDiagramFillColour = false;
         m_bUsesDiagramUseFillColour = false;
@@ -288,11 +290,11 @@
                 wt == wt_Component || wt == wt_Artifact ||
                 wt == wt_Node || wt == wt_Enum || wt == wt_Entity ||
                 (wt == wt_Class && m_pView->getType() == dt_Class)) {
-            UMLApp::app()->beginMacro("Change Properties");
+            UMLApp::app()->beginMacro(i18n("Change Properties"));
             showProperties();
             UMLApp::app()->endMacro();
         } else if (wt == wt_Object) {
-            UMLApp::app()->beginMacro("Change Properties");
+            UMLApp::app()->beginMacro(i18n("Change Properties"));
             m_pObject->showProperties();
             UMLApp::app()->endMacro();
         } else {
@@ -402,7 +404,7 @@
     }
 
     default:
-        uDebug() << "Menu_Type " << sel << " not implemented" << endl;
+        uDebug() << "Menu_Type " << sel << " not implemented";
     }
 }
 
@@ -512,7 +514,7 @@
     if (widgetHasUMLObject(m_Type) && m_pObject == NULL) {
         m_pObject = m_pDoc->findObjectById(m_nId);
         if (m_pObject == NULL) {
-            uError() << "cannot find UMLObject with id=" << ID2STR(m_nId) << endl;
+            uError() << "cannot find UMLObject with id=" << ID2STR(m_nId);
             return false;
         }
     }
@@ -764,7 +766,7 @@
     const QPoint pos(getX(), getY());
     UMLWidget *bkgnd = m_pView->getWidgetAt(pos);
     if (bkgnd && bkgnd != this && _select) {
-        uDebug() << "setting Z to " << bkgnd->getZ() + 1 << ", SelectState: " << _select << endl;
+        uDebug() << "setting Z to " << bkgnd->getZ() + 1 << ", SelectState: " << _select;
         setZ(bkgnd->getZ() + 1);
     } else {
         setZ(m_origZ);