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

[Andi Fischer]

SVN commit 866245 by fischer:

Porting r866242.

 M  +0 -1      notewidget.cpp  
 M  +7 -7      toolbarstatefactory.cpp  
 M  +1 -4      worktoolbar.cpp  
 M  +0 -1      worktoolbar.h  


--- branches/work/soc-umbrello/umbrello/notewidget.cpp #866244:866245
@@ -1,5 +1,4 @@
 /***************************************************************************
- *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
--- branches/work/soc-umbrello/umbrello/toolbarstatefactory.cpp #866244:866245
@@ -1,11 +1,10 @@
 /***************************************************************************
- *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2004-2006                                               *
+ *   copyright (C) 2004-2008                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 #include "toolbarstatefactory.h"
@@ -22,17 +21,18 @@
 
 ToolBarStateFactory::ToolBarStateFactory()
 {
-    for (int i = 0; i < NR_OF_TOOLBAR_STATES; i++)
+    for (int i = 0; i < NR_OF_TOOLBAR_STATES; ++i)
     {
-        m_states[i] = NULL;
+        m_states[i] = 0;
     }
 }
 
 ToolBarStateFactory::~ToolBarStateFactory()
 {
-    for (int i = 0; i < NR_OF_TOOLBAR_STATES; i++)
+    for (int i = 0; i < NR_OF_TOOLBAR_STATES; ++i)
     {
-        if (m_states[i] != NULL) delete m_states[i];
+        if (m_states[i])
+            delete m_states[i];
     }
 }
 
@@ -41,7 +41,7 @@
 {
     int key = getKey(toolbarButton);
 
-    if (m_states[key] == NULL)
+    if (m_states[key] == 0)
     {
         switch (key)
         {
--- branches/work/soc-umbrello/umbrello/worktoolbar.cpp #866244:866245
@@ -1,5 +1,4 @@
 /***************************************************************************
- *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -14,7 +13,6 @@
 
 // qt/kde include files
 #include <QtGui/QAction>
-#include <Q3MainWindow>
 #include <QtGui/QToolButton>
 #include <kdebug.h>
 #include <klocale.h>
@@ -367,7 +365,7 @@
                                     QCursor(),
                                     SLOT(slotArrow())));
 
-    for (uint i = 0; i < n_buttonInfos; i++) {
+    for (uint i = 0; i < n_buttonInfos; ++i) {
         const ButtonInfo& info = buttonInfo[i];
         m_ToolButtons.insert(info.tbb,
                              ToolButton(info.btnName,
@@ -380,7 +378,6 @@
 /**
  * These slots are triggered by the buttons. They call buttonChanged with
  * the button id
- *@{
  */
 void WorkToolBar::slotArrow()                    { buttonChanged(tbb_Arrow);                    }
 void WorkToolBar::slotGeneralization()           { buttonChanged(tbb_Generalization);           }
--- branches/work/soc-umbrello/umbrello/worktoolbar.h #866244:866245
@@ -1,5 +1,4 @@
 /***************************************************************************
- *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *