mirror of
https://bitbucket.org/smil3y/kde-extraapps.git
synced 2025-02-23 18:32:53 +00:00
generic: replace QLinkedList<T> with QList<T>
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev
parent
cd84984a81
commit
a3a1541ae7
39 changed files with 216 additions and 217 deletions
|
|
@ -26,7 +26,7 @@
|
|||
#include <KDebug>
|
||||
#include <KDirLister>
|
||||
|
||||
#include <QtCore/QLinkedList>
|
||||
#include <QtCore/QList>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtGui/QWidget>
|
||||
|
||||
|
|
@ -40,7 +40,7 @@ namespace Filelight
|
|||
|
||||
class Store {
|
||||
public:
|
||||
typedef QLinkedList<Store*> List;
|
||||
typedef QList<Store*> List;
|
||||
|
||||
/// location of the folder
|
||||
const KUrl url;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
#include <sys/stat.h>
|
||||
|
||||
#include <klocale.h>
|
||||
#include <QLinkedList>
|
||||
#include <QList>
|
||||
#include <QRegExp>
|
||||
|
||||
Mixer_Backend* OSS4_getMixer(Mixer *mixer, int device)
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#include <QtCore/QRegExp>
|
||||
#include <QtCore/QTextCodec>
|
||||
#include <QtCore/QTextStream>
|
||||
#include <QtCore/QLinkedList>
|
||||
#include <QtCore/QList>
|
||||
|
||||
#include <kaction.h>
|
||||
#include <kactioncollection.h>
|
||||
|
|
@ -1042,13 +1042,13 @@ bool KompareModelList::blendFile( DiffModel* model, const QString& fileContents
|
|||
int srcLineNo = 1, destLineNo = 1;
|
||||
|
||||
QStringList list = split( fileContents );
|
||||
QLinkedList<QString> lines;
|
||||
QList<QString> lines;
|
||||
foreach (const QString &str, list) {
|
||||
lines.append(str);
|
||||
}
|
||||
|
||||
QLinkedList<QString>::ConstIterator linesIt = lines.begin();
|
||||
QLinkedList<QString>::ConstIterator lEnd = lines.end();
|
||||
QList<QString>::ConstIterator linesIt = lines.begin();
|
||||
QList<QString>::ConstIterator lEnd = lines.end();
|
||||
|
||||
DiffHunkList* hunks = model->hunks();
|
||||
kDebug(8101) << "Hunks in hunklist: " << hunks->count() << endl;
|
||||
|
|
|
|||
|
|
@ -507,7 +507,7 @@ void EditAnnotToolDialog::createStubAnnotation()
|
|||
else if ( toolType == ToolStraightLine )
|
||||
{
|
||||
Okular::LineAnnotation * la = new Okular::LineAnnotation();
|
||||
la->setLinePoints( QLinkedList<Okular::NormalizedPoint>() <<
|
||||
la->setLinePoints( QList<Okular::NormalizedPoint>() <<
|
||||
Okular::NormalizedPoint(0,0) <<
|
||||
Okular::NormalizedPoint(1,0) );
|
||||
la->style().setColor( QColor( 0xff, 0xe0, 0x00 ) );
|
||||
|
|
@ -516,7 +516,7 @@ void EditAnnotToolDialog::createStubAnnotation()
|
|||
else if ( toolType == ToolPolygon )
|
||||
{
|
||||
Okular::LineAnnotation * la = new Okular::LineAnnotation();
|
||||
la->setLinePoints( QLinkedList<Okular::NormalizedPoint>() <<
|
||||
la->setLinePoints( QList<Okular::NormalizedPoint>() <<
|
||||
Okular::NormalizedPoint(0,0) <<
|
||||
Okular::NormalizedPoint(1,0) <<
|
||||
Okular::NormalizedPoint(1,1) );
|
||||
|
|
|
|||
|
|
@ -42,11 +42,11 @@ static bool isLeftOfVector( const NormalizedPoint& a, const NormalizedPoint& b,
|
|||
*
|
||||
* Does piecewise comparison and selects the distance to the closest segment
|
||||
*/
|
||||
static double distanceSqr( double x, double y, double xScale, double yScale, const QLinkedList<NormalizedPoint>& path )
|
||||
static double distanceSqr( double x, double y, double xScale, double yScale, const QList<NormalizedPoint>& path )
|
||||
{
|
||||
double distance = DBL_MAX;
|
||||
double thisDistance;
|
||||
QLinkedList<NormalizedPoint>::const_iterator i = path.constBegin();
|
||||
QList<NormalizedPoint>::const_iterator i = path.constBegin();
|
||||
NormalizedPoint lastPoint = *i;
|
||||
|
||||
for (++i; i != path.constEnd(); ++i) {
|
||||
|
|
@ -500,7 +500,7 @@ AnnotationPrivate::~AnnotationPrivate()
|
|||
if ( m_revisions.isEmpty() )
|
||||
return;
|
||||
|
||||
QLinkedList< Annotation::Revision >::iterator it = m_revisions.begin(), end = m_revisions.end();
|
||||
QList< Annotation::Revision >::iterator it = m_revisions.begin(), end = m_revisions.end();
|
||||
for ( ; it != end; ++it )
|
||||
delete (*it).annotation();
|
||||
}
|
||||
|
|
@ -660,13 +660,13 @@ const Annotation::Window & Annotation::window() const
|
|||
return d->m_window;
|
||||
}
|
||||
|
||||
QLinkedList< Annotation::Revision > & Annotation::revisions()
|
||||
QList< Annotation::Revision > & Annotation::revisions()
|
||||
{
|
||||
Q_D( Annotation );
|
||||
return d->m_revisions;
|
||||
}
|
||||
|
||||
const QLinkedList< Annotation::Revision > & Annotation::revisions() const
|
||||
const QList< Annotation::Revision > & Annotation::revisions() const
|
||||
{
|
||||
Q_D( const Annotation );
|
||||
return d->m_revisions;
|
||||
|
|
@ -783,7 +783,7 @@ void Annotation::store( QDomNode & annNode, QDomDocument & document ) const
|
|||
return;
|
||||
|
||||
// add all revisions as children of revisions element
|
||||
QLinkedList< Revision >::const_iterator it = d->m_revisions.begin(), end = d->m_revisions.end();
|
||||
QList< Revision >::const_iterator it = d->m_revisions.begin(), end = d->m_revisions.end();
|
||||
for ( ; it != end; ++it )
|
||||
{
|
||||
// create revision element
|
||||
|
|
@ -1271,8 +1271,8 @@ class Okular::LineAnnotationPrivate : public Okular::AnnotationPrivate
|
|||
virtual void setAnnotationProperties( const QDomNode& node );
|
||||
virtual AnnotationPrivate* getNewAnnotationPrivate();
|
||||
|
||||
QLinkedList<NormalizedPoint> m_linePoints;
|
||||
QLinkedList<NormalizedPoint> m_transformedLinePoints;
|
||||
QList<NormalizedPoint> m_linePoints;
|
||||
QList<NormalizedPoint> m_transformedLinePoints;
|
||||
LineAnnotation::TermStyle m_lineStartStyle;
|
||||
LineAnnotation::TermStyle m_lineEndStyle;
|
||||
bool m_lineClosed : 1;
|
||||
|
|
@ -1297,19 +1297,19 @@ LineAnnotation::~LineAnnotation()
|
|||
{
|
||||
}
|
||||
|
||||
void LineAnnotation::setLinePoints( const QLinkedList<NormalizedPoint> &points )
|
||||
void LineAnnotation::setLinePoints( const QList<NormalizedPoint> &points )
|
||||
{
|
||||
Q_D( LineAnnotation );
|
||||
d->m_linePoints = points;
|
||||
}
|
||||
|
||||
QLinkedList<NormalizedPoint> LineAnnotation::linePoints() const
|
||||
QList<NormalizedPoint> LineAnnotation::linePoints() const
|
||||
{
|
||||
Q_D( const LineAnnotation );
|
||||
return d->m_linePoints;
|
||||
}
|
||||
|
||||
QLinkedList<NormalizedPoint> LineAnnotation::transformedLinePoints() const
|
||||
QList<NormalizedPoint> LineAnnotation::transformedLinePoints() const
|
||||
{
|
||||
Q_D( const LineAnnotation );
|
||||
return d->m_transformedLinePoints;
|
||||
|
|
@ -1448,7 +1448,7 @@ void LineAnnotation::store( QDomNode & node, QDomDocument & document ) const
|
|||
int points = d->m_linePoints.count();
|
||||
if ( points > 1 )
|
||||
{
|
||||
QLinkedList<NormalizedPoint>::const_iterator it = d->m_linePoints.begin(), end = d->m_linePoints.end();
|
||||
QList<NormalizedPoint>::const_iterator it = d->m_linePoints.begin(), end = d->m_linePoints.end();
|
||||
while ( it != end )
|
||||
{
|
||||
const NormalizedPoint & p = *it;
|
||||
|
|
@ -1465,7 +1465,7 @@ void LineAnnotationPrivate::transform( const QTransform &matrix )
|
|||
{
|
||||
AnnotationPrivate::transform( matrix );
|
||||
|
||||
QMutableLinkedListIterator<NormalizedPoint> it( m_transformedLinePoints );
|
||||
QMutableListIterator<NormalizedPoint> it( m_transformedLinePoints );
|
||||
while ( it.hasNext() )
|
||||
it.next().transform( matrix );
|
||||
}
|
||||
|
|
@ -1474,7 +1474,7 @@ void LineAnnotationPrivate::baseTransform( const QTransform &matrix )
|
|||
{
|
||||
AnnotationPrivate::baseTransform( matrix );
|
||||
|
||||
QMutableLinkedListIterator<NormalizedPoint> it( m_linePoints );
|
||||
QMutableListIterator<NormalizedPoint> it( m_linePoints );
|
||||
while ( it.hasNext() )
|
||||
it.next().transform( matrix );
|
||||
}
|
||||
|
|
@ -1490,7 +1490,7 @@ void LineAnnotationPrivate::translate( const NormalizedPoint &coord )
|
|||
{
|
||||
AnnotationPrivate::translate( coord );
|
||||
|
||||
QMutableLinkedListIterator<NormalizedPoint> it( m_linePoints );
|
||||
QMutableListIterator<NormalizedPoint> it( m_linePoints );
|
||||
while ( it.hasNext() )
|
||||
{
|
||||
NormalizedPoint& p = it.next();
|
||||
|
|
@ -1560,7 +1560,7 @@ AnnotationPrivate* LineAnnotationPrivate::getNewAnnotationPrivate()
|
|||
|
||||
double LineAnnotationPrivate::distanceSqr( double x, double y, double xScale, double yScale )
|
||||
{
|
||||
QLinkedList<NormalizedPoint> transformedLinePoints = m_transformedLinePoints;
|
||||
QList<NormalizedPoint> transformedLinePoints = m_transformedLinePoints;
|
||||
|
||||
if ( m_lineClosed ) // Close the path
|
||||
transformedLinePoints.append( transformedLinePoints.first() );
|
||||
|
|
@ -1737,7 +1737,7 @@ double GeomAnnotationPrivate::distanceSqr( double x, double y, double xScale, do
|
|||
if ( m_geomInnerColor.isValid() )
|
||||
return AnnotationPrivate::distanceSqr( x, y, xScale, yScale );
|
||||
|
||||
QLinkedList<NormalizedPoint> edges;
|
||||
QList<NormalizedPoint> edges;
|
||||
edges << NormalizedPoint( m_transformedBoundary.left, m_transformedBoundary.top );
|
||||
edges << NormalizedPoint( m_transformedBoundary.right, m_transformedBoundary.top );
|
||||
edges << NormalizedPoint( m_transformedBoundary.right, m_transformedBoundary.bottom );
|
||||
|
|
@ -2026,7 +2026,7 @@ double HighlightAnnotationPrivate::distanceSqr( double x, double y, double xScal
|
|||
double outsideDistance = DBL_MAX;
|
||||
foreach ( const HighlightAnnotation::Quad& quad, m_highlightQuads )
|
||||
{
|
||||
QLinkedList<NormalizedPoint> pathPoints;
|
||||
QList<NormalizedPoint> pathPoints;
|
||||
|
||||
//first, we check if the point is within the area described by the 4 quads
|
||||
//this is the case, if the point is always on one side of each segments delimiting the polygon:
|
||||
|
|
@ -2157,8 +2157,8 @@ class Okular::InkAnnotationPrivate : public Okular::AnnotationPrivate
|
|||
virtual void setAnnotationProperties( const QDomNode& node );
|
||||
virtual AnnotationPrivate* getNewAnnotationPrivate();
|
||||
|
||||
QList< QLinkedList<NormalizedPoint> > m_inkPaths;
|
||||
QList< QLinkedList<NormalizedPoint> > m_transformedInkPaths;
|
||||
QList< QList<NormalizedPoint> > m_inkPaths;
|
||||
QList< QList<NormalizedPoint> > m_transformedInkPaths;
|
||||
};
|
||||
|
||||
InkAnnotation::InkAnnotation()
|
||||
|
|
@ -2175,19 +2175,19 @@ InkAnnotation::~InkAnnotation()
|
|||
{
|
||||
}
|
||||
|
||||
void InkAnnotation::setInkPaths( const QList< QLinkedList<NormalizedPoint> > &paths )
|
||||
void InkAnnotation::setInkPaths( const QList< QList<NormalizedPoint> > &paths )
|
||||
{
|
||||
Q_D( InkAnnotation );
|
||||
d->m_inkPaths = paths;
|
||||
}
|
||||
|
||||
QList< QLinkedList<NormalizedPoint> > InkAnnotation::inkPaths() const
|
||||
QList< QList<NormalizedPoint> > InkAnnotation::inkPaths() const
|
||||
{
|
||||
Q_D( const InkAnnotation );
|
||||
return d->m_inkPaths;
|
||||
}
|
||||
|
||||
QList< QLinkedList<NormalizedPoint> > InkAnnotation::transformedInkPaths() const
|
||||
QList< QList<NormalizedPoint> > InkAnnotation::transformedInkPaths() const
|
||||
{
|
||||
Q_D( const InkAnnotation );
|
||||
return d->m_transformedInkPaths;
|
||||
|
|
@ -2212,13 +2212,13 @@ void InkAnnotation::store( QDomNode & node, QDomDocument & document ) const
|
|||
if ( d->m_inkPaths.count() < 1 )
|
||||
return;
|
||||
|
||||
QList< QLinkedList<NormalizedPoint> >::const_iterator pIt = d->m_inkPaths.begin(), pEnd = d->m_inkPaths.end();
|
||||
QList< QList<NormalizedPoint> >::const_iterator pIt = d->m_inkPaths.begin(), pEnd = d->m_inkPaths.end();
|
||||
for ( ; pIt != pEnd; ++pIt )
|
||||
{
|
||||
QDomElement pathElement = document.createElement( "path" );
|
||||
inkElement.appendChild( pathElement );
|
||||
const QLinkedList<NormalizedPoint> & path = *pIt;
|
||||
QLinkedList<NormalizedPoint>::const_iterator iIt = path.begin(), iEnd = path.end();
|
||||
const QList<NormalizedPoint> & path = *pIt;
|
||||
QList<NormalizedPoint>::const_iterator iIt = path.begin(), iEnd = path.end();
|
||||
for ( ; iIt != iEnd; ++iIt )
|
||||
{
|
||||
const NormalizedPoint & point = *iIt;
|
||||
|
|
@ -2233,7 +2233,7 @@ void InkAnnotation::store( QDomNode & node, QDomDocument & document ) const
|
|||
double InkAnnotationPrivate::distanceSqr( double x, double y, double xScale, double yScale )
|
||||
{
|
||||
double distance = DBL_MAX;
|
||||
foreach ( const QLinkedList<NormalizedPoint>& path, m_transformedInkPaths )
|
||||
foreach ( const QList<NormalizedPoint>& path, m_transformedInkPaths )
|
||||
{
|
||||
const double thisDistance = ::distanceSqr( x, y, xScale, yScale, path );
|
||||
if ( thisDistance < distance )
|
||||
|
|
@ -2248,7 +2248,7 @@ void InkAnnotationPrivate::transform( const QTransform &matrix )
|
|||
|
||||
for ( int i = 0; i < m_transformedInkPaths.count(); ++i )
|
||||
{
|
||||
QMutableLinkedListIterator<NormalizedPoint> it( m_transformedInkPaths[ i ] );
|
||||
QMutableListIterator<NormalizedPoint> it( m_transformedInkPaths[ i ] );
|
||||
while ( it.hasNext() )
|
||||
it.next().transform( matrix );
|
||||
}
|
||||
|
|
@ -2260,7 +2260,7 @@ void InkAnnotationPrivate::baseTransform( const QTransform &matrix )
|
|||
|
||||
for ( int i = 0; i < m_inkPaths.count(); ++i )
|
||||
{
|
||||
QMutableLinkedListIterator<NormalizedPoint> it( m_inkPaths[ i ] );
|
||||
QMutableListIterator<NormalizedPoint> it( m_inkPaths[ i ] );
|
||||
while ( it.hasNext() )
|
||||
it.next().transform( matrix );
|
||||
}
|
||||
|
|
@ -2279,7 +2279,7 @@ void InkAnnotationPrivate::translate( const NormalizedPoint &coord )
|
|||
|
||||
for ( int i = 0; i < m_inkPaths.count(); ++i )
|
||||
{
|
||||
QMutableLinkedListIterator<NormalizedPoint> it( m_inkPaths[ i ] );
|
||||
QMutableListIterator<NormalizedPoint> it( m_inkPaths[ i ] );
|
||||
while ( it.hasNext() )
|
||||
{
|
||||
NormalizedPoint& p = it.next();
|
||||
|
|
@ -2314,7 +2314,7 @@ void InkAnnotationPrivate::setAnnotationProperties( const QDomNode& node )
|
|||
continue;
|
||||
|
||||
// build each path parsing 'point' subnodes
|
||||
QLinkedList<NormalizedPoint> path;
|
||||
QList<NormalizedPoint> path;
|
||||
QDomNode pointNode = pathElement.firstChild();
|
||||
while ( pointNode.isElement() )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QLinkedList>
|
||||
#include <QtCore/QList>
|
||||
#include <QtCore/QRect>
|
||||
#include <QtGui/QFont>
|
||||
|
||||
|
|
@ -588,12 +588,12 @@ class OKULAR_EXPORT Annotation
|
|||
/**
|
||||
* Returns a reference to the revision list of the annotation.
|
||||
*/
|
||||
QLinkedList< Revision > & revisions();
|
||||
QList< Revision > & revisions();
|
||||
|
||||
/**
|
||||
* Returns a reference to the revision list of the annotation.
|
||||
*/
|
||||
const QLinkedList< Revision > & revisions() const;
|
||||
const QList< Revision > & revisions() const;
|
||||
|
||||
/**
|
||||
* Sets the "native" @p id of the annotation.
|
||||
|
|
@ -902,18 +902,18 @@ class OKULAR_EXPORT LineAnnotation : public Annotation
|
|||
/**
|
||||
* Sets the normalized line @p points of the line annotation.
|
||||
*/
|
||||
void setLinePoints( const QLinkedList<NormalizedPoint> &points );
|
||||
void setLinePoints( const QList<NormalizedPoint> &points );
|
||||
|
||||
/**
|
||||
* Returns the normalized line points of the line annotation.
|
||||
*/
|
||||
QLinkedList<NormalizedPoint> linePoints() const;
|
||||
QList<NormalizedPoint> linePoints() const;
|
||||
|
||||
/**
|
||||
* Returns the transformed (e.g. rotated) normalized line points
|
||||
* of the line annotation.
|
||||
*/
|
||||
QLinkedList<NormalizedPoint> transformedLinePoints() const;
|
||||
QList<NormalizedPoint> transformedLinePoints() const;
|
||||
|
||||
/**
|
||||
* Sets the line starting @p style of the line annotation.
|
||||
|
|
@ -1283,18 +1283,18 @@ class OKULAR_EXPORT InkAnnotation : public Annotation
|
|||
/**
|
||||
* Sets the @p paths of points for the ink annotation.
|
||||
*/
|
||||
void setInkPaths( const QList< QLinkedList<NormalizedPoint> > &paths );
|
||||
void setInkPaths( const QList< QList<NormalizedPoint> > &paths );
|
||||
|
||||
/**
|
||||
* Returns the paths of points of the ink annotation.
|
||||
*/
|
||||
QList< QLinkedList<NormalizedPoint> > inkPaths() const;
|
||||
QList< QList<NormalizedPoint> > inkPaths() const;
|
||||
|
||||
/**
|
||||
* Returns the paths of transformed (e.g. rotated) points of
|
||||
* the ink annotation.
|
||||
*/
|
||||
QList< QLinkedList<NormalizedPoint> > transformedInkPaths() const;
|
||||
QList< QList<NormalizedPoint> > transformedInkPaths() const;
|
||||
|
||||
/**
|
||||
* Returns the sub type of the ink annotation.
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ class AnnotationPrivate
|
|||
|
||||
Okular::Annotation::Style m_style;
|
||||
Okular::Annotation::Window m_window;
|
||||
QLinkedList< Okular::Annotation::Revision > m_revisions;
|
||||
QList< Okular::Annotation::Revision > m_revisions;
|
||||
|
||||
Annotation::DisposeDataFunction m_disposeFunc;
|
||||
QVariant m_nativeId;
|
||||
|
|
|
|||
|
|
@ -377,7 +377,7 @@ void DocumentPrivate::cleanupPixmapMemory( qulonglong memoryToFree )
|
|||
|
||||
// Store pages that weren't completely removed
|
||||
|
||||
QLinkedList< AllocatedPixmap * > pixmapsToKeep;
|
||||
QList< AllocatedPixmap * > pixmapsToKeep;
|
||||
while (memoryToFree > 0)
|
||||
{
|
||||
int clean_hits = 0;
|
||||
|
|
@ -428,9 +428,9 @@ void DocumentPrivate::cleanupPixmapMemory( qulonglong memoryToFree )
|
|||
*/
|
||||
AllocatedPixmap * DocumentPrivate::searchLowestPriorityPixmap( bool unloadableOnly, bool thenRemoveIt, DocumentObserver *observer )
|
||||
{
|
||||
QLinkedList< AllocatedPixmap * >::iterator pIt = m_allocatedPixmaps.begin();
|
||||
QLinkedList< AllocatedPixmap * >::iterator pEnd = m_allocatedPixmaps.end();
|
||||
QLinkedList< AllocatedPixmap * >::iterator farthestPixmap = pEnd;
|
||||
QList< AllocatedPixmap * >::iterator pIt = m_allocatedPixmaps.begin();
|
||||
QList< AllocatedPixmap * >::iterator pEnd = m_allocatedPixmaps.end();
|
||||
QList< AllocatedPixmap * >::iterator farthestPixmap = pEnd;
|
||||
const int currentViewportPage = (*m_viewportIterator).pageNumber;
|
||||
|
||||
/* Find the pixmap that is farthest from the current viewport */
|
||||
|
|
@ -1251,7 +1251,7 @@ void DocumentPrivate::saveDocumentInfo() const
|
|||
rotationNode.appendChild( doc.createTextNode( QString::number( (int)m_rotation ) ) );
|
||||
}
|
||||
// <general info><history> ... </history> save history up to OKULAR_HISTORY_SAVEDSTEPS viewports
|
||||
QLinkedList< DocumentViewport >::const_iterator backIterator = m_viewportIterator;
|
||||
QList< DocumentViewport >::const_iterator backIterator = m_viewportIterator;
|
||||
if ( backIterator != m_viewportHistory.constEnd() )
|
||||
{
|
||||
// go back up to OKULAR_HISTORY_SAVEDSTEPS steps from the current viewportIterator
|
||||
|
|
@ -1264,7 +1264,7 @@ void DocumentPrivate::saveDocumentInfo() const
|
|||
generalInfo.appendChild( historyNode );
|
||||
|
||||
// add old[backIterator] and present[viewportIterator] items
|
||||
QLinkedList< DocumentViewport >::const_iterator endIt = m_viewportIterator;
|
||||
QList< DocumentViewport >::const_iterator endIt = m_viewportIterator;
|
||||
++endIt;
|
||||
while ( backIterator != endIt )
|
||||
{
|
||||
|
|
@ -1572,7 +1572,7 @@ void DocumentPrivate::refreshPixmaps( int pageNumber )
|
|||
if ( !page )
|
||||
return;
|
||||
|
||||
QLinkedList< Okular::PixmapRequest * > requestedPixmaps;
|
||||
QList< Okular::PixmapRequest * > requestedPixmaps;
|
||||
QMap< DocumentObserver*, PagePrivate::PixmapObject >::ConstIterator it = page->d->m_pixmaps.constBegin(), itEnd = page->d->m_pixmaps.constEnd();
|
||||
for ( ; it != itEnd; ++it )
|
||||
{
|
||||
|
|
@ -2345,8 +2345,8 @@ void Document::closeDocument()
|
|||
|
||||
// remove requests left in queue
|
||||
d->m_pixmapRequestsMutex.lock();
|
||||
QLinkedList< PixmapRequest * >::const_iterator sIt = d->m_pixmapRequestsStack.constBegin();
|
||||
QLinkedList< PixmapRequest * >::const_iterator sEnd = d->m_pixmapRequestsStack.constEnd();
|
||||
QList< PixmapRequest * >::const_iterator sIt = d->m_pixmapRequestsStack.constBegin();
|
||||
QList< PixmapRequest * >::const_iterator sEnd = d->m_pixmapRequestsStack.constEnd();
|
||||
for ( ; sIt != sEnd; ++sIt )
|
||||
delete *sIt;
|
||||
d->m_pixmapRequestsStack.clear();
|
||||
|
|
@ -2493,8 +2493,8 @@ void Document::removeObserver( DocumentObserver * pObserver )
|
|||
(*it)->deletePixmap( pObserver );
|
||||
|
||||
// [MEM] free observer's allocation descriptors
|
||||
QLinkedList< AllocatedPixmap * >::iterator aIt = d->m_allocatedPixmaps.begin();
|
||||
QLinkedList< AllocatedPixmap * >::iterator aEnd = d->m_allocatedPixmaps.end();
|
||||
QList< AllocatedPixmap * >::iterator aIt = d->m_allocatedPixmaps.begin();
|
||||
QList< AllocatedPixmap * >::iterator aEnd = d->m_allocatedPixmaps.end();
|
||||
while ( aIt != aEnd )
|
||||
{
|
||||
AllocatedPixmap * p = *aIt;
|
||||
|
|
@ -2819,12 +2819,12 @@ QString Document::pageSizeString(int page) const
|
|||
return QString();
|
||||
}
|
||||
|
||||
void Document::requestPixmaps( const QLinkedList< PixmapRequest * > & requests )
|
||||
void Document::requestPixmaps( const QList< PixmapRequest * > & requests )
|
||||
{
|
||||
requestPixmaps( requests, RemoveAllPrevious );
|
||||
}
|
||||
|
||||
void Document::requestPixmaps( const QLinkedList< PixmapRequest * > & requests, PixmapRequestFlags reqOptions )
|
||||
void Document::requestPixmaps( const QList< PixmapRequest * > & requests, PixmapRequestFlags reqOptions )
|
||||
{
|
||||
if ( requests.isEmpty() )
|
||||
return;
|
||||
|
|
@ -2832,7 +2832,7 @@ void Document::requestPixmaps( const QLinkedList< PixmapRequest * > & requests,
|
|||
if ( !d->m_pageController )
|
||||
{
|
||||
// delete requests..
|
||||
QLinkedList< PixmapRequest * >::const_iterator rIt = requests.constBegin(), rEnd = requests.constEnd();
|
||||
QList< PixmapRequest * >::const_iterator rIt = requests.constBegin(), rEnd = requests.constEnd();
|
||||
for ( ; rIt != rEnd; ++rIt )
|
||||
delete *rIt;
|
||||
// ..and return
|
||||
|
|
@ -2844,13 +2844,13 @@ void Document::requestPixmaps( const QLinkedList< PixmapRequest * > & requests,
|
|||
DocumentObserver *requesterObserver = requests.first()->observer();
|
||||
QSet< int > requestedPages;
|
||||
{
|
||||
QLinkedList< PixmapRequest * >::const_iterator rIt = requests.constBegin(), rEnd = requests.constEnd();
|
||||
QList< PixmapRequest * >::const_iterator rIt = requests.constBegin(), rEnd = requests.constEnd();
|
||||
for ( ; rIt != rEnd; ++rIt )
|
||||
requestedPages.insert( (*rIt)->pageNumber() );
|
||||
}
|
||||
const bool removeAllPrevious = reqOptions & RemoveAllPrevious;
|
||||
d->m_pixmapRequestsMutex.lock();
|
||||
QLinkedList< PixmapRequest * >::iterator sIt = d->m_pixmapRequestsStack.begin(), sEnd = d->m_pixmapRequestsStack.end();
|
||||
QList< PixmapRequest * >::iterator sIt = d->m_pixmapRequestsStack.begin(), sEnd = d->m_pixmapRequestsStack.end();
|
||||
while ( sIt != sEnd )
|
||||
{
|
||||
if ( (*sIt)->observer() == requesterObserver
|
||||
|
|
@ -2865,7 +2865,7 @@ void Document::requestPixmaps( const QLinkedList< PixmapRequest * > & requests,
|
|||
}
|
||||
|
||||
// 2. [ADD TO STACK] add requests to stack
|
||||
QLinkedList< PixmapRequest * >::const_iterator rIt = requests.constBegin(), rEnd = requests.constEnd();
|
||||
QList< PixmapRequest * >::const_iterator rIt = requests.constBegin(), rEnd = requests.constEnd();
|
||||
for ( ; rIt != rEnd; ++rIt )
|
||||
{
|
||||
// set the 'page field' (see PixmapRequest) and check if it is valid
|
||||
|
|
@ -3244,7 +3244,7 @@ void Document::setPrevViewport()
|
|||
void Document::setNextViewport()
|
||||
// restore next viewport from the history
|
||||
{
|
||||
QLinkedList< DocumentViewport >::const_iterator nextIterator = d->m_viewportIterator;
|
||||
QList< DocumentViewport >::const_iterator nextIterator = d->m_viewportIterator;
|
||||
++nextIterator;
|
||||
if ( nextIterator != d->m_viewportHistory.end() )
|
||||
{
|
||||
|
|
@ -4306,8 +4306,8 @@ void DocumentPrivate::requestDone( PixmapRequest * req )
|
|||
#endif
|
||||
|
||||
// [MEM] 1.1 find and remove a previous entry for the same page and id
|
||||
QLinkedList< AllocatedPixmap * >::iterator aIt = m_allocatedPixmaps.begin();
|
||||
QLinkedList< AllocatedPixmap * >::iterator aEnd = m_allocatedPixmaps.end();
|
||||
QList< AllocatedPixmap * >::iterator aIt = m_allocatedPixmaps.begin();
|
||||
QList< AllocatedPixmap * >::iterator aEnd = m_allocatedPixmaps.end();
|
||||
for ( ; aIt != aEnd; ++aIt )
|
||||
if ( (*aIt)->page == req->pageNumber() && (*aIt)->observer == req->observer() )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -362,7 +362,7 @@ class OKULAR_EXPORT Document : public QObject
|
|||
*
|
||||
* The same as requestPixmaps( requests, RemoveAllPrevious );
|
||||
*/
|
||||
void requestPixmaps( const QLinkedList<PixmapRequest*> &requests );
|
||||
void requestPixmaps( const QList<PixmapRequest*> &requests );
|
||||
|
||||
/**
|
||||
* Sends @p requests for pixmap generation.
|
||||
|
|
@ -371,7 +371,7 @@ class OKULAR_EXPORT Document : public QObject
|
|||
*
|
||||
* @since 0.7 (KDE 4.1)
|
||||
*/
|
||||
void requestPixmaps( const QLinkedList<PixmapRequest*> &requests, PixmapRequestFlags reqOptions );
|
||||
void requestPixmaps( const QList<PixmapRequest*> &requests, PixmapRequestFlags reqOptions );
|
||||
|
||||
/**
|
||||
* Sends a request for text page generation for the given page @p number.
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
// qt/kde/system includes
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QLinkedList>
|
||||
#include <QtCore/QList>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QMutex>
|
||||
#include <QtCore/QPointer>
|
||||
|
|
@ -201,17 +201,17 @@ class DocumentPrivate
|
|||
qint64 m_docSize;
|
||||
|
||||
// viewport stuff
|
||||
QLinkedList< DocumentViewport > m_viewportHistory;
|
||||
QLinkedList< DocumentViewport >::iterator m_viewportIterator;
|
||||
QList< DocumentViewport > m_viewportHistory;
|
||||
QList< DocumentViewport >::iterator m_viewportIterator;
|
||||
DocumentViewport m_nextDocumentViewport; // see Link::Goto for an explanation
|
||||
QString m_nextDocumentDestination;
|
||||
|
||||
// observers / requests / allocator stuff
|
||||
QSet< DocumentObserver * > m_observers;
|
||||
QLinkedList< PixmapRequest * > m_pixmapRequestsStack;
|
||||
QLinkedList< PixmapRequest * > m_executingPixmapRequests;
|
||||
QList< PixmapRequest * > m_pixmapRequestsStack;
|
||||
QList< PixmapRequest * > m_executingPixmapRequests;
|
||||
QMutex m_pixmapRequestsMutex;
|
||||
QLinkedList< AllocatedPixmap * > m_allocatedPixmaps;
|
||||
QList< AllocatedPixmap * > m_allocatedPixmaps;
|
||||
qulonglong m_allocatedPixmapsTotalMemory;
|
||||
QList< int > m_allocatedTextPagesFifo;
|
||||
int m_maxAllocatedTextPages;
|
||||
|
|
|
|||
|
|
@ -52,9 +52,9 @@ using namespace Okular;
|
|||
|
||||
static const double distanceConsideredEqual = 25; // 5px
|
||||
|
||||
static void deleteObjectRects( QLinkedList< ObjectRect * >& rects, const QSet<ObjectRect::ObjectType>& which )
|
||||
static void deleteObjectRects( QList< ObjectRect * >& rects, const QSet<ObjectRect::ObjectType>& which )
|
||||
{
|
||||
QLinkedList< ObjectRect * >::iterator it = rects.begin(), end = rects.end();
|
||||
QList< ObjectRect * >::iterator it = rects.begin(), end = rects.end();
|
||||
for ( ; it != end; )
|
||||
if ( which.contains( (*it)->objectType() ) )
|
||||
{
|
||||
|
|
@ -252,7 +252,7 @@ bool Page::hasObjectRect( double x, double y, double xScale, double yScale ) con
|
|||
if ( m_rects.isEmpty() )
|
||||
return false;
|
||||
|
||||
QLinkedList< ObjectRect * >::const_iterator it = m_rects.begin(), end = m_rects.end();
|
||||
QList< ObjectRect * >::const_iterator it = m_rects.begin(), end = m_rects.end();
|
||||
for ( ; it != end; ++it )
|
||||
if ( (*it)->distanceSqr( x, y, xScale, yScale ) < distanceConsideredEqual )
|
||||
return true;
|
||||
|
|
@ -269,7 +269,7 @@ bool Page::hasHighlights( int s_id ) const
|
|||
if ( s_id == -1 )
|
||||
return true;
|
||||
// iterate on the highlights list to find an entry by id
|
||||
QLinkedList< HighlightAreaRect * >::const_iterator it = m_highlights.begin(), end = m_highlights.end();
|
||||
QList< HighlightAreaRect * >::const_iterator it = m_highlights.begin(), end = m_highlights.end();
|
||||
for ( ; it != end; ++it )
|
||||
if ( (*it)->s_id == s_id )
|
||||
return true;
|
||||
|
|
@ -393,11 +393,11 @@ void PagePrivate::rotateAt( Rotation orientation )
|
|||
* Rotate the object rects on the page.
|
||||
*/
|
||||
const QTransform matrix = rotationMatrix();
|
||||
QLinkedList< ObjectRect * >::const_iterator objectIt = m_page->m_rects.begin(), end = m_page->m_rects.end();
|
||||
QList< ObjectRect * >::const_iterator objectIt = m_page->m_rects.begin(), end = m_page->m_rects.end();
|
||||
for ( ; objectIt != end; ++objectIt )
|
||||
(*objectIt)->transform( matrix );
|
||||
|
||||
QLinkedList< HighlightAreaRect* >::const_iterator hlIt = m_page->m_highlights.begin(), hlItEnd = m_page->m_highlights.end();
|
||||
QList< HighlightAreaRect* >::const_iterator hlIt = m_page->m_highlights.begin(), hlItEnd = m_page->m_highlights.end();
|
||||
for ( ; hlIt != hlItEnd; ++hlIt )
|
||||
{
|
||||
(*hlIt)->transform( RotationJob::rotationMatrix( oldRotation, m_rotation ) );
|
||||
|
|
@ -422,7 +422,7 @@ void PagePrivate::changeSize( const PageSize &size )
|
|||
const ObjectRect * Page::objectRect( ObjectRect::ObjectType type, double x, double y, double xScale, double yScale ) const
|
||||
{
|
||||
// Walk list in reverse order so that annotations in the foreground are preferred
|
||||
QLinkedListIterator< ObjectRect * > it( m_rects );
|
||||
QListIterator< ObjectRect * > it( m_rects );
|
||||
it.toBack();
|
||||
while ( it.hasPrevious() )
|
||||
{
|
||||
|
|
@ -434,11 +434,11 @@ const ObjectRect * Page::objectRect( ObjectRect::ObjectType type, double x, doub
|
|||
return 0;
|
||||
}
|
||||
|
||||
QLinkedList< const ObjectRect * > Page::objectRects( ObjectRect::ObjectType type, double x, double y, double xScale, double yScale ) const
|
||||
QList< const ObjectRect * > Page::objectRects( ObjectRect::ObjectType type, double x, double y, double xScale, double yScale ) const
|
||||
{
|
||||
QLinkedList< const ObjectRect * > result;
|
||||
QList< const ObjectRect * > result;
|
||||
|
||||
QLinkedListIterator< ObjectRect * > it( m_rects );
|
||||
QListIterator< ObjectRect * > it( m_rects );
|
||||
it.toBack();
|
||||
while ( it.hasPrevious() )
|
||||
{
|
||||
|
|
@ -456,7 +456,7 @@ const ObjectRect* Page::nearestObjectRect( ObjectRect::ObjectType type, double x
|
|||
ObjectRect * res = 0;
|
||||
double minDistance = std::numeric_limits<double>::max();
|
||||
|
||||
QLinkedList< ObjectRect * >::const_iterator it = m_rects.constBegin(), end = m_rects.constEnd();
|
||||
QList< ObjectRect * >::const_iterator it = m_rects.constBegin(), end = m_rects.constEnd();
|
||||
for ( ; it != end; ++it )
|
||||
{
|
||||
if ( (*it)->objectType() == type )
|
||||
|
|
@ -480,7 +480,7 @@ const PageTransition * Page::transition() const
|
|||
return d->m_transition;
|
||||
}
|
||||
|
||||
QLinkedList< Annotation* > Page::annotations() const
|
||||
QList< Annotation* > Page::annotations() const
|
||||
{
|
||||
return m_annotations;
|
||||
}
|
||||
|
|
@ -500,7 +500,7 @@ const Action * Page::pageAction( PageAction action ) const
|
|||
return 0;
|
||||
}
|
||||
|
||||
QLinkedList< FormField * > Page::formFields() const
|
||||
QList< FormField * > Page::formFields() const
|
||||
{
|
||||
return d->formfields;
|
||||
}
|
||||
|
|
@ -552,7 +552,7 @@ void Page::setTextPage( TextPage * textPage )
|
|||
}
|
||||
}
|
||||
|
||||
void Page::setObjectRects( const QLinkedList< ObjectRect * > & rects )
|
||||
void Page::setObjectRects( const QList< ObjectRect * > & rects )
|
||||
{
|
||||
QSet<ObjectRect::ObjectType> which;
|
||||
which << ObjectRect::Action << ObjectRect::Image;
|
||||
|
|
@ -563,7 +563,7 @@ void Page::setObjectRects( const QLinkedList< ObjectRect * > & rects )
|
|||
*/
|
||||
const QTransform matrix = d->rotationMatrix();
|
||||
|
||||
QLinkedList< ObjectRect * >::const_iterator objectIt = rects.begin(), end = rects.end();
|
||||
QList< ObjectRect * >::const_iterator objectIt = rects.begin(), end = rects.end();
|
||||
for ( ; objectIt != end; ++objectIt )
|
||||
(*objectIt)->transform( matrix );
|
||||
|
||||
|
|
@ -592,7 +592,7 @@ void PagePrivate::setTextSelections( RegularAreaRect *r, const QColor & color )
|
|||
}
|
||||
}
|
||||
|
||||
void Page::setSourceReferences( const QLinkedList< SourceRefObjectRect * > & refRects )
|
||||
void Page::setSourceReferences( const QList< SourceRefObjectRect * > & refRects )
|
||||
{
|
||||
deleteSourceReferences();
|
||||
foreach( SourceRefObjectRect * rect, refRects )
|
||||
|
|
@ -654,13 +654,13 @@ bool Page::removeAnnotation( Annotation * annotation )
|
|||
if ( !d->m_doc->m_parent->canRemovePageAnnotation(annotation) )
|
||||
return false;
|
||||
|
||||
QLinkedList< Annotation * >::iterator aIt = m_annotations.begin(), aEnd = m_annotations.end();
|
||||
QList< Annotation * >::iterator aIt = m_annotations.begin(), aEnd = m_annotations.end();
|
||||
for ( ; aIt != aEnd; ++aIt )
|
||||
{
|
||||
if((*aIt) && (*aIt)->uniqueName()==annotation->uniqueName())
|
||||
{
|
||||
int rectfound = false;
|
||||
QLinkedList< ObjectRect * >::iterator it = m_rects.begin(), end = m_rects.end();
|
||||
QList< ObjectRect * >::iterator it = m_rects.begin(), end = m_rects.end();
|
||||
for ( ; it != end && !rectfound; ++it )
|
||||
if ( ( (*it)->objectType() == ObjectRect::OAnnotation ) && ( (*it)->object() == (*aIt) ) )
|
||||
{
|
||||
|
|
@ -699,11 +699,11 @@ void Page::setPageAction( PageAction action, Action * link )
|
|||
}
|
||||
}
|
||||
|
||||
void Page::setFormFields( const QLinkedList< FormField * >& fields )
|
||||
void Page::setFormFields( const QList< FormField * >& fields )
|
||||
{
|
||||
qDeleteAll( d->formfields );
|
||||
d->formfields = fields;
|
||||
QLinkedList< FormField * >::const_iterator it = d->formfields.begin(), itEnd = d->formfields.end();
|
||||
QList< FormField * >::const_iterator it = d->formfields.begin(), itEnd = d->formfields.end();
|
||||
for ( ; it != itEnd; ++it )
|
||||
{
|
||||
(*it)->d_ptr->setDefault();
|
||||
|
|
@ -750,7 +750,7 @@ void Page::deleteRects()
|
|||
void PagePrivate::deleteHighlights( int s_id )
|
||||
{
|
||||
// delete highlights by ID
|
||||
QLinkedList< HighlightAreaRect* >::iterator it = m_page->m_highlights.begin(), end = m_page->m_highlights.end();
|
||||
QList< HighlightAreaRect* >::iterator it = m_page->m_highlights.begin(), end = m_page->m_highlights.end();
|
||||
while ( it != end )
|
||||
{
|
||||
HighlightAreaRect* highlight = *it;
|
||||
|
|
@ -780,7 +780,7 @@ void Page::deleteAnnotations()
|
|||
// delete ObjectRects of type Annotation
|
||||
deleteObjectRects( m_rects, QSet<ObjectRect::ObjectType>() << ObjectRect::OAnnotation );
|
||||
// delete all stored annotations
|
||||
QLinkedList< Annotation * >::const_iterator aIt = m_annotations.begin(), aEnd = m_annotations.end();
|
||||
QList< Annotation * >::const_iterator aIt = m_annotations.begin(), aEnd = m_annotations.end();
|
||||
for ( ; aIt != aEnd; ++aIt )
|
||||
delete *aIt;
|
||||
m_annotations.clear();
|
||||
|
|
@ -837,7 +837,7 @@ void PagePrivate::restoreLocalContents( const QDomNode & pageNode )
|
|||
continue;
|
||||
|
||||
QHash<int, FormField*> hashedforms;
|
||||
QLinkedList< FormField * >::const_iterator fIt = formfields.begin(), fItEnd = formfields.end();
|
||||
QList< FormField * >::const_iterator fIt = formfields.begin(), fItEnd = formfields.end();
|
||||
for ( ; fIt != fItEnd; ++fIt )
|
||||
{
|
||||
hashedforms[(*fIt)->id()] = (*fIt);
|
||||
|
|
@ -906,7 +906,7 @@ void PagePrivate::saveLocalContents( QDomNode & parentNode, QDomDocument & docum
|
|||
QDomElement annotListElement = document.createElement( "annotationList" );
|
||||
|
||||
// add every annotation to the annotationList
|
||||
QLinkedList< Annotation * >::const_iterator aIt = m_page->m_annotations.constBegin(), aEnd = m_page->m_annotations.constEnd();
|
||||
QList< Annotation * >::const_iterator aIt = m_page->m_annotations.constBegin(), aEnd = m_page->m_annotations.constEnd();
|
||||
for ( ; aIt != aEnd; ++aIt )
|
||||
{
|
||||
// get annotation
|
||||
|
|
@ -934,7 +934,7 @@ void PagePrivate::saveLocalContents( QDomNode & parentNode, QDomDocument & docum
|
|||
QDomElement formListElement = document.createElement( "forms" );
|
||||
|
||||
// add every form data to the formList
|
||||
QLinkedList< FormField * >::const_iterator fIt = formfields.constBegin(), fItEnd = formfields.constEnd();
|
||||
QList< FormField * >::const_iterator fIt = formfields.constBegin(), fItEnd = formfields.constEnd();
|
||||
for ( ; fIt != fItEnd; ++fIt )
|
||||
{
|
||||
// get the form field
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
#ifndef _OKULAR_PAGE_H_
|
||||
#define _OKULAR_PAGE_H_
|
||||
|
||||
#include <QtCore/QLinkedList>
|
||||
#include <QtCore/QList>
|
||||
|
||||
#include "okular_export.h"
|
||||
#include "area.h"
|
||||
|
|
@ -229,7 +229,7 @@ class OKULAR_EXPORT Page
|
|||
* Returns all object rects of the given @p type which are at point (@p x, @p y) at scale (@p xScale, @p yScale).
|
||||
* @since 0.16 (KDE 4.10)
|
||||
*/
|
||||
QLinkedList< const ObjectRect * > objectRects( ObjectRect::ObjectType type, double x, double y, double xScale, double yScale ) const;
|
||||
QList< const ObjectRect * > objectRects( ObjectRect::ObjectType type, double x, double y, double xScale, double yScale ) const;
|
||||
|
||||
/**
|
||||
* Returns the object rect of the given @p type which is nearest to the point (@p x, @p y) at scale (@p xScale, @p yScale).
|
||||
|
|
@ -247,7 +247,7 @@ class OKULAR_EXPORT Page
|
|||
/**
|
||||
* Returns the list of annotations of the page.
|
||||
*/
|
||||
QLinkedList< Annotation* > annotations() const;
|
||||
QList< Annotation* > annotations() const;
|
||||
|
||||
/**
|
||||
* Returns the @ref Action object which is associated with the given page @p action
|
||||
|
|
@ -258,7 +258,7 @@ class OKULAR_EXPORT Page
|
|||
/**
|
||||
* Returns the list of FormField of the page.
|
||||
*/
|
||||
QLinkedList< FormField * > formFields() const;
|
||||
QList< FormField * > formFields() const;
|
||||
|
||||
/**
|
||||
* Sets the region described by @p rect with @p pixmap for the
|
||||
|
|
@ -276,12 +276,12 @@ class OKULAR_EXPORT Page
|
|||
/**
|
||||
* Sets the list of object @p rects of the page.
|
||||
*/
|
||||
void setObjectRects( const QLinkedList< ObjectRect * > & rects );
|
||||
void setObjectRects( const QList< ObjectRect * > & rects );
|
||||
|
||||
/**
|
||||
* Sets the list of source reference objects @p rects.
|
||||
*/
|
||||
void setSourceReferences( const QLinkedList< SourceRefObjectRect * > & rects );
|
||||
void setSourceReferences( const QList< SourceRefObjectRect * > & rects );
|
||||
|
||||
/**
|
||||
* Sets the duration of the page to @p seconds when displayed in presentation mode.
|
||||
|
|
@ -341,7 +341,7 @@ class OKULAR_EXPORT Page
|
|||
/**
|
||||
* Sets @p fields as list of FormField of the page.
|
||||
*/
|
||||
void setFormFields( const QLinkedList< FormField * >& fields );
|
||||
void setFormFields( const QList< FormField * >& fields );
|
||||
|
||||
/**
|
||||
* Deletes the pixmap for the given @p observer
|
||||
|
|
@ -402,9 +402,9 @@ class OKULAR_EXPORT Page
|
|||
|
||||
const QPixmap * _o_nearestPixmap( DocumentObserver *, int, int ) const;
|
||||
|
||||
QLinkedList< ObjectRect* > m_rects;
|
||||
QLinkedList< HighlightAreaRect* > m_highlights;
|
||||
QLinkedList< Annotation* > m_annotations;
|
||||
QList< ObjectRect* > m_rects;
|
||||
QList< HighlightAreaRect* > m_highlights;
|
||||
QList< Annotation* > m_annotations;
|
||||
|
||||
Q_DISABLE_COPY( Page )
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
#define _OKULAR_PAGE_PRIVATE_H_
|
||||
|
||||
// qt/kde includes
|
||||
#include <qlinkedlist.h>
|
||||
#include <qlist.h>
|
||||
#include <qmap.h>
|
||||
#include <qtransform.h>
|
||||
#include <qstring.h>
|
||||
|
|
@ -134,7 +134,7 @@ class PagePrivate
|
|||
TextPage * m_text;
|
||||
PageTransition * m_transition;
|
||||
HighlightAreaRect *m_textSelections;
|
||||
QLinkedList< FormField * > formfields;
|
||||
QList< FormField * > formfields;
|
||||
Action * m_openingAction;
|
||||
Action * m_closingAction;
|
||||
double m_duration;
|
||||
|
|
|
|||
|
|
@ -325,7 +325,7 @@ Document::OpenResult TextDocumentGenerator::loadDocumentWithPassword( const QStr
|
|||
|
||||
const QSize size = d->mDocument->pageSize().toSize();
|
||||
|
||||
QVector< QLinkedList<Okular::ObjectRect*> > objects( d->mDocument->pageCount() );
|
||||
QVector< QList<Okular::ObjectRect*> > objects( d->mDocument->pageCount() );
|
||||
for ( int i = 0; i < d->mLinkInfos.count(); ++i ) {
|
||||
const TextDocumentGeneratorPrivate::LinkInfo &info = d->mLinkInfos.at( i );
|
||||
|
||||
|
|
@ -338,7 +338,7 @@ Document::OpenResult TextDocumentGenerator::loadDocumentWithPassword( const QStr
|
|||
Okular::ObjectRect::Action, info.link ) );
|
||||
}
|
||||
|
||||
QVector< QLinkedList<Okular::Annotation*> > annots( d->mDocument->pageCount() );
|
||||
QVector< QList<Okular::Annotation*> > annots( d->mDocument->pageCount() );
|
||||
for ( int i = 0; i < d->mAnnotationInfos.count(); ++i ) {
|
||||
const TextDocumentGeneratorPrivate::AnnotationInfo &info = d->mAnnotationInfos[ i ];
|
||||
annots[ info.page ].append( info.annotation );
|
||||
|
|
@ -351,7 +351,7 @@ Document::OpenResult TextDocumentGenerator::loadDocumentWithPassword( const QStr
|
|||
if ( !objects.at( i ).isEmpty() ) {
|
||||
page->setObjectRects( objects.at( i ) );
|
||||
}
|
||||
QLinkedList<Okular::Annotation*>::ConstIterator annIt = annots.at( i ).begin(), annEnd = annots.at( i ).end();
|
||||
QList<Okular::Annotation*>::ConstIterator annIt = annots.at( i ).begin(), annEnd = annots.at( i ).end();
|
||||
for ( ; annIt != annEnd; ++annIt ) {
|
||||
page->addAnnotation( *annIt );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -288,7 +288,7 @@ void DjVuGenerator::loadPages( QVector<Okular::Page*> & pagesVector, int rotatio
|
|||
userMutex()->unlock();
|
||||
if ( !links.isEmpty() )
|
||||
{
|
||||
QLinkedList<Okular::ObjectRect *> rects;
|
||||
QList<Okular::ObjectRect *> rects;
|
||||
QList<KDjVu::Link*>::ConstIterator it = links.constBegin();
|
||||
QList<KDjVu::Link*>::ConstIterator itEnd = links.constEnd();
|
||||
for ( ; it != itEnd; ++it )
|
||||
|
|
@ -438,7 +438,7 @@ Okular::Annotation* DjVuGenerator::convertKDjVuAnnotation( int w, int h, KDjVu::
|
|||
QRect rect = QRect( a, b ).normalized();
|
||||
newlineann->setBoundingRectangle( Okular::NormalizedRect( Okular::Utils::rotateRect( rect, w, h, 0 ), w, h ) );
|
||||
// line points
|
||||
QLinkedList<Okular::NormalizedPoint> points;
|
||||
QList<Okular::NormalizedPoint> points;
|
||||
points.append( Okular::NormalizedPoint( a.x(), a.y(), w, h ) );
|
||||
points.append( Okular::NormalizedPoint( b.x(), b.y(), w, h ) );
|
||||
newlineann->setLinePoints( points );
|
||||
|
|
|
|||
|
|
@ -168,9 +168,9 @@ void DviGenerator::fillViewportFromAnchor( Okular::DocumentViewport &vp,
|
|||
vp.rePos.pos = Okular::DocumentViewport::Center;
|
||||
}
|
||||
|
||||
QLinkedList<Okular::ObjectRect*> DviGenerator::generateDviLinks( const dviPageInfo *pageInfo )
|
||||
QList<Okular::ObjectRect*> DviGenerator::generateDviLinks( const dviPageInfo *pageInfo )
|
||||
{
|
||||
QLinkedList<Okular::ObjectRect*> dviLinks;
|
||||
QList<Okular::ObjectRect*> dviLinks;
|
||||
|
||||
int pageWidth = pageInfo->width, pageHeight = pageInfo->height;
|
||||
|
||||
|
|
@ -535,7 +535,7 @@ void DviGenerator::loadPages( QVector< Okular::Page * > &pagesVector )
|
|||
|
||||
// filling the pages with the source references rects
|
||||
const QVector<DVI_SourceFileAnchor>& sourceAnchors = m_dviRenderer->sourceAnchors();
|
||||
QVector< QLinkedList< Okular::SourceRefObjectRect * > > refRects( numofpages );
|
||||
QVector< QList< Okular::SourceRefObjectRect * > > refRects( numofpages );
|
||||
foreach ( const DVI_SourceFileAnchor& sfa, sourceAnchors )
|
||||
{
|
||||
if ( sfa.page < 1 || (int)sfa.page > numofpages )
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ class DviGenerator : public Okular::Generator
|
|||
int pW, int pH ) const;
|
||||
void fillViewportFromAnchor( Okular::DocumentViewport &vp, const Anchor &anch,
|
||||
const Okular::Page *page ) const;
|
||||
QLinkedList<Okular::ObjectRect*> generateDviLinks( const dviPageInfo *pageInfo );
|
||||
QList<Okular::ObjectRect*> generateDviLinks( const dviPageInfo *pageInfo );
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ QImage PluckerGenerator::image( Okular::PixmapRequest *request )
|
|||
p.end();
|
||||
|
||||
if ( !mLinkAdded.contains( request->pageNumber() ) ) {
|
||||
QLinkedList<Okular::ObjectRect*> objects;
|
||||
QList<Okular::ObjectRect*> objects;
|
||||
for ( int i = 0; i < mLinks.count(); ++i ) {
|
||||
if ( mLinks[ i ].page == request->pageNumber() ) {
|
||||
QTextDocument *document = mPages[ request->pageNumber() ];
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@ void PopplerAnnotationProxy::notifyModification( const Okular::Annotation *okl_a
|
|||
{
|
||||
const Okular::LineAnnotation * okl_lineann = static_cast<const Okular::LineAnnotation*>(okl_ann);
|
||||
Poppler::LineAnnotation * ppl_lineann = static_cast<Poppler::LineAnnotation*>(ppl_ann);
|
||||
QLinkedList<QPointF> points;
|
||||
QList<QPointF> points;
|
||||
foreach ( const Okular::NormalizedPoint &p, okl_lineann->linePoints() )
|
||||
points.append(normPointToPointF( p ));
|
||||
ppl_lineann->setLinePoints( points );
|
||||
|
|
@ -218,10 +218,10 @@ void PopplerAnnotationProxy::notifyModification( const Okular::Annotation *okl_a
|
|||
{
|
||||
const Okular::InkAnnotation * okl_inkann = static_cast<const Okular::InkAnnotation*>(okl_ann);
|
||||
Poppler::InkAnnotation * ppl_inkann = static_cast<Poppler::InkAnnotation*>(ppl_ann);
|
||||
QList< QLinkedList<QPointF> > paths;
|
||||
foreach ( const QLinkedList<Okular::NormalizedPoint> &path, okl_inkann->inkPaths() )
|
||||
QList< QList<QPointF> > paths;
|
||||
foreach ( const QList<Okular::NormalizedPoint> &path, okl_inkann->inkPaths() )
|
||||
{
|
||||
QLinkedList<QPointF> points;
|
||||
QList<QPointF> points;
|
||||
foreach ( const Okular::NormalizedPoint &p, path )
|
||||
points.append(normPointToPointF( p ));
|
||||
paths.append( points );
|
||||
|
|
|
|||
|
|
@ -277,9 +277,9 @@ Okular::Action* createLinkFromPopplerLink(const Poppler::Link *popplerLink)
|
|||
/**
|
||||
* Note: the function will take ownership of the popplerLink objects.
|
||||
*/
|
||||
static QLinkedList<Okular::ObjectRect*> generateLinks( const QList<Poppler::Link*> &popplerLinks )
|
||||
static QList<Okular::ObjectRect*> generateLinks( const QList<Poppler::Link*> &popplerLinks )
|
||||
{
|
||||
QLinkedList<Okular::ObjectRect*> links;
|
||||
QList<Okular::ObjectRect*> links;
|
||||
foreach(const Poppler::Link *popplerLink, popplerLinks)
|
||||
{
|
||||
QRectF linkArea = popplerLink->linkArea();
|
||||
|
|
@ -1416,7 +1416,7 @@ void PDFGenerator::addTransition( Poppler::Page * pdfPage, Okular::Page * page )
|
|||
void PDFGenerator::addFormFields( Poppler::Page * popplerPage, Okular::Page * page )
|
||||
{
|
||||
QList<Poppler::FormField*> popplerFormFields = popplerPage->formFields();
|
||||
QLinkedList<Okular::FormField*> okularFormFields;
|
||||
QList<Okular::FormField*> okularFormFields;
|
||||
foreach( Poppler::FormField *f, popplerFormFields )
|
||||
{
|
||||
Okular::FormField * of = 0;
|
||||
|
|
@ -1548,7 +1548,7 @@ void PDFGenerator::loadPdfSync( const QString & filePath, QVector<Okular::Page*>
|
|||
|
||||
}
|
||||
|
||||
QVector< QLinkedList< Okular::SourceRefObjectRect * > > refRects( pagesVector.size() );
|
||||
QVector< QList< Okular::SourceRefObjectRect * > > refRects( pagesVector.size() );
|
||||
foreach ( const pdfsyncpoint& pt, points )
|
||||
{
|
||||
// drop pdfsync points not completely valid
|
||||
|
|
|
|||
|
|
@ -310,7 +310,7 @@ void PageItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
|
|||
const int priority = m_isThumbnail ? THUMBNAILS_PRIO : PAGEVIEW_PRIO;
|
||||
|
||||
if (m_intentionalDraw) {
|
||||
QLinkedList<Okular::PixmapRequest *> requestedPixmaps;
|
||||
QList<Okular::PixmapRequest *> requestedPixmaps;
|
||||
requestedPixmaps.push_back(new Okular::PixmapRequest(observer, m_viewPort.pageNumber, width(), height(), priority, Okular::PixmapRequest::Asynchronous));
|
||||
const Okular::Document::PixmapRequestFlag prf = m_isThumbnail ? Okular::Document::NoOption : Okular::Document::RemoveAllPrevious;
|
||||
m_documentItem.data()->document()->requestPixmaps(requestedPixmaps, prf);
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ void AnnotationTest::testDistance_data()
|
|||
|
||||
// lines
|
||||
Okular::LineAnnotation *line = new Okular::LineAnnotation;
|
||||
line->setLinePoints( QLinkedList< Okular::NormalizedPoint >()
|
||||
line->setLinePoints( QList< Okular::NormalizedPoint >()
|
||||
<< Okular::NormalizedPoint( 0.1, 0.1 )
|
||||
<< Okular::NormalizedPoint( 0.9, 0.1 )
|
||||
);
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
#include <qtest_kde.h>
|
||||
|
||||
#include <QLinkedList>
|
||||
#include <QList>
|
||||
|
||||
#include "../core/document.h"
|
||||
#include "../core/generator.h"
|
||||
|
|
@ -44,7 +44,7 @@ void DocumentTest::testCloseDuringRotationJob()
|
|||
// Request a pixmap. A RotationJob will be enqueued but not started
|
||||
Okular::PixmapRequest *pixmapReq = new Okular::PixmapRequest(
|
||||
dummyDocumentObserver, 0, 100, 100, 1, Okular::PixmapRequest::NoFeature );
|
||||
m_document->requestPixmaps( QLinkedList<Okular::PixmapRequest*>() << pixmapReq );
|
||||
m_document->requestPixmaps( QList<Okular::PixmapRequest*>() << pixmapReq );
|
||||
|
||||
// Delete the document
|
||||
delete m_document;
|
||||
|
|
|
|||
|
|
@ -72,14 +72,14 @@ void EditFormsTest::init()
|
|||
QVERIFY( !m_document->canRedo() );
|
||||
|
||||
const Okular::Page* page = m_document->page( 0 );
|
||||
QLinkedList<Okular::FormField*> pageFields = page->formFields();
|
||||
QList<Okular::FormField*> pageFields = page->formFields();
|
||||
|
||||
// Clear lists
|
||||
m_checkBoxForms.clear();
|
||||
m_radioButtonForms.clear();
|
||||
|
||||
// Collect forms of the various types
|
||||
QLinkedList< Okular::FormField * >::const_iterator ffIt = pageFields.constBegin(), ffEnd = pageFields.constEnd();
|
||||
QList< Okular::FormField * >::const_iterator ffIt = pageFields.constBegin(), ffEnd = pageFields.constEnd();
|
||||
for ( ; ffIt != ffEnd; ++ffIt )
|
||||
{
|
||||
Okular::FormField * ff = *ffIt;
|
||||
|
|
|
|||
|
|
@ -21,10 +21,10 @@ namespace TestingUtils
|
|||
return annotXmlString;
|
||||
}
|
||||
|
||||
bool pointListsAlmostEqual( QLinkedList< Okular::NormalizedPoint > points1, QLinkedList< Okular::NormalizedPoint > points2 ) {
|
||||
bool pointListsAlmostEqual( QList< Okular::NormalizedPoint > points1, QList< Okular::NormalizedPoint > points2 ) {
|
||||
|
||||
QLinkedListIterator<Okular::NormalizedPoint> it1( points1 );
|
||||
QLinkedListIterator<Okular::NormalizedPoint> it2( points2 );
|
||||
QListIterator<Okular::NormalizedPoint> it1( points1 );
|
||||
QListIterator<Okular::NormalizedPoint> it2( points2 );
|
||||
while ( it1.hasNext() && it2.hasNext() )
|
||||
{
|
||||
const Okular::NormalizedPoint& p1 = it1.next();
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
#ifndef OKULAR_TESTINGUTILS_H
|
||||
#define OKULAR_TESTINGUTILS_H
|
||||
|
||||
#include <QLinkedList>
|
||||
#include <QList>
|
||||
#include <QString>
|
||||
|
||||
namespace Okular {
|
||||
|
|
@ -29,7 +29,7 @@ namespace TestingUtils
|
|||
* Returns true if the pairwise comparison coordinates of points in @p points1 and @p points2 are almost
|
||||
* equal (according to qFuzzyCompare)
|
||||
*/
|
||||
bool pointListsAlmostEqual( QLinkedList< Okular::NormalizedPoint > points1, QLinkedList< Okular::NormalizedPoint > points2 );
|
||||
bool pointListsAlmostEqual( QList< Okular::NormalizedPoint > points1, QList< Okular::NormalizedPoint > points2 );
|
||||
|
||||
/*
|
||||
* The AnnotationDisposeWatcher class provides a static disposeAnnotation function
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
Okular::LineAnnotation* getNewLineAnnotation(double startX, double startY, double endX, double endY)
|
||||
{
|
||||
Okular::LineAnnotation *line = new Okular::LineAnnotation;
|
||||
line->setLinePoints( QLinkedList< Okular::NormalizedPoint >()
|
||||
line->setLinePoints( QList< Okular::NormalizedPoint >()
|
||||
<< Okular::NormalizedPoint( startX, startY )
|
||||
<< Okular::NormalizedPoint( endX, endY )
|
||||
);
|
||||
|
|
@ -53,13 +53,13 @@ private:
|
|||
Okular::NormalizedPoint m_deltaA;
|
||||
Okular::NormalizedPoint m_deltaB;
|
||||
|
||||
QLinkedList< Okular::NormalizedPoint > m_origPoints1;
|
||||
QLinkedList< Okular::NormalizedPoint > m_origPoints2;
|
||||
QList< Okular::NormalizedPoint > m_origPoints1;
|
||||
QList< Okular::NormalizedPoint > m_origPoints2;
|
||||
|
||||
QLinkedList< Okular::NormalizedPoint > m_points1DeltaA;
|
||||
QLinkedList< Okular::NormalizedPoint > m_points1DeltaAB;
|
||||
QLinkedList< Okular::NormalizedPoint > m_points2DeltaA;
|
||||
QLinkedList< Okular::NormalizedPoint > m_points2DeltaAB;
|
||||
QList< Okular::NormalizedPoint > m_points1DeltaA;
|
||||
QList< Okular::NormalizedPoint > m_points1DeltaAB;
|
||||
QList< Okular::NormalizedPoint > m_points2DeltaA;
|
||||
QList< Okular::NormalizedPoint > m_points2DeltaAB;
|
||||
};
|
||||
|
||||
void TranslateAnnotationTest::initTestCase()
|
||||
|
|
@ -72,27 +72,27 @@ void TranslateAnnotationTest::initTestCase()
|
|||
m_deltaB = Okular::NormalizedPoint(0.1, 0.2);
|
||||
|
||||
// Build lists of expected points for various states
|
||||
m_origPoints1 = QLinkedList< Okular::NormalizedPoint >()
|
||||
m_origPoints1 = QList< Okular::NormalizedPoint >()
|
||||
<< Okular::NormalizedPoint( 0.1, 0.1 )
|
||||
<< Okular::NormalizedPoint( 0.2, 0.3 );
|
||||
|
||||
m_points1DeltaA = QLinkedList< Okular::NormalizedPoint >()
|
||||
m_points1DeltaA = QList< Okular::NormalizedPoint >()
|
||||
<< Okular::NormalizedPoint( 0.15, 0.2 )
|
||||
<< Okular::NormalizedPoint( 0.25, 0.4 );
|
||||
|
||||
m_points1DeltaAB = QLinkedList< Okular::NormalizedPoint >()
|
||||
m_points1DeltaAB = QList< Okular::NormalizedPoint >()
|
||||
<< Okular::NormalizedPoint( 0.25, 0.4 )
|
||||
<< Okular::NormalizedPoint( 0.35, 0.6 );
|
||||
|
||||
m_origPoints2 = QLinkedList< Okular::NormalizedPoint >()
|
||||
m_origPoints2 = QList< Okular::NormalizedPoint >()
|
||||
<< Okular::NormalizedPoint( 0.1, 0.1 )
|
||||
<< Okular::NormalizedPoint( 0.3, 0.4 );
|
||||
|
||||
m_points2DeltaA = QLinkedList< Okular::NormalizedPoint >()
|
||||
m_points2DeltaA = QList< Okular::NormalizedPoint >()
|
||||
<< Okular::NormalizedPoint( 0.15, 0.2 )
|
||||
<< Okular::NormalizedPoint( 0.35, 0.5 );
|
||||
|
||||
m_points2DeltaAB = QLinkedList< Okular::NormalizedPoint >()
|
||||
m_points2DeltaAB = QList< Okular::NormalizedPoint >()
|
||||
<< Okular::NormalizedPoint( 0.25, 0.4 )
|
||||
<< Okular::NormalizedPoint( 0.45, 0.7 );
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
|
||||
#include "annotationmodel.h"
|
||||
|
||||
#include <qlinkedlist.h>
|
||||
#include <qlist.h>
|
||||
#include <qpointer.h>
|
||||
|
||||
|
|
@ -36,9 +35,9 @@ struct AnnItem
|
|||
int page;
|
||||
};
|
||||
|
||||
static QLinkedList< Okular::Annotation* > filterOutWidgetAnnotations( const QLinkedList< Okular::Annotation* > &annotations )
|
||||
static QList< Okular::Annotation* > filterOutWidgetAnnotations( const QList< Okular::Annotation* > &annotations )
|
||||
{
|
||||
QLinkedList< Okular::Annotation* > result;
|
||||
QList< Okular::Annotation* > result;
|
||||
|
||||
foreach ( Okular::Annotation *annotation, annotations )
|
||||
{
|
||||
|
|
@ -123,7 +122,7 @@ void AnnotationModelPrivate::notifyPageChanged( int page, int flags )
|
|||
if ( !(flags & Okular::DocumentObserver::Annotations ) )
|
||||
return;
|
||||
|
||||
const QLinkedList< Okular::Annotation* > annots = filterOutWidgetAnnotations( document->page( page )->annotations() );
|
||||
const QList< Okular::Annotation* > annots = filterOutWidgetAnnotations( document->page( page )->annotations() );
|
||||
int annItemIndex = -1;
|
||||
AnnItem *annItem = findItem( page, &annItemIndex );
|
||||
// case 1: the page has no more annotations
|
||||
|
|
@ -152,7 +151,7 @@ void AnnotationModelPrivate::notifyPageChanged( int page, int flags )
|
|||
q->beginInsertRows( indexForItem( root ), i, i );
|
||||
annItem->parent->children.insert( i, annItem );
|
||||
q->endInsertRows();
|
||||
QLinkedList< Okular::Annotation* >::ConstIterator it = annots.begin(), itEnd = annots.end();
|
||||
QList< Okular::Annotation* >::ConstIterator it = annots.begin(), itEnd = annots.end();
|
||||
int newid = 0;
|
||||
for ( ; it != itEnd; ++it, ++newid )
|
||||
{
|
||||
|
|
@ -170,7 +169,7 @@ void AnnotationModelPrivate::notifyPageChanged( int page, int flags )
|
|||
{
|
||||
Okular::Annotation *ref = annItem->children.at( i - 1 )->annotation;
|
||||
bool found = false;
|
||||
QLinkedList< Okular::Annotation* >::ConstIterator it = annots.begin(), itEnd = annots.end();
|
||||
QList< Okular::Annotation* >::ConstIterator it = annots.begin(), itEnd = annots.end();
|
||||
for ( ; !found && it != itEnd; ++it )
|
||||
{
|
||||
if ( ( *it ) == ref )
|
||||
|
|
@ -190,7 +189,7 @@ void AnnotationModelPrivate::notifyPageChanged( int page, int flags )
|
|||
// => lookup and add annotations if not in the branch
|
||||
if ( annots.count() > annItem->children.count() )
|
||||
{
|
||||
QLinkedList< Okular::Annotation* >::ConstIterator it = annots.begin(), itEnd = annots.end();
|
||||
QList< Okular::Annotation* >::ConstIterator it = annots.begin(), itEnd = annots.end();
|
||||
for ( ; it != itEnd; ++it )
|
||||
{
|
||||
Okular::Annotation *ref = *it;
|
||||
|
|
@ -239,12 +238,12 @@ void AnnotationModelPrivate::rebuildTree( const QVector< Okular::Page * > &pages
|
|||
emit q->layoutAboutToBeChanged();
|
||||
for ( int i = 0; i < pages.count(); ++i )
|
||||
{
|
||||
const QLinkedList< Okular::Annotation* > annots = filterOutWidgetAnnotations( pages.at( i )->annotations() );
|
||||
const QList< Okular::Annotation* > annots = filterOutWidgetAnnotations( pages.at( i )->annotations() );
|
||||
if ( annots.isEmpty() )
|
||||
continue;
|
||||
|
||||
AnnItem *annItem = new AnnItem( root, i );
|
||||
QLinkedList< Okular::Annotation* >::ConstIterator it = annots.begin(), itEnd = annots.end();
|
||||
QList< Okular::Annotation* >::ConstIterator it = annots.begin(), itEnd = annots.end();
|
||||
for ( ; it != itEnd; ++it )
|
||||
{
|
||||
new AnnItem( annItem, *it );
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ QCursor AnnotatorEngine::cursor() const
|
|||
return Qt::CrossCursor;
|
||||
}
|
||||
|
||||
SmoothPath::SmoothPath( const QLinkedList<Okular::NormalizedPoint> &points, const QPen &pen )
|
||||
SmoothPath::SmoothPath( const QList<Okular::NormalizedPoint> &points, const QPen &pen )
|
||||
: points ( points ), pen ( pen )
|
||||
{
|
||||
}
|
||||
|
|
@ -165,7 +165,7 @@ void SmoothPath::paint( QPainter * painter, double xScale, double yScale ) const
|
|||
{
|
||||
painter->setPen( pen );
|
||||
|
||||
QLinkedList<Okular::NormalizedPoint>::const_iterator pIt = points.begin(), pEnd = points.end();
|
||||
QList<Okular::NormalizedPoint>::const_iterator pIt = points.begin(), pEnd = points.end();
|
||||
Okular::NormalizedPoint pA = *pIt;
|
||||
++pIt;
|
||||
for ( ; pIt != pEnd; ++pIt )
|
||||
|
|
@ -198,7 +198,7 @@ QList< Okular::Annotation* > SmoothPathEngine::end()
|
|||
if ( m_annotElement.hasAttribute( "width" ) )
|
||||
ann->style().setWidth( m_annotElement.attribute( "width" ).toDouble() );
|
||||
// fill points
|
||||
QList< QLinkedList<Okular::NormalizedPoint> > list = ia->inkPaths();
|
||||
QList< QList<Okular::NormalizedPoint> > list = ia->inkPaths();
|
||||
list.append( points );
|
||||
ia->setInkPaths( list );
|
||||
// set boundaries
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#define _OKULAR_ANNOTATIONTOOLS_H_
|
||||
|
||||
#include <qdom.h>
|
||||
#include <qlinkedlist.h>
|
||||
#include <qlist.h>
|
||||
#include <qpen.h>
|
||||
#include <qrect.h>
|
||||
|
||||
|
|
@ -77,11 +77,11 @@ class AnnotatorEngine
|
|||
class SmoothPath
|
||||
{
|
||||
public:
|
||||
SmoothPath( const QLinkedList<Okular::NormalizedPoint> &points, const QPen &pen );
|
||||
SmoothPath( const QList<Okular::NormalizedPoint> &points, const QPen &pen );
|
||||
void paint( QPainter * painter, double xScale, double yScale ) const;
|
||||
|
||||
private:
|
||||
const QLinkedList<Okular::NormalizedPoint> points;
|
||||
const QList<Okular::NormalizedPoint> points;
|
||||
const QPen pen;
|
||||
};
|
||||
|
||||
|
|
@ -102,7 +102,7 @@ class SmoothPathEngine
|
|||
|
||||
private:
|
||||
// data
|
||||
QLinkedList<Okular::NormalizedPoint> points;
|
||||
QList<Okular::NormalizedPoint> points;
|
||||
Okular::NormalizedRect totalRect;
|
||||
Okular::NormalizedPoint lastPoint;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ void MagnifierView::requestPixmap()
|
|||
|
||||
if (m_page && !m_page->hasPixmap( this, full_width, full_height, nrect ))
|
||||
{
|
||||
QLinkedList< Okular::PixmapRequest * > requestedPixmaps;
|
||||
QList< Okular::PixmapRequest * > requestedPixmaps;
|
||||
|
||||
Okular::PixmapRequest *p = new Okular::PixmapRequest( this, m_current, full_width, full_height, PAGEVIEW_PRIO, Okular::PixmapRequest::Asynchronous );
|
||||
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ void PagePainter::paintCroppedPageOnPainter( QPainter * destPainter, const Okula
|
|||
{*/
|
||||
|
||||
Okular::NormalizedRect* limitRect = new Okular::NormalizedRect(nXMin, nYMin, nXMax, nYMax );
|
||||
QLinkedList< Okular::HighlightAreaRect * >::const_iterator h2It = page->m_highlights.constBegin(), hEnd = page->m_highlights.constEnd();
|
||||
QList< Okular::HighlightAreaRect * >::const_iterator h2It = page->m_highlights.constBegin(), hEnd = page->m_highlights.constEnd();
|
||||
Okular::HighlightAreaRect::const_iterator hIt;
|
||||
for ( ; h2It != hEnd; ++h2It )
|
||||
for (hIt=(*h2It)->constBegin(); hIt!=(*h2It)->constEnd(); ++hIt)
|
||||
|
|
@ -179,7 +179,7 @@ void PagePainter::paintCroppedPageOnPainter( QPainter * destPainter, const Okula
|
|||
// append annotations inside limits to the un/buffered list
|
||||
if ( canDrawAnnotations )
|
||||
{
|
||||
QLinkedList< Okular::Annotation * >::const_iterator aIt = page->m_annotations.constBegin(), aEnd = page->m_annotations.constEnd();
|
||||
QList< Okular::Annotation * >::const_iterator aIt = page->m_annotations.constBegin(), aEnd = page->m_annotations.constEnd();
|
||||
for ( ; aIt != aEnd; ++aIt )
|
||||
{
|
||||
Okular::Annotation * ann = *aIt;
|
||||
|
|
@ -464,9 +464,9 @@ void PagePainter::paintCroppedPageOnPainter( QPainter * destPainter, const Okula
|
|||
|
||||
NormalizedPath path;
|
||||
// normalize page point to image
|
||||
const QLinkedList<Okular::NormalizedPoint> points = la->transformedLinePoints();
|
||||
QLinkedList<Okular::NormalizedPoint>::const_iterator it = points.constBegin();
|
||||
QLinkedList<Okular::NormalizedPoint>::const_iterator itEnd = points.constEnd();
|
||||
const QList<Okular::NormalizedPoint> points = la->transformedLinePoints();
|
||||
QList<Okular::NormalizedPoint>::const_iterator it = points.constBegin();
|
||||
QList<Okular::NormalizedPoint>::const_iterator itEnd = points.constEnd();
|
||||
for ( ; it != itEnd; ++it )
|
||||
{
|
||||
Okular::NormalizedPoint point;
|
||||
|
|
@ -595,7 +595,7 @@ void PagePainter::paintCroppedPageOnPainter( QPainter * destPainter, const Okula
|
|||
Okular::InkAnnotation * ia = (Okular::InkAnnotation *) a;
|
||||
|
||||
// draw each ink path
|
||||
const QList< QLinkedList<Okular::NormalizedPoint> > transformedInkPaths = ia->transformedInkPaths();
|
||||
const QList< QList<Okular::NormalizedPoint> > transformedInkPaths = ia->transformedInkPaths();
|
||||
|
||||
const QPen inkPen = buildPen( a, a->style().width(), acolor );
|
||||
|
||||
|
|
@ -603,10 +603,10 @@ void PagePainter::paintCroppedPageOnPainter( QPainter * destPainter, const Okula
|
|||
for ( int p = 0; p < paths; p++ )
|
||||
{
|
||||
NormalizedPath path;
|
||||
const QLinkedList<Okular::NormalizedPoint> & inkPath = transformedInkPaths[ p ];
|
||||
const QList<Okular::NormalizedPoint> & inkPath = transformedInkPaths[ p ];
|
||||
|
||||
// normalize page point to image
|
||||
QLinkedList<Okular::NormalizedPoint>::const_iterator pIt = inkPath.constBegin(), pEnd = inkPath.constEnd();
|
||||
QList<Okular::NormalizedPoint>::const_iterator pIt = inkPath.constBegin(), pEnd = inkPath.constEnd();
|
||||
for ( ; pIt != pEnd; ++pIt )
|
||||
{
|
||||
const Okular::NormalizedPoint & inkPoint = *pIt;
|
||||
|
|
@ -824,7 +824,7 @@ void PagePainter::paintCroppedPageOnPainter( QPainter * destPainter, const Okula
|
|||
QRect limitsEnlarged = limits;
|
||||
limitsEnlarged.adjust( -2, -2, 2, 2 );
|
||||
// draw rects that are inside the 'limits' paint region as opaque rects
|
||||
QLinkedList< Okular::ObjectRect * >::const_iterator lIt = page->m_rects.constBegin(), lEnd = page->m_rects.constEnd();
|
||||
QList< Okular::ObjectRect * >::const_iterator lIt = page->m_rects.constBegin(), lEnd = page->m_rects.constEnd();
|
||||
for ( ; lIt != lEnd; ++lIt )
|
||||
{
|
||||
Okular::ObjectRect * rect = *lIt;
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ public:
|
|||
PageView *q;
|
||||
Okular::Document * document;
|
||||
QVector< PageViewItem * > items;
|
||||
QLinkedList< PageViewItem * > visibleItems;
|
||||
QList< PageViewItem * > visibleItems;
|
||||
MagnifierView *magnifierView;
|
||||
|
||||
// view layout (columns and continuous in Settings), zoom and mouse
|
||||
|
|
@ -906,8 +906,8 @@ void PageView::notifySetup( const QVector< Okular::Page * > & pageSet, int setup
|
|||
#ifdef PAGEVIEW_DEBUG
|
||||
kDebug().nospace() << "cropped geom for " << d->items.last()->pageNumber() << " is " << d->items.last()->croppedGeometry();
|
||||
#endif
|
||||
const QLinkedList< Okular::FormField * > pageFields = (*setIt)->formFields();
|
||||
QLinkedList< Okular::FormField * >::const_iterator ffIt = pageFields.constBegin(), ffEnd = pageFields.constEnd();
|
||||
const QList< Okular::FormField * > pageFields = (*setIt)->formFields();
|
||||
QList< Okular::FormField * >::const_iterator ffIt = pageFields.constBegin(), ffEnd = pageFields.constEnd();
|
||||
for ( ; ffIt != ffEnd; ++ffIt )
|
||||
{
|
||||
Okular::FormField * ff = *ffIt;
|
||||
|
|
@ -922,8 +922,8 @@ void PageView::notifySetup( const QVector< Okular::Page * > & pageSet, int setup
|
|||
hasformwidgets = true;
|
||||
}
|
||||
}
|
||||
const QLinkedList< Okular::Annotation * > annotations = (*setIt)->annotations();
|
||||
QLinkedList< Okular::Annotation * >::const_iterator aIt = annotations.constBegin(), aEnd = annotations.constEnd();
|
||||
const QList< Okular::Annotation * > annotations = (*setIt)->annotations();
|
||||
QList< Okular::Annotation * >::const_iterator aIt = annotations.constBegin(), aEnd = annotations.constEnd();
|
||||
for ( ; aIt != aEnd; ++aIt )
|
||||
{
|
||||
Okular::Annotation * a = *aIt;
|
||||
|
|
@ -1205,12 +1205,12 @@ void PageView::notifyPageChanged( int pageNumber, int changedFlags )
|
|||
|
||||
if ( changedFlags & DocumentObserver::Annotations )
|
||||
{
|
||||
const QLinkedList< Okular::Annotation * > annots = d->document->page( pageNumber )->annotations();
|
||||
const QLinkedList< Okular::Annotation * >::ConstIterator annItEnd = annots.end();
|
||||
const QList< Okular::Annotation * > annots = d->document->page( pageNumber )->annotations();
|
||||
const QList< Okular::Annotation * >::ConstIterator annItEnd = annots.end();
|
||||
QHash< Okular::Annotation*, AnnotWindow * >::Iterator it = d->m_annowindows.begin();
|
||||
for ( ; it != d->m_annowindows.end(); )
|
||||
{
|
||||
QLinkedList< Okular::Annotation * >::ConstIterator annIt = qFind( annots, it.key() );
|
||||
QList< Okular::Annotation * >::ConstIterator annIt = qFind( annots, it.key() );
|
||||
if ( annIt != annItEnd )
|
||||
{
|
||||
(*it)->reloadInfo();
|
||||
|
|
@ -1241,7 +1241,7 @@ void PageView::notifyPageChanged( int pageNumber, int changedFlags )
|
|||
}
|
||||
|
||||
// iterate over visible items: if page(pageNumber) is one of them, repaint it
|
||||
QLinkedList< PageViewItem * >::const_iterator iIt = d->visibleItems.constBegin(), iEnd = d->visibleItems.constEnd();
|
||||
QList< PageViewItem * >::const_iterator iIt = d->visibleItems.constBegin(), iEnd = d->visibleItems.constEnd();
|
||||
for ( ; iIt != iEnd; ++iIt )
|
||||
if ( (*iIt)->pageNumber() == pageNumber && (*iIt)->isVisible() )
|
||||
{
|
||||
|
|
@ -1285,7 +1285,7 @@ bool PageView::canUnloadPixmap( int pageNumber ) const
|
|||
Okular::SettingsCore::memoryLevel() == Okular::SettingsCore::EnumMemoryLevel::Normal )
|
||||
{
|
||||
// if the item is visible, forbid unloading
|
||||
QLinkedList< PageViewItem * >::const_iterator vIt = d->visibleItems.constBegin(), vEnd = d->visibleItems.constEnd();
|
||||
QList< PageViewItem * >::const_iterator vIt = d->visibleItems.constBegin(), vEnd = d->visibleItems.constEnd();
|
||||
for ( ; vIt != vEnd; ++vIt )
|
||||
if ( (*vIt)->pageNumber() == pageNumber )
|
||||
return false;
|
||||
|
|
@ -1293,7 +1293,7 @@ bool PageView::canUnloadPixmap( int pageNumber ) const
|
|||
else
|
||||
{
|
||||
// forbid unloading of the visible items, and of the previous and next
|
||||
QLinkedList< PageViewItem * >::const_iterator vIt = d->visibleItems.constBegin(), vEnd = d->visibleItems.constEnd();
|
||||
QList< PageViewItem * >::const_iterator vIt = d->visibleItems.constBegin(), vEnd = d->visibleItems.constEnd();
|
||||
for ( ; vIt != vEnd; ++vIt )
|
||||
if ( abs( (*vIt)->pageNumber() - pageNumber ) <= 1 )
|
||||
return false;
|
||||
|
|
@ -2099,7 +2099,7 @@ void PageView::mousePressEvent( QMouseEvent * e )
|
|||
double nX = pageItem->absToPageX(eventPos.x());
|
||||
double nY = pageItem->absToPageY(eventPos.y());
|
||||
|
||||
const QLinkedList< const Okular::ObjectRect *> orects = pageItem->page()->objectRects( Okular::ObjectRect::OAnnotation, nX, nY, itemRect.width(), itemRect.height() );
|
||||
const QList< const Okular::ObjectRect *> orects = pageItem->page()->objectRects( Okular::ObjectRect::OAnnotation, nX, nY, itemRect.width(), itemRect.height() );
|
||||
|
||||
if ( !orects.isEmpty() )
|
||||
{
|
||||
|
|
@ -3400,7 +3400,7 @@ void PageView::updateItemSize( PageViewItem * item, int colWidth, int rowHeight
|
|||
PageViewItem * PageView::pickItemOnPoint( int x, int y )
|
||||
{
|
||||
PageViewItem * item = 0;
|
||||
QLinkedList< PageViewItem * >::const_iterator iIt = d->visibleItems.constBegin(), iEnd = d->visibleItems.constEnd();
|
||||
QList< PageViewItem * >::const_iterator iIt = d->visibleItems.constBegin(), iEnd = d->visibleItems.constEnd();
|
||||
for ( ; iIt != iEnd; ++iIt )
|
||||
{
|
||||
PageViewItem * i = *iIt;
|
||||
|
|
@ -4233,7 +4233,7 @@ void PageView::delayedResizeEvent()
|
|||
slotRequestVisiblePixmaps();
|
||||
}
|
||||
|
||||
static void slotRequestPreloadPixmap( Okular::DocumentObserver * observer, const PageViewItem * i, const QRect &expandedViewportRect, QLinkedList< Okular::PixmapRequest * > *requestedPixmaps )
|
||||
static void slotRequestPreloadPixmap( Okular::DocumentObserver * observer, const PageViewItem * i, const QRect &expandedViewportRect, QList< Okular::PixmapRequest * > *requestedPixmaps )
|
||||
{
|
||||
Okular::NormalizedRect preRenderRegion;
|
||||
const QRect intersectionRect = expandedViewportRect.intersected( i->croppedGeometry() );
|
||||
|
|
@ -4289,7 +4289,7 @@ void PageView::slotRequestVisiblePixmaps( int newValue )
|
|||
|
||||
// iterate over all items
|
||||
d->visibleItems.clear();
|
||||
QLinkedList< Okular::PixmapRequest * > requestedPixmaps;
|
||||
QList< Okular::PixmapRequest * > requestedPixmaps;
|
||||
QVector< Okular::VisiblePageRect * > visibleRects;
|
||||
QVector< PageViewItem * >::const_iterator iIt = d->items.constBegin(), iEnd = d->items.constEnd();
|
||||
for ( ; iIt != iEnd; ++iIt )
|
||||
|
|
|
|||
|
|
@ -424,7 +424,7 @@ class PolyLineEngine : public AnnotatorEngine
|
|||
//add note
|
||||
Okular::LineAnnotation * la = new Okular::LineAnnotation();
|
||||
ann = la;
|
||||
QLinkedList<Okular::NormalizedPoint> list;
|
||||
QList<Okular::NormalizedPoint> list;
|
||||
for ( int i = 0; i < points.count(); ++i )
|
||||
list.append( points[ i ] );
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
#include <qobject.h>
|
||||
#include <qdom.h>
|
||||
#include <qlinkedlist.h>
|
||||
#include <qlist.h>
|
||||
|
||||
#include "pageviewutils.h"
|
||||
#include "annotationtools.h"
|
||||
|
|
@ -104,7 +104,7 @@ class PageViewAnnotator : public QObject
|
|||
PageViewToolBar * m_toolBar;
|
||||
AnnotatorEngine * m_engine;
|
||||
QDomElement m_toolsDefinition;
|
||||
QLinkedList<AnnotationToolItem> m_items;
|
||||
QList<AnnotationToolItem> m_items;
|
||||
bool m_textToolsEnabled;
|
||||
bool m_toolsEnabled;
|
||||
bool m_continuousMode;
|
||||
|
|
|
|||
|
|
@ -485,7 +485,7 @@ public:
|
|||
|
||||
// background pixmap and buttons
|
||||
QPixmap backgroundPixmap;
|
||||
QLinkedList< ToolBarButton * > buttons;
|
||||
QList< ToolBarButton * > buttons;
|
||||
};
|
||||
|
||||
PageViewToolBar::PageViewToolBar( PageView * parent, QWidget * anchorWidget )
|
||||
|
|
@ -514,19 +514,19 @@ PageViewToolBar::~PageViewToolBar()
|
|||
delete d;
|
||||
}
|
||||
|
||||
void PageViewToolBar::setItems( const QLinkedList<AnnotationToolItem> &items )
|
||||
void PageViewToolBar::setItems( const QList<AnnotationToolItem> &items )
|
||||
{
|
||||
// delete buttons if already present
|
||||
if ( !d->buttons.isEmpty() )
|
||||
{
|
||||
QLinkedList< ToolBarButton * >::iterator it = d->buttons.begin(), end = d->buttons.end();
|
||||
QList< ToolBarButton * >::iterator it = d->buttons.begin(), end = d->buttons.end();
|
||||
for ( ; it != end; ++it )
|
||||
delete *it;
|
||||
d->buttons.clear();
|
||||
}
|
||||
|
||||
// create new buttons for given items
|
||||
QLinkedList<AnnotationToolItem>::const_iterator it = items.begin(), end = items.end();
|
||||
QList<AnnotationToolItem>::const_iterator it = items.begin(), end = items.end();
|
||||
for ( ; it != end; ++it )
|
||||
{
|
||||
ToolBarButton * button = new ToolBarButton( this, *it );
|
||||
|
|
@ -591,7 +591,7 @@ void PageViewToolBar::selectButton( int id )
|
|||
button = *(d->buttons.begin() + id);
|
||||
else
|
||||
{
|
||||
QLinkedList< ToolBarButton * >::const_iterator it = d->buttons.begin(), end = d->buttons.end();
|
||||
QList< ToolBarButton * >::const_iterator it = d->buttons.begin(), end = d->buttons.end();
|
||||
for ( ; !button && it != end; ++it )
|
||||
if ( (*it)->isChecked() )
|
||||
button = *it;
|
||||
|
|
@ -786,7 +786,7 @@ void ToolBarPrivate::buildToolBar()
|
|||
// 6. reposition buttons (in rows/col grid)
|
||||
int gridX = 0,
|
||||
gridY = 0;
|
||||
QLinkedList< ToolBarButton * >::const_iterator it = buttons.begin(), end = buttons.end();
|
||||
QList< ToolBarButton * >::const_iterator it = buttons.begin(), end = buttons.end();
|
||||
for ( ; it != end; ++it )
|
||||
{
|
||||
ToolBarButton * button = *it;
|
||||
|
|
@ -821,7 +821,7 @@ void ToolBarPrivate::reposition()
|
|||
q->move( currentPosition );
|
||||
|
||||
// repaint all buttons (to update background)
|
||||
QLinkedList< ToolBarButton * >::const_iterator it = buttons.begin(), end = buttons.end();
|
||||
QList< ToolBarButton * >::const_iterator it = buttons.begin(), end = buttons.end();
|
||||
for ( ; it != end; ++it )
|
||||
(*it)->update();
|
||||
}
|
||||
|
|
@ -910,7 +910,7 @@ void ToolBarPrivate::selectButton( ToolBarButton * button )
|
|||
if ( button )
|
||||
{
|
||||
// deselect other buttons
|
||||
QLinkedList< ToolBarButton * >::const_iterator it = buttons.begin(), end = buttons.end();
|
||||
QList< ToolBarButton * >::const_iterator it = buttons.begin(), end = buttons.end();
|
||||
for ( ; it != end; ++it )
|
||||
if ( *it != button )
|
||||
(*it)->setChecked( false );
|
||||
|
|
@ -921,14 +921,14 @@ void ToolBarPrivate::selectButton( ToolBarButton * button )
|
|||
|
||||
void PageViewToolBar::setToolsEnabled( bool on )
|
||||
{
|
||||
QLinkedList< ToolBarButton * >::const_iterator it = d->buttons.begin(), end = d->buttons.end();
|
||||
QList< ToolBarButton * >::const_iterator it = d->buttons.begin(), end = d->buttons.end();
|
||||
for ( ; it != end; ++it )
|
||||
(*it)->setEnabled( on );
|
||||
}
|
||||
|
||||
void PageViewToolBar::setTextToolsEnabled( bool on )
|
||||
{
|
||||
QLinkedList< ToolBarButton * >::const_iterator it = d->buttons.begin(), end = d->buttons.end();
|
||||
QList< ToolBarButton * >::const_iterator it = d->buttons.begin(), end = d->buttons.end();
|
||||
for ( ; it != end; ++it )
|
||||
if ( (*it)->isText() )
|
||||
(*it)->setEnabled( on );
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ class PageViewToolBar : public QWidget
|
|||
// animated widget controls
|
||||
enum Side { Left = 0, Top = 1, Right = 2, Bottom = 3 };
|
||||
|
||||
void setItems( const QLinkedList<AnnotationToolItem> &items );
|
||||
void setItems( const QList<AnnotationToolItem> &items );
|
||||
void setSide( Side side );
|
||||
|
||||
void showAndAnimate();
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ struct PresentationFrame
|
|||
const Okular::Page * page;
|
||||
QRect geometry;
|
||||
QHash< Okular::Movie *, VideoWidget * > videoWidgets;
|
||||
QLinkedList< SmoothPath > drawings;
|
||||
QList< SmoothPath > drawings;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -321,8 +321,8 @@ void PresentationWidget::notifySetup( const QVector< Okular::Page * > & pageSet,
|
|||
{
|
||||
PresentationFrame * frame = new PresentationFrame();
|
||||
frame->page = *setIt;
|
||||
const QLinkedList< Okular::Annotation * > annotations = (*setIt)->annotations();
|
||||
QLinkedList< Okular::Annotation * >::const_iterator aIt = annotations.begin(), aEnd = annotations.end();
|
||||
const QList< Okular::Annotation * > annotations = (*setIt)->annotations();
|
||||
QList< Okular::Annotation * >::const_iterator aIt = annotations.begin(), aEnd = annotations.end();
|
||||
for ( ; aIt != aEnd; ++aIt )
|
||||
{
|
||||
Okular::Annotation * a = *aIt;
|
||||
|
|
@ -1261,7 +1261,7 @@ void PresentationWidget::requestPixmaps()
|
|||
// operation will take long: set busy cursor
|
||||
QApplication::setOverrideCursor( QCursor( Qt::BusyCursor ) );
|
||||
// request the pixmap
|
||||
QLinkedList< Okular::PixmapRequest * > requests;
|
||||
QList< Okular::PixmapRequest * > requests;
|
||||
requests.push_back( new Okular::PixmapRequest( this, m_frameIndex, pixW, pixH, PRESENTATION_PRIO, Okular::PixmapRequest::NoFeature ) );
|
||||
// restore cursor
|
||||
QApplication::restoreOverrideCursor();
|
||||
|
|
|
|||
|
|
@ -609,7 +609,7 @@ void ThumbnailListPrivate::slotRequestVisiblePixmaps( int /*newContentsY*/ )
|
|||
|
||||
// scroll from the top to the last visible thumbnail
|
||||
m_visibleThumbnails.clear();
|
||||
QLinkedList< Okular::PixmapRequest * > requestedPixmaps;
|
||||
QList< Okular::PixmapRequest * > requestedPixmaps;
|
||||
QVector<ThumbnailWidget *>::const_iterator tIt = m_thumbnails.constBegin(), tEnd = m_thumbnails.constEnd();
|
||||
const QRect viewportRect = q->viewport()->rect().translated( q->horizontalScrollBar()->value(), q->verticalScrollBar()->value() );
|
||||
for ( ; tIt != tEnd; ++tIt )
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue