[Uml-devel] branches/work/soc-umbrello

[Gopala Krishna A]

SVN commit 942480 by gopala:

Merged revisions 911706,911709,911805 via svnmerge from 
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r911706 | habacker | 2009-01-16 04:48:15 +0530 (Fri, 16 Jan 2009) | 1 line
  
  initialize local variable
........
  r911709 | habacker | 2009-01-16 04:48:55 +0530 (Fri, 16 Jan 2009) | 1 line
  
  use english debug messages
........
  r911805 | habacker | 2009-01-16 13:54:32 +0530 (Fri, 16 Jan 2009) | 1 line
  
  bug fix: when adding new class widgets to a class diagram init the public only attribute from the current diagram setting
........


 _M            . (directory)  
 M  +1 -1      umbrello/clipboard/idchangelog.cpp  
 M  +3 -4      umbrello/cmds/widget/cmd_set_txt.cpp  
 M  +3 -0      umbrello/widgets/classifierwidget.cpp  


** branches/work/soc-umbrello #property svnmerge-integrated
   - /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119,911086
   + /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119,911086,911706-911805
--- branches/work/soc-umbrello/umbrello/clipboard/idchangelog.cpp #942479:942480
@@ -89,7 +89,7 @@
 
 void IDChangeLog::addIDChange(Uml::IDType OldID, Uml::IDType NewID)
 {
-    uint pos;
+    uint pos = 0;
     if (!findIDChange(OldID, NewID, pos)) {
         pos = m_LogArray.size();
         m_LogArray.resize(pos + 1);
--- branches/work/soc-umbrello/umbrello/cmds/widget/cmd_set_txt.cpp #942479:942480
@@ -34,7 +34,7 @@
     {
 
         oldstring = _ftw->text();
-kDebug() << "la valeur de l'oldstring est: "<< oldstring << ", la valeur de la newstring est: "<< newstring;
+        uDebug() << "oldstring: "<< oldstring << ", newstring: "<< newstring;
     }
 
     CmdSetTxt::~CmdSetTxt()
@@ -44,16 +44,15 @@
 
     void CmdSetTxt::redo()
     {
-
         ftw->setText(newstring);
-kDebug() << "string apres redo " << ftw->text()<< ", la valeur de l'oldstring est: "<< oldstring << ", la valeur de la newstring est: "<< newstring;
+        uDebug() << "string after redo" << ftw->text()<< ", oldstring: "<< oldstring << ", newstring: "<< newstring;
     }
 
     void CmdSetTxt::undo()
     {
         ftw->setName("balbalbalbalbla");
         ftw->setText(oldstring);
-kDebug() << "string apres undo: " << ftw->text()<< "la valeur de l'oldstring est: "<< oldstring << "la valeur de la newstring est: "<< newstring;
+        uDebug() << "string after undo: " << ftw->text()<< "oldstring: "<< oldstring << "newstring: "<< newstring;
     }
 
 }
--- branches/work/soc-umbrello/umbrello/widgets/classifierwidget.cpp #942479:942480
@@ -54,6 +54,9 @@
     m_lineItem1Index = m_lineItem2Index = InvalidIndex;
 
     m_baseType = Uml::wt_Class;
+    // TODO: The following properties should be set using the
+    //       OptionState rather than direct defaults.
+
     // Set the following properties by default. The remaining
     // properties are not set.
     m_visualProperties = ShowOperations | ShowVisibility | ShowAttributes;