office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-24 18:35:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Applications/16.12'

Browse source
This commit is contained in:
Albert Astals Cid 2017-01-31 22:52:45 +01:00
parent 3b610bd86a be6b0b6f48
commit 021cc986a8
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/document.cpp
View file

@ -1422,7 +1422,7 @@ void DocumentPrivate::rotationFinished( int page, Okular::Page *okularPage )
o->notifyPageChanged( page, DocumentObserver::Pixmap | DocumentObserver::Annotations );
}
void DocumentPrivate::fontReadingProgress( int page )
void DocumentPrivate::slotFontReadingProgress( int page )
{
emit m_parent->fontReadingProgress( page );
@ -2800,7 +2800,7 @@ void Document::startFontReading()
d->m_fontThread = new FontExtractionThread( d->m_generator, pages() );
connect( d->m_fontThread, SIGNAL(gotFont(Okular::FontInfo)), this, SLOT(fontReadingGotFont(Okular::FontInfo)) );
connect( d->m_fontThread.data(), &FontExtractionThread::progress, this, &Document::fontReadingProgress );
connect( d->m_fontThread.data(), SIGNAL(progress(int)), this, SLOT(slotFontReadingProgress(int)) );
d->m_fontThread->startExtraction( /*d->m_generator->hasFeature( Generator::Threaded )*/true );
}

2
core/document.h
View file

@ -1117,7 +1117,7 @@ class OKULARCORE_EXPORT Document : public QObject
Q_PRIVATE_SLOT( d, void slotTimedMemoryCheck() )
Q_PRIVATE_SLOT( d, void sendGeneratorPixmapRequest() )
Q_PRIVATE_SLOT( d, void rotationFinished( int page, Okular::Page *okularPage ) )
Q_PRIVATE_SLOT( d, void fontReadingProgress( int page ) )
Q_PRIVATE_SLOT( d, void slotFontReadingProgress( int page ) )
Q_PRIVATE_SLOT( d, void fontReadingGotFont( const Okular::FontInfo& font ) )
Q_PRIVATE_SLOT( d, void slotGeneratorConfigChanged( const QString& ) )
Q_PRIVATE_SLOT( d, void refreshPixmaps( int ) )

2
core/document_p.h
View file

@ -150,7 +150,7 @@ class DocumentPrivate
void slotTimedMemoryCheck();
void sendGeneratorPixmapRequest();
void rotationFinished( int page, Okular::Page *okularPage );
void fontReadingProgress( int page );
void slotFontReadingProgress( int page );
void fontReadingGotFont( const Okular::FontInfo& font );
void slotGeneratorConfigChanged( const QString& );
void refreshPixmaps( int );