← Back to branch summary

~smartboyhw/ubuntu/raring/calligra/2.6.0-0ubuntu1

« back to all changes in this revision

Viewing changes to plan/libs/ui/kptresourceassignmentview.h

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-10-23 21:09:16 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20121023210916-m82w6zxnxhaxz7va
Tags: 1:2.5.90-0ubuntu1
https://launchpad.net/bugs/1070436
https://launchpad.net/bugs/1071686
* New upstream alpha release (LP: #1070436)
  - Add libkactivities-dev and libopenimageio-dev to build-depends
  - Add kubuntu_build_calligraactive.diff to build calligraactive by default
  - Add package for calligraauthor and move files that are shared between
    calligrawords and calligraauthor to calligrawords-common
* Document the patches
* Remove numbers from patches so they follow the same naming scheme as
  the rest of our patches.
* calligra-data breaks replaces krita-data (<< 1:2.5.3) (LP: #1071686)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plan/libs/ui/kptresourceassignmentview.h
57
57
 
58
58
#include "kptcommand.h"
59
59
 
60
 
#include <kicon.h>
61
60
#include <kglobal.h>
62
61
#include <klocale.h>
63
62
#include <kxmlguifactory.h>
99
98
    Q_OBJECT
100
99
 
101
100
public:
102
 
    ResourceAssignmentView( KoDocument *part, QWidget *parent);
 
101
    ResourceAssignmentView(KoPart *part, KoDocument *doc, QWidget *parent);
103
102
    using ViewBase::draw;
104
103
    Project *project() const { return m_project; }
105
104
    void draw( Project &project );