← Back to branch summary

~ubuntu-branches/ubuntu/vivid/kdesdk/vivid

« back to all changes in this revision

Viewing changes to umbrello/umbrello/widgets/linkwidget.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-06-06 11:49:54 UTC
  • mfrom: (0.4.21)
  • Revision ID: package-import@ubuntu.com-20120606114954-rdls73fzlpzxglbx
Tags: 4:4.8.80-0ubuntu1
* New uptream beta release
* Update dont_export_private_classes.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
umbrello/umbrello/widgets/linkwidget.cpp
4
4
 *   the Free Software Foundation; either version 2 of the License, or     *
5
5
 *   (at your option) any later version.                                   *
6
6
 *                                                                         *
7
 
 *   copyright (C) 2004-2011                                               *
 
7
 *   copyright (C) 2004-2012                                               *
8
8
 *   Umbrello UML Modeller Authors <uml-devel@uml.sf.net>                  *
9
9
 ***************************************************************************/
10
10
 
12
12
#include "linkwidget.h"
13
13
 
14
14
// app includes
15
 
#include "umlview.h"
16
 
#include "umlobject.h"
17
15
#include "classifier.h"
18
16
#include "operation.h"
19
17
#include "uml.h"
 
18
#include "umlobject.h"
 
19
#include "umlview.h"
20
20
 
21
21
LinkWidget::LinkWidget()
22
22
{
39
39
 
40
40
/**
41
41
 * Return the operation text.
42
 
 * When no view parameter is given, the current view
 
42
 * When no scene parameter is given, the scene of the current view
43
43
 * is taken instead.
44
 
 * @param scene   the given view
 
44
 * @param scene   the given scene
45
45
 * @return the operation text
46
46
 */
47
 
QString LinkWidget::operationText(UMLView *view)
 
47
QString LinkWidget::operationText(UMLScene *scene)
48
48
{
49
49
    UMLOperation *op = operation();
50
50
    if (op == NULL)
51
51
        return customOpText();
52
 
    if (view == NULL)
53
 
        view = UMLApp::app()->currentView();
 
52
    if (scene == NULL)
 
53
        scene = UMLApp::app()->currentView()->umlScene();
54
54
    Uml::SignatureType sigType;
55
 
    if (view && view->getShowOpSig())
 
55
    if (scene && scene->showOpSig())
56
56
        sigType = Uml::SignatureType::SigNoVis;
57
57
    else
58
58
        sigType = Uml::SignatureType::NoSigNoVis;