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

List:       kde-commits
Subject:    koffice/kword/part/frame
From:       David Faure <faure () kde ! org>
Date:       2006-08-24 11:30:44
Message-ID: 1156419044.304287.27084.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 576602 by dfaure:

One new/delete pair less. Not sure why ListItemsHelper needs a d pointer, too.


 M  +6 -7      KWTextDocumentLayout.cpp  


--- trunk/koffice/kword/part/frame/KWTextDocumentLayout.cpp #576601:576602
@@ -425,17 +425,16 @@
 // ------------------- ListItemsHelper ------------
 class ListItemsPrivate {
 public:
-    ~ListItemsPrivate() {
-        delete fm;
+    ListItemsPrivate(QTextList *tl, const QFont &font)
+        : textList( tl ),
+          fm( font, textList->document()->documentLayout()->paintDevice() ) {
     }
     QTextList *textList;
-    QFontMetricsF *fm;
+    QFontMetricsF fm;
 };
 
 ListItemsHelper::ListItemsHelper(QTextList *textList, const QFont &font) {
-    d = new ListItemsPrivate();
-    d->textList = textList;
-    d->fm = new QFontMetricsF(font, textList->document()->documentLayout()->paintDevice());
+    d = new ListItemsPrivate(textList, font);
 }
 
 ListItemsHelper::~ListItemsHelper() {
@@ -452,7 +451,7 @@
             index = paragIndex;
         switch( static_cast<KoListStyle::Style> ( d->textList->format().style() )) {
             case KoListStyle::DecimalItem:
-                width = qMax(width, d->fm->width(QString::number(index)));
+                width = qMax(width, d->fm.width(QString::number(index)));
                 break;
             case KoListStyle::AlphaLowerItem:
                 // TODO;
[prev in list] [next in list] [prev in thread] [next in thread]