← 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/kpthtmlview.cpp

  • 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/kpthtmlview.cpp
28
28
 
29
29
 
30
30
#include <kaction.h>
31
 
#include <kicon.h>
32
31
#include <kglobal.h>
33
32
#include <klocale.h>
34
33
#include <kactioncollection.h>
41
40
{
42
41
 
43
42
//-----------------------------------
44
 
HtmlView::HtmlView( KoDocument *part, QWidget *parent )
45
 
    : ViewBase( part, parent )
 
43
HtmlView::HtmlView(KoPart *part, KoDocument *doc, QWidget *parent)
 
44
    : ViewBase(part, doc, parent)
46
45
{
47
46
    m_htmlPart = new KHTMLPart( this );
48
47
    m_htmlPart->view()->setFrameStyle( QFrame::StyledPanel );