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

[Gopala Krishna A]

SVN commit 943070 by gopala:

Merged revisions 937636 via svnmerge from 
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r937636 | mlaurent | 2009-03-10 13:34:04 +0530 (Tue, 10 Mar 2009) | 2 lines
  
  Remove this line
........


 _M            . (directory)  
 M  +1 -2      umbrello/codegenerators/cpp/cppcodegenerationformbase.ui  
 M  +1 -2      umbrello/codegenerators/d/dcodegenerationformbase.ui  
 M  +1 -2      umbrello/codegenerators/java/javacodegenerationformbase.ui  
 M  +1 -2      umbrello/codegenerators/ruby/rubycodegenerationformbase.ui  
 M  +1 -2      umbrello/codegenwizard/codegenoptionspage.ui  
 M  +1 -2      umbrello/dialogs/diagrampropertiespage.ui  
 M  +1 -2      umbrello/dialogs/exportallviewsdialogbase.ui  
 M  +1 -2      umbrello/dialogs/umlrolepropertiesbase.ui  


** 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,911706-911805,912902,913652,916104,916343,916990-917128,917351,918579-919414,920540-921357,922431,922854-927155,928929-928936,931178-937536
   + /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,912902,913652,916104,916343,916990-917128,917351,918579-919414,920540-921357,922431,922854-927155,928929-928936,931178-937536,937636
--- branches/work/soc-umbrello/umbrello/codegenerators/cpp/cppcodegenerationformbase.ui #943069:943070
@@ -1602,8 +1602,7 @@
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
+  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
--- branches/work/soc-umbrello/umbrello/codegenerators/d/dcodegenerationformbase.ui #943069:943070
@@ -327,8 +327,7 @@
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
+  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
--- branches/work/soc-umbrello/umbrello/codegenerators/java/javacodegenerationformbase.ui #943069:943070
@@ -327,8 +327,7 @@
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
+  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
--- branches/work/soc-umbrello/umbrello/codegenerators/ruby/rubycodegenerationformbase.ui #943069:943070
@@ -215,8 +215,7 @@
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
+  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
--- branches/work/soc-umbrello/umbrello/codegenwizard/codegenoptionspage.ui #943069:943070
@@ -346,8 +346,7 @@
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
+  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
--- branches/work/soc-umbrello/umbrello/dialogs/diagrampropertiespage.ui #943069:943070
@@ -334,8 +334,7 @@
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
+  <customwidgets>
   <customwidget>
    <class>KLineEdit</class>
    <extends>QLineEdit</extends>
--- branches/work/soc-umbrello/umbrello/dialogs/exportallviewsdialogbase.ui #943069:943070
@@ -161,8 +161,7 @@
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
+  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QFrame</extends>
--- branches/work/soc-umbrello/umbrello/dialogs/umlrolepropertiesbase.ui #943069:943070
@@ -149,8 +149,7 @@
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
+  <customwidgets>
   <customwidget>
    <class>KButtonGroup</class>
    <extends>QGroupBox</extends>