← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/flake/KoToolManager_p.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/KoToolManager_p.cpp
21
21
 
22
22
#include <KoShapeManager.h>
23
23
#include <KoSelection.h>
24
 
#include <KoToolFactory.h>
 
24
#include <KoToolFactoryBase.h>
25
25
#include <QToolButton>
26
26
#include <kicon.h>
27
27
 
28
28
#include <stdlib.h> // for random()
29
29
 
30
30
//   ************ ToolHelper **********
31
 
ToolHelper::ToolHelper(KoToolFactory *tool)
 
31
ToolHelper::ToolHelper(KoToolFactoryBase *tool)
32
32
{
33
33
    m_toolFactory = tool;
34
34
    m_uniqueId = (int) random();
58
58
    return m_toolFactory->activationShapeId();
59
59
}
60
60
 
61
 
QString ToolHelper::name() const
 
61
QString ToolHelper::toolTip() const
62
62
{
63
 
    return m_toolFactory->name();
 
63
    return m_toolFactory->toolTip();
64
64
}
65
65
 
66
 
KoTool *ToolHelper::createTool(KoCanvasBase *canvas) const
 
66
KoToolBase *ToolHelper::createTool(KoCanvasBase *canvas) const
67
67
{
68
68
    if (! canCreateTool(canvas))
69
69
        return 0;
70
 
    KoTool *tool = m_toolFactory->createTool(canvas);
 
70
    KoToolBase *tool = m_toolFactory->createTool(canvas);
71
71
    tool->setToolId(id());
72
72
    return tool;
73
73
}
110
110
    emit selectionChanged(m_shapeManager->selection()->selectedShapes());
111
111
}
112
112
 
113
 
#include "KoToolManager_p.moc"
 
113
#include <KoToolManager_p.moc>