← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/flake/KoToolBase.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:
libs/flake/KoToolBase.cpp
59
59
        KoDocumentResourceManager *scrm = shapeController->resourceManager();
60
60
        if (scrm) {
61
61
            connect(scrm, SIGNAL(resourceChanged(int, const QVariant &)),
62
 
                    this, SLOT(resourceChanged(int, const QVariant &)));
 
62
                    this, SLOT(documentResourceChanged(int, const QVariant &)));
63
63
        }
64
64
    }
65
65
}
74
74
    Q_UNUSED(res);
75
75
}
76
76
 
 
77
void KoToolBase::documentResourceChanged(int key, const QVariant &res)
 
78
{
 
79
    Q_UNUSED(key);
 
80
    Q_UNUSED(res);
 
81
}
 
82
 
77
83
bool KoToolBase::wantsAutoScroll() const
78
84
{
79
85
    return true;