From be6b0b6f482dbb307b0bbdc5f42b7ee2fb55acb6 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 31 Jan 2017 22:50:54 +0100 Subject: [PATCH] Fix porting bug regarding the font extraction progress BUGS: 375782 --- core/document.cpp | 4 ++-- core/document.h | 2 +- core/document_p.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/document.cpp b/core/document.cpp index 8e2ae4ebe..8051494bc 100644 --- a/core/document.cpp +++ b/core/document.cpp @@ -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 ); } diff --git a/core/document.h b/core/document.h index bac38f89f..9f1106f87 100644 --- a/core/document.h +++ b/core/document.h @@ -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 ) ) diff --git a/core/document_p.h b/core/document_p.h index 8b20c5586..f70a2c6fe 100644 --- a/core/document_p.h +++ b/core/document_p.h @@ -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 );