← Back to branch summary

~ubuntu-branches/ubuntu/precise/koffice/precise

« back to all changes in this revision

Viewing changes to libs/flake/KoCanvasBase.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-09-21 15:36:35 UTC
  • mfrom: (1.4.1 upstream) (60.2.11 maverick)
  • Revision ID: james.westby@ubuntu.com-20100921153635-6tejqkiro2u21ydi
Tags: 1:2.2.2-0ubuntu3
Add kubuntu_03_fix-crash-on-closing-sqlite-connection-2.2.2.diff and
kubuntu_04_support-large-memo-values-for-msaccess-2.2.2.diff as
recommended by upstream http://kexi-
project.org/wiki/wikiview/index.php@Kexi2.2_Patches.html#sqlite_stab
ility

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/flake/KoCanvasBase.cpp
19
19
*/
20
20
 
21
21
#include "KoCanvasBase.h"
22
 
#include "KoCanvasResourceProvider.h"
 
22
#include "KoResourceManager.h"
23
23
#include "KoShapeController.h"
24
24
#include "KoCanvasController.h"
25
25
#include "KoSnapGuide.h"
 
26
#include "SnapGuideConfigWidget.h"
26
27
 
27
28
#include <KGlobal>
28
29
#include <KConfigGroup>
32
33
class KoCanvasBase::Private
33
34
{
34
35
public:
35
 
    Private() : shapeController(0), resourceProvider(0), controller(0) {}
 
36
    Private() : shapeController(0), resourceManager(0), controller(0) {}
36
37
    ~Private() {
37
38
        delete shapeController;
38
 
        delete resourceProvider;
 
39
        delete resourceManager;
39
40
        delete snapGuide;
40
41
    }
41
42
    KoShapeController *shapeController;
42
 
    KoCanvasResourceProvider * resourceProvider;
 
43
    KoResourceManager *resourceManager;
43
44
    KoCanvasController *controller;
44
 
    KoSnapGuide * snapGuide;
 
45
    KoSnapGuide *snapGuide;
45
46
};
46
47
 
47
48
KoCanvasBase::KoCanvasBase(KoShapeControllerBase *shapeControllerBase)
48
49
        : d(new Private())
49
50
{
50
 
    d->resourceProvider = new KoCanvasResourceProvider();
 
51
    d->resourceManager = new KoResourceManager();
51
52
    d->shapeController = new KoShapeController(this, shapeControllerBase);
52
53
    d->snapGuide = new KoSnapGuide(this);
53
54
}
63
64
    return d->shapeController;
64
65
}
65
66
 
66
 
KoCanvasResourceProvider *KoCanvasBase::resourceProvider() const
 
67
KoResourceManager *KoCanvasBase::resourceManager() const
67
68
{
68
 
    return d->resourceProvider;
 
69
    return d->resourceManager;
69
70
}
70
71
 
71
72
void KoCanvasBase::ensureVisible(const QRectF &rect)
97
98
{
98
99
    return 0;
99
100
}
 
101
 
 
102
QWidget *KoCanvasBase::createSnapGuideConfigWidget() const
 
103
{
 
104
    return new SnapGuideConfigWidget(d->snapGuide);
 
105
}