[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/libs/kotext
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2010-08-17 14:17:38
Message-ID: 20100817141738.76753AC855 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1164711 by rempt:

use QWeakPointer instead of QPointer

Also check the whether the pointer is set to null, which was the
original purpose of using QPointer here.

 M  +4 -3      KoInlineNote.cpp  


--- trunk/koffice/libs/kotext/KoInlineNote.cpp #1164710:1164711
@@ -39,7 +39,7 @@
 #include <QFontMetricsF>
 #include <QTextOption>
 #include <QDateTime>
-#include <QPointer>
+#include <QWeakPointer>
 
 class KoInlineNote::Private
 {
@@ -52,7 +52,7 @@
     QDateTime date;
     bool autoNumbering;
     KoInlineNote::Type type;
-    QPointer<KoStyleManager> styleManager;
+    QWeakPointer<KoStyleManager> styleManager;
 };
 
 KoInlineNote::KoInlineNote(Type type)
@@ -233,7 +233,8 @@
     KoXmlWriter *writer = &context.xmlWriter();
     QTextDocument *document = new QTextDocument();
     KoTextDocument textDocument(document);
-    textDocument.setStyleManager(d->styleManager);
+    Q_ASSERT(!d->styleManager.isNull());
+    textDocument.setStyleManager(d->styleManager.data());
 
     QTextCursor cursor(document);
     cursor.insertFragment(d->text);
[prev in list] [next in list] [prev in thread] [next in thread]