[poppler] 2 commits - qt4/src

[Brad Hards]

 qt4/src/poppler-optcontent.cc |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 0569ae76b6af1723b4606af189242a23199f387d
Merge: f395531... d8eba8c...
Author: Brad Hards <bradh at kde.org>
Date:   Thu Feb 28 06:26:09 2008 +1100

    Merge branch 'master' of ssh://bradh@git.freedesktop.org/git/poppler/poppler

commit f395531a3e8f71a46b3c942f8f437ade1d9fdb57
Author: Brad Hards <bradh at kde.org>
Date:   Wed Feb 27 22:22:51 2008 +1100

    Minor cleanup.

diff --git a/qt4/src/poppler-optcontent.cc b/qt4/src/poppler-optcontent.cc
index 10a571d..f6e61c1 100644
--- a/qt4/src/poppler-optcontent.cc
+++ b/qt4/src/poppler-optcontent.cc
@@ -82,9 +82,9 @@ namespace Poppler
     m_state = OptContentItem::HeadingOnly;
   }
 
-  OptContentItem::OptContentItem()
+  OptContentItem::OptContentItem() :
+    m_parent( 0 )
   {
-    m_parent = 0;
   }
 
   OptContentItem::~OptContentItem()
@@ -145,6 +145,7 @@ namespace Poppler
       parseOrderArray( m_rootNode, optContent->getOrderArray() );
     }
 
+    parseRBGroupsArray( optContent->getRBGroupsArray() );
   }
 
   OptContentModelPrivate::~OptContentModelPrivate()
@@ -212,8 +213,6 @@ namespace Poppler
     : QAbstractItemModel(parent)
   {
     d = new OptContentModelPrivate( this, optContent );
-
-    d->parseRBGroupsArray( optContent->getRBGroupsArray() );
   }
 
   OptContentModel::~OptContentModel()