summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2008-02-27 20:44:27 +0100
committerAlbert Astals Cid <aacid@kde.org>2008-02-27 20:44:27 +0100
commit4254f1237ebed09b8e1c85f935a20bde3d8f36ff (patch)
tree694e34681c3fced00b4bbceaccc676fd36b8be9f
parented6c0c260837a0025279765ef7778b83d6ee2209 (diff)
parent0569ae76b6af1723b4606af189242a23199f387d (diff)
Merge branch 'master' of ssh://aacid@git.freedesktop.org/git/poppler/popplerpoppler-0.7.1
-rw-r--r--qt4/src/poppler-optcontent.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/qt4/src/poppler-optcontent.cc b/qt4/src/poppler-optcontent.cc
index 4f3e6d9a..3899970b 100644
--- a/qt4/src/poppler-optcontent.cc
+++ b/qt4/src/poppler-optcontent.cc
@@ -87,9 +87,9 @@ namespace Poppler
m_state = OptContentItem::HeadingOnly;
}
- OptContentItem::OptContentItem()
+ OptContentItem::OptContentItem() :
+ m_parent( 0 )
{
- m_parent = 0;
}
OptContentItem::~OptContentItem()
@@ -151,6 +151,7 @@ namespace Poppler
parseOrderArray( m_rootNode, optContent->getOrderArray() );
}
+ parseRBGroupsArray( optContent->getRBGroupsArray() );
}
OptContentModelPrivate::~OptContentModelPrivate()
@@ -218,8 +219,6 @@ namespace Poppler
: QAbstractItemModel(parent)
{
d = new OptContentModelPrivate( this, optContent );
-
- d->parseRBGroupsArray( optContent->getRBGroupsArray() );
}
OptContentModel::~OptContentModel()