Commit 63e84633 authored by Halla Rempt's avatar Halla Rempt
Browse files

Thomas is right and I shouldn't code with a head stuffed with dirty

cotton-wool.

svn path=/trunk/koffice/; revision=602584
parent 9ca17bae
......@@ -48,7 +48,7 @@ class KoCanvasBase {
public:
KoCanvasBase() { m_resourceProvider = new KoCanvasResourceProvider(0); }
virtual ~KoCanvasBase() {};
virtual ~KoCanvasBase() { delete m_resourceProvider; }
public:
......
......@@ -87,6 +87,7 @@ class KoCanvasResourceProvider : public QObject {
public:
KoCanvasResourceProvider(QObject * parent);
~KoCanvasResourceProvider() {}
// XXX: Who is going to delete the resource objects? This class?
// The QHash hashmap? The creator?
......@@ -104,7 +105,6 @@ signals:
private:
~KoCanvasResourceProvider() {};
KoCanvasResourceProvider(const KoCanvasResourceProvider&);
KoCanvasResourceProvider& operator=(const KoCanvasResourceProvider&);
......
......@@ -36,6 +36,7 @@ KoTool::KoTool(KoCanvasBase *canvas )
{
if(m_canvas) {
KoCanvasResourceProvider * crp = m_canvas->resourceProvider();
Q_ASSERT_X(crp, "KoTool::KoTool", "No KoCanvasResourceProvider");
if (crp)
connect( m_canvas->resourceProvider(),
SIGNAL( sigResourceChanged(const KoCanvasResource & ) ),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment