← Back to branch summary

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

« back to all changes in this revision

Viewing changes to plan/kptinsertfiledlg.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/kptinsertfiledlg.cpp
21
21
#include "kptnode.h"
22
22
#include "kptproject.h"
23
23
 
24
 
#include <kiconloader.h>
25
24
#include <klocale.h>
26
25
#include <kio/netaccess.h>
27
26
#include <kdebug.h>
31
30
namespace KPlato
32
31
{
33
32
 
34
 
// little helper stolen from kmail/words
35
 
static inline QPixmap loadIcon( const char * name ) {
36
 
  return KIconLoader::global()->loadIcon( QString::fromLatin1(name), KIconLoader::NoGroup, KIconLoader::SizeMedium );
37
 
}
38
 
 
39
 
 
40
33
InsertFileDialog::InsertFileDialog( Project &project, Node *currentNode, QWidget *parent )
41
34
    : KDialog(parent)
42
35
{