Merge branch 'master' of ssh://aacid@git.freedesktop.org/git/poppler/poppler
diff --git a/qt4/src/poppler-optcontent.cc b/qt4/src/poppler-optcontent.cc
index 4f3e6d9..3899970 100644
--- a/qt4/src/poppler-optcontent.cc
+++ b/qt4/src/poppler-optcontent.cc
@@ -87,9 +87,9 @@
m_state = OptContentItem::HeadingOnly;
}
- OptContentItem::OptContentItem()
+ OptContentItem::OptContentItem() :
+ m_parent( 0 )
{
- m_parent = 0;
}
OptContentItem::~OptContentItem()
@@ -151,6 +151,7 @@
parseOrderArray( m_rootNode, optContent->getOrderArray() );
}
+ parseRBGroupsArray( optContent->getRBGroupsArray() );
}
OptContentModelPrivate::~OptContentModelPrivate()
@@ -218,8 +219,6 @@
: QAbstractItemModel(parent)
{
d = new OptContentModelPrivate( this, optContent );
-
- d->parseRBGroupsArray( optContent->getRBGroupsArray() );
}
OptContentModel::~OptContentModel()