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

[Andi Fischer]

SVN commit 917349 by fischer:

Fixing compiler warning.

 M  +4 -4      messagewidget.cpp  
 M  +2 -3      messagewidget.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/messagewidget.cpp #917348:917349
@@ -915,7 +915,7 @@
     qElement.appendChild( messageElement );
 }
 
-bool MessageWidget::loadFromXMI(QDomElement& qElement) {
+bool MessageWidget::loadFromXMI(QDomElement& qElement){
     if ( !UMLWidget::loadFromXMI(qElement) ) {
         return false;
     }
@@ -958,9 +958,9 @@
     return true;
 }
 
-ListPopupMenu* MessageWidget::setupPopupMenu() {
-
-    UMLWidget::setupPopupMenu( ); // will setup the menu in m_pMenu
+ListPopupMenu* MessageWidget::setupPopupMenu(ListPopupMenu *menu)
+{
+    UMLWidget::setupPopupMenu(menu); // will setup the menu in m_pMenu
     ListPopupMenu* floatingtextSubMenu = m_pFText->setupPopupMenu();
     floatingtextSubMenu->setTitle( i18n( "Operation" ) );
 
--- trunk/KDE/kdesdk/umbrello/umbrello/messagewidget.h #917348:917349
@@ -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) 2002-2007                                               *
+ *   copyright (C) 2002-2009                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -387,7 +386,7 @@
         return xclicked;
     }
 
-    ListPopupMenu* setupPopupMenu();
+    ListPopupMenu* setupPopupMenu(ListPopupMenu *menu = 0);
 
 protected:
     /**