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

[Gopala Krishna A]

SVN commit 942467 by gopala:

Merged revisions 901256,902899,910119 via svnmerge from 
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r901256 | jriddell | 2008-12-25 01:58:23 +0530 (Thu, 25 Dec 2008) | 1 line
  
  use a newline after toolbar, use icons only for worktoolbar as discussed with Celeste
........
  r902899 | chehrlic | 2008-12-29 18:59:46 +0530 (Mon, 29 Dec 2008) | 1 line
  
  msvc warnings-- + compile++
........
  r910119 | schwarzer | 2009-01-13 00:11:54 +0530 (Tue, 13 Jan 2009) | 1 line
  
  typo: "information" has no plural
........


 _M            . (directory)  
 M  +1 -1      umbrello/codegenerators/sql/mysqlwriter.h  
 M  +8 -1      umbrello/codeimport/kdevcppparser/preprocesslexer.h  
 M  +1 -1      umbrello/umbrelloui.rc  
 M  +1 -0      umbrello/uml.cpp  
 M  +1 -1      umbrello/worktoolbar.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
   + /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119
--- branches/work/soc-umbrello/umbrello/codegenerators/sql/mysqlwriter.h #942466:942467
@@ -56,7 +56,7 @@
     /**
      * Reimplement printAutoIncrements from Base Class for MySQL
      */
-    void printAutoIncrements(QTextStream& sql, const UMLEntityAttributeList entAttList);
+    virtual void printAutoIncrements(QTextStream& sql, UMLEntityAttributeList entAttList);
 
 };
 
--- branches/work/soc-umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.h #942466:942467
@@ -29,7 +29,7 @@
   bool isdigit_( QChar const& c);
 }}}
 
-// must be first for msvc (see position.h for more informations)
+// must be first for msvc (see position.h for more information)
 #include "position.h"
 #include "driver.h"
 #include "skip_rule.hpp"
@@ -42,6 +42,13 @@
 using boost::spirit::rule;
 using boost::spirit::scanner;
 using boost::spirit::ext::skip_rule_parser;
+#ifdef Q_CC_MSVC
+// this template isn't available in boost/static_assert.hpp:50
+// but msvc needs it (boost 1.37.0)
+namespace boost {
+  template <> struct STATIC_ASSERTION_FAILURE<false> { enum { value = 0 }; };
+}
+#endif
 
 typedef boost::spirit::position_iterator<QChar const*> CharIterator;
 typedef rule<scanner<CharIterator> > SkipRule;
--- branches/work/soc-umbrello/umbrello/umbrelloui.rc #942466:942467
@@ -78,7 +78,7 @@
     <Action name="class_wizard"/>
   </Menu>
 </MenuBar>
-<ToolBar name="mainToolBar">
+<ToolBar name="mainToolBar" fullWidth="true" newline="true">
   <Action name="popup_zoom"/>
   <Action name="zoom100"/>
 </ToolBar>
--- branches/work/soc-umbrello/umbrello/uml.cpp #942466:942467
@@ -174,6 +174,7 @@
     m_imageExporterAll    = new UMLViewImageExporterAll();
 
     setAutoSaveSettings();
+    toolsbar->setToolButtonStyle(Qt::ToolButtonIconOnly); //too many items for text, really we want a toolbox widget
 }
 
 UMLApp::~UMLApp()
--- branches/work/soc-umbrello/umbrello/worktoolbar.cpp #942466:942467
@@ -25,7 +25,7 @@
 
 
 WorkToolBar::WorkToolBar(QMainWindow *parentWindow)
-        : KToolBar("worktoolbar", parentWindow, Qt::RightToolBarArea, false, true)
+  : KToolBar("worktoolbar", parentWindow, Qt::TopToolBarArea, true, true, true)
 {
     m_CurrentButtonID = tbb_Undefined;
     loadPixmaps();