summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPino Toscano <pino@kde.org>2014-04-05 15:49:31 +0200
committerPino Toscano <pino@kde.org>2014-04-05 15:49:31 +0200
commit07621ebbda8ab85cf4cd76a6092efc67aa14454d (patch)
treed470e9257531c038cdd2ff343bb27ac09173bf25
parent8d3a2c9d007052bcb8719200760a1abb6314f804 (diff)
parent9fcd46ac4a94f138981ec5afaab3875918c6a175 (diff)
Merge remote-tracking branch 'origin/poppler-0.24'
-rw-r--r--qt4/src/poppler-optcontent.cc3
-rw-r--r--qt5/src/poppler-optcontent.cc3
2 files changed, 2 insertions, 4 deletions
diff --git a/qt4/src/poppler-optcontent.cc b/qt4/src/poppler-optcontent.cc
index 6a5ffe74..822e0bd5 100644
--- a/qt4/src/poppler-optcontent.cc
+++ b/qt4/src/poppler-optcontent.cc
@@ -171,8 +171,7 @@ namespace Poppler
QMapIterator<QString, OptContentItem*> i(m_optContentItems);
while ( i.hasNext() ) {
i.next();
- qDebug() << "iterator" << i.key() << ":" << i.value();
- addChild( i.value(), m_rootNode );
+ addChild( m_rootNode, i.value() );
}
} else {
parseOrderArray( m_rootNode, optContent->getOrderArray() );
diff --git a/qt5/src/poppler-optcontent.cc b/qt5/src/poppler-optcontent.cc
index 5af37c87..0ead4610 100644
--- a/qt5/src/poppler-optcontent.cc
+++ b/qt5/src/poppler-optcontent.cc
@@ -171,8 +171,7 @@ namespace Poppler
QMapIterator<QString, OptContentItem*> i(m_optContentItems);
while ( i.hasNext() ) {
i.next();
- qDebug() << "iterator" << i.key() << ":" << i.value();
- addChild( i.value(), m_rootNode );
+ addChild( m_rootNode, i.value() );
}
} else {
parseOrderArray( m_rootNode, optContent->getOrderArray() );